[mingw-SDL_mixer] Added win64 support and use parallel make

[Erik van Pienbroek]

commit 2cb2b40b286f1281181336dee7980b714d402f75
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Apr 14 22:42:50 2012 +0200

    Added win64 support and use parallel make

 mingw-SDL_mixer.spec |   62 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 15 deletions(-)
---
diff --git a/mingw-SDL_mixer.spec b/mingw-SDL_mixer.spec
index f2f1ee8..19aec76 100644
--- a/mingw-SDL_mixer.spec
+++ b/mingw-SDL_mixer.spec
@@ -1,10 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 Name:           mingw-SDL_mixer
 Version:        1.2.11
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW Windows port of Simple DirectMedia Layer's Sample Mixer Library
 
 License:        LGPLv2+
@@ -14,21 +12,26 @@ Source0:        http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-%{ver
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-SDL
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-SDL
+
+
 %description
 A simple multi-channel audio mixer for SDL. It supports 4 channels of
 16 bit stereo audio, plus a single channel of music, mixed by the popular
 MikMod MOD library.
 
-%{mingw32_description}
-
 
+# Win32
 %package -n mingw32-SDL_mixer
 Summary:        MinGW Windows port of Simple DirectMedia Layer's Sample Mixer Library
 Requires:       pkgconfig
@@ -38,29 +41,43 @@ A simple multi-channel audio mixer for SDL. It supports 4 channels of
 16 bit stereo audio, plus a single channel of music, mixed by the popular
 MikMod MOD library.
 
-%{mingw32_description}
+# Win64
+%package -n mingw64-SDL_mixer
+Summary:        MinGW Windows port of Simple DirectMedia Layer's Sample Mixer Library
+Requires:       pkgconfig
+
+%description -n mingw64-SDL_mixer
+A simple multi-channel audio mixer for SDL. It supports 4 channels of
+16 bit stereo audio, plus a single channel of music, mixed by the popular
+MikMod MOD library.
 
 
 # Automatically create a debuginfo package
-%{?mingw32_debug_package}
+%?mingw_debug_package
+
 
 %prep
 %setup -q -n SDL_mixer-%{version}
 
+
 %build
-%{mingw32_configure} \
+%mingw_configure \
     --disable-dependency-tracking \
     --enable-music-mod \
+    --disable-music-flac \
     --disable-static
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' build_win32/libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' build_win64/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' build_win32/libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' build_win64/libtool
+
+%mingw_make %{?_smp_mflags}
 
-make
 
 %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 && \
@@ -70,6 +87,8 @@ mv CHANGES.new CHANGES
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
+
+# Win32
 %files -n mingw32-SDL_mixer
 %doc README CHANGES COPYING
 %{mingw32_bindir}/SDL_mixer.dll
@@ -77,7 +96,20 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/pkgconfig/SDL_mixer.pc
 %{mingw32_includedir}/SDL
 
+# Win64
+%files -n mingw64-SDL_mixer
+%doc README CHANGES COPYING
+%{mingw64_bindir}/SDL_mixer.dll
+%{mingw64_libdir}/libSDL_mixer.dll.a
+%{mingw64_libdir}/pkgconfig/SDL_mixer.pc
+%{mingw64_includedir}/SDL
+
+
 %changelog
+* Sat Apr 14 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.11-8
+- Added win64 support (contributed by Mikkel Kruse Johnsen)
+- Use parallel make
+
 * Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.11-7
 - Dropped .la files