[mingw-SDL_image] Added win64 support

Erik van Pienbroek epienbro at fedoraproject.org
Sat Apr 14 20:27:38 UTC 2012


commit 2ded149478f0fe53b39555b357bb0ef798cf7cd0
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Apr 14 22:27:35 2012 +0200

    Added win64 support

 mingw-SDL_image.spec |   60 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 14 deletions(-)
---
diff --git a/mingw-SDL_image.spec b/mingw-SDL_image.spec
index f789a99..406f4a5 100644
--- a/mingw-SDL_image.spec
+++ b/mingw-SDL_image.spec
@@ -1,11 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
-
+%?mingw_package_header
 
 Name:           mingw-SDL_image
 Version:        1.2.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows port of the Image loading library for SDL
 
 License:        LGPLv2+
@@ -15,24 +12,33 @@ Source0:        http://www.libsdl.org/projects/SDL_image/release/SDL_image-%{ver
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-SDL
 BuildRequires:  mingw32-libpng
-BuildRequires:  mingw32-libjpeg
+BuildRequires:  mingw32-libjpeg-turbo
 BuildRequires:  mingw32-libtiff
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-SDL
+BuildRequires:  mingw64-libpng
+BuildRequires:  mingw64-libjpeg-turbo
+BuildRequires:  mingw64-libtiff
+
+
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
 designed to provide fast access to the graphics frame buffer and audio
 device.  This package contains a simple library for loading images of
 various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 
-%{?mingw32_description}
-
 
+# Win32
 %package -n mingw32-SDL_image
 Summary:        MinGW Windows port of the Image loading library for SDL
 Requires:       pkgconfig
@@ -43,28 +49,40 @@ designed to provide fast access to the graphics frame buffer and audio
 device.  This package contains a simple library for loading images of
 various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 
-%{?mingw32_description}
+# Win64
+%package -n mingw64-SDL_image
+Summary:        MinGW Windows port of the Image loading library for SDL
+Requires:       pkgconfig
 
+%description -n mingw64-SDL_image
+Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
+designed to provide fast access to the graphics frame buffer and audio
+device.  This package contains a simple library for loading images of
+various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
+
+
+%?mingw_debug_package
 
-%{?mingw32_debug_package}
 
 %prep
 %setup -q -n SDL_image-%{version}
 
+
 %build
 # the --disabled-*-shared lines below stops SDL_image from loading those
 # libraries at link time. Instead they are loaded when needed.
-%{mingw32_configure} \
+%mingw_configure \
     --disable-jpg-shared \
     --disable-png-shared \
     --disable-tif-shared \
     --disable-static
 #    --disable-dependency-tracking \
 
-make %{?smp_mflags}
+%mingw_make %{?smp_mflags}
+
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
 
 # silence rpmlint:
 iconv --from=ISO-8859-1 --to=UTF-8 CHANGES > CHANGES.new && \
@@ -74,6 +92,8 @@ mv CHANGES.new CHANGES
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
+
+# Win32
 %files -n mingw32-SDL_image
 %doc README CHANGES COPYING
 %{mingw32_bindir}/SDL_image.dll
@@ -81,7 +101,19 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/pkgconfig/SDL_image.pc
 %{mingw32_includedir}/SDL
 
+# Win64
+%files -n mingw64-SDL_image
+%doc README CHANGES COPYING
+%{mingw64_bindir}/SDL_image.dll
+%{mingw64_libdir}/libSDL_image.dll.a
+%{mingw64_libdir}/pkgconfig/SDL_image.pc
+%{mingw64_includedir}/SDL
+
+
 %changelog
+* Sat Apr 14 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.12-5
+- Added win64 support
+
 * Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.12-4
 - Dropped .la files
 


More information about the scm-commits mailing list