[mingw-gdk-pixbuf] Build 64 bit Windows binaries

Wed Mar 14 11:15:30 UTC 2012

commit 84685b25644ece93ad1c79048edbafbddaafcbad
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 14 12:32:56 2012 +0200

    Build 64 bit Windows binaries

 gdk-pixbuf.loaders    |    2 +-
 mingw-gdk-pixbuf.spec |   74 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 14 deletions(-)
---

diff --git a/gdk-pixbuf.loaders b/gdk-pixbuf.loaders
index a031c5f..01411bb 100644
--- a/gdk-pixbuf.loaders
+++ b/gdk-pixbuf.loaders
@@ -2,7 +2,7 @@
 # Automatically generated file, do not edit
 # Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.25.2
 #
-# LoaderDir = Z:\usr\i686-pc-mingw32\sys-root\mingw/lib/gdk-pixbuf-2.0/2.10.0/loaders
+# LoaderDir = Z:\usr\i686-w64-mingw32\sys-root\mingw/lib/gdk-pixbuf-2.0/2.10.0/loaders
 #
 "../lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
 "ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
diff --git a/mingw-gdk-pixbuf.spec b/mingw-gdk-pixbuf.spec
index b1b5eee..73a85ba 100644
--- a/mingw-gdk-pixbuf.spec
+++ b/mingw-gdk-pixbuf.spec
@@ -1,10 +1,11 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-gdk-pixbuf
 Version:        2.25.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows GDK Pixbuf library
 
 License:        LGPLv2+
@@ -13,20 +14,28 @@ URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/gdk-pixbuf/2.25/gdk-pixbuf-%{version}.tar.xz
 
 # If you want to rebuild this, do:
-# wine /usr/i686-pc-mingw32/sys-root/mingw/bin/gdk-pixbuf-query-loaders.exe | sed s@'Z:/usr/i686-pc-mingw32/sys-root/mingw'@'..'@ > gdk-pixbuf.loaders
+# wine /usr/i686-w64-mingw32/sys-root/mingw/bin/gdk-pixbuf-query-loaders.exe | sed s@'Z:/usr/i686-w64-mingw32/sys-root/mingw'@'..'@ > gdk-pixbuf.loaders
 Source1:        gdk-pixbuf.loaders
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw64-binutils
 
 BuildRequires:  mingw32-glib2
+BuildRequires:  mingw64-glib2
 BuildRequires:  mingw32-jasper
+BuildRequires:  mingw64-jasper
 BuildRequires:  mingw32-libjpeg
+BuildRequires:  mingw64-libjpeg
 BuildRequires:  mingw32-libpng
+BuildRequires:  mingw64-libpng
 BuildRequires:  mingw32-libtiff
+BuildRequires:  mingw64-libtiff
 
 # Native one for msgfmt
 BuildRequires:  gettext
@@ -37,7 +46,6 @@ BuildRequires:  gtk2
 # Native one for gdk-pixbuf-csource
 BuildRequires:  gtk2-devel
 
-
 %description
 MinGW Windows GDK Pixbuf library.
 
@@ -49,7 +57,14 @@ Summary:        MinGW Windows GDK Pixbuf library
 MinGW Windows GDK Pixbuf library.
 
 
-%{?mingw32_debug_package}
+%package -n mingw64-gdk-pixbuf
+Summary:        MinGW Windows GDK Pixbuf library
+
+%description -n mingw64-gdk-pixbuf
+MinGW Windows GDK Pixbuf library.
+
+
+%?mingw_debug_package
 
 
 %prep
@@ -57,23 +72,25 @@ MinGW Windows GDK Pixbuf library.
 
 
 %build
-%{mingw32_configure} \
+%mingw_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
+%mingw_make %{?_smp_mflags} V=1
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
 
 # The .def files are only used while compiling the libraries themselves
 # (they contain a list of functions which need to be exported by the linker)
 # so they serve no purpose for other libraries and applications
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gdk_pixbuf-2.0.def
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gdk_pixbuf-2.0.def
 
 # The .dll.a files are import libraries, but as the regular .dll's are
 # only dlopen'ed by GTK they provide no additional value so they can be dropped
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.dll.a
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -81,15 +98,18 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 # The gtk-doc documentation and man pages can also be dropped as they're
 # already provided by the native package
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
 
 # Install the loaders.cache file
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-%find_lang %{name} --all-name
+%mingw_find_lang %{name} --all-name
 
 
-%files -n mingw32-gdk-pixbuf -f %{name}.lang
+%files -n mingw32-gdk-pixbuf -f mingw32-%{name}.lang
 %doc COPYING
 %{mingw32_bindir}/gdk-pixbuf-csource.exe
 %{mingw32_bindir}/gdk-pixbuf-pixdata.exe
@@ -114,8 +134,36 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.
 %{mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
 %{mingw32_includedir}/gdk-pixbuf-2.0/
 
+%files -n mingw64-gdk-pixbuf -f mingw64-%{name}.lang
+%doc COPYING
+%{mingw64_bindir}/gdk-pixbuf-csource.exe
+%{mingw64_bindir}/gdk-pixbuf-pixdata.exe
+%{mingw64_bindir}/gdk-pixbuf-query-loaders.exe
+%{mingw64_bindir}/libgdk_pixbuf-2.0-0.dll
+%dir %{mingw64_libdir}/gdk-pixbuf-2.0
+%dir %{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0
+%dir %{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
+%{mingw64_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
+%{mingw64_libdir}/libgdk_pixbuf-2.0.dll.a
+%{mingw64_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
+%{mingw64_includedir}/gdk-pixbuf-2.0/
+
 
 %changelog
+* Wed Mar 14 2012 Kalev Lember <kalevlember at gmail.com> - 2.25.2-5
+- Build 64 bit Windows binaries
+
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.25.2-4
 - Renamed the source package to mingw-gdk-pixbuf (RHBZ #800383)
 - Use mingw macros without leading underscore
