[mingw-gdk-pixbuf: 18/22] Include all GDI+ loaders in the main DLL (#795152)

[epienbro]

commit 978275e08e678cd1074910a477a52053f65fa4e7
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Feb 19 22:09:34 2012 +0200

    Include all GDI+ loaders in the main DLL (#795152)
    
    Also include the PNG loader, for consistency with native gdk-pixbuf2
    package.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=795152

 gdk-pixbuf.loaders      |   51 -----------------------------------------------
 mingw32-gdk-pixbuf.spec |   18 +++++++---------
 2 files changed, 8 insertions(+), 61 deletions(-)
---
diff --git a/gdk-pixbuf.loaders b/gdk-pixbuf.loaders
index 47491bc..a031c5f 100644
--- a/gdk-pixbuf.loaders
+++ b/gdk-pixbuf.loaders
@@ -40,26 +40,6 @@
 "xpm" ""
 "/* XPM */" "" 100
 
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll"
-"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll"
-"tiff" 5 "gdk-pixbuf" "The TIFF image format" "LGPL"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll"
-"wmf" 4 "gdk-pixbuf" "The WMF image format" "LGPL"
-"image/x-wmf" ""
-"wmf" "apm" ""
-"\327\315\306\232" "" 100
-"\001" "" 100
-
 "../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
 "icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
 "image/x-icns" ""
@@ -90,12 +70,6 @@
 "#define " "" 100
 "/*" "" 50
 
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll"
-"emf" 4 "gdk-pixbuf" "The EMF image format" "LGPL"
-"application/emf" "application/x-emf" "image/x-emf" "image/x-mgx-emf" ""
-"emf" ""
-"\001" "" 100
-
 "../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
 "tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL"
 "image/x-tga" ""
@@ -107,18 +81,6 @@
 "  \n" "xz " 100
 "  \v" "xz " 100
 
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll"
-"gif" 5 "gdk-pixbuf" "The GIF image format" "LGPL"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
 "../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
 "wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
 "image/vnd.wap.wbmp" ""
@@ -128,17 +90,4 @@
 " @" "z " 1
 "  " "z " 1
 
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll"
-"ico" 4 "gdk-pixbuf" "The ICO image format" "LGPL"
-"image/x-icon" "image/x-ico" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll"
-"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
 
diff --git a/mingw32-gdk-pixbuf.spec b/mingw32-gdk-pixbuf.spec
index d2b30c0..92ee4ae 100644
--- a/mingw32-gdk-pixbuf.spec
+++ b/mingw32-gdk-pixbuf.spec
@@ -4,7 +4,7 @@
 
 Name:           mingw32-gdk-pixbuf
 Version:        2.25.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows GDK Pixbuf library
 
 License:        LGPLv2+
@@ -50,7 +50,9 @@ MinGW Windows GDK Pixbuf library.
 
 
 %build
-%{_mingw32_configure} --with-libjasper
+%{_mingw32_configure} \
+  --with-included-loaders=gdip-bmp,gdip-emf,gdip-gif,gdip-ico,gdip-jpeg,gdip-tiff,gdip-wmf,png \
+  --with-libjasper
 make %{?_smp_mflags} V=1
 
 
@@ -91,17 +93,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10
 %dir %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll
 %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll
@@ -115,6 +109,10 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10
 
 
 %changelog
+* Sun Feb 19 2012 Kalev Lember <kalevlember at gmail.com> - 2.25.2-2
+- Include all GDI+ loaders in the main DLL (#795152)
+- Also include the PNG loader, for consistency with native gdk-pixbuf2 package
+
 * Wed Feb 08 2012 Kalev Lember <kalevlember at gmail.com> - 2.25.2-1
 - Update to 2.25.2
 - Dropped upstreamed patches