[mingw-SDL] Update to 1.2.15

[Erik van Pienbroek]

commit 889227223082c854ac11c54b96663d9b9230294c
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jun 2 17:26:48 2012 +0200

    Update to 1.2.15
    
    - Update to 1.2.15
    - Dropped upstreamed patches
    - Dropped all configure arguments which aren't relevant for the win32/win64 targets
    - Add BR: nasm

 .gitignore                     |    1 +
 SDL-1.2.10-byteorder.patch     |   21 ------
 SDL-1.2.11-dynamic-esd.patch   |   19 ------
 SDL-1.2.12-disable_yasm.patch  |   11 ---
 SDL-1.2.12-multilib.patch      |   25 --------
 SDL-1.2.12-x11dyn64.patch      |   13 ----
 SDL-1.2.13-audiodriver.patch   |   29 ---------
 SDL-1.2.13-dynamic-pulse.patch |   40 ------------
 SDL-1.2.13-libdir.patch        |   66 --------------------
 SDL-1.2.13-pulse-rework.patch  |  132 ----------------------------------------
 mingw-SDL.spec                 |   53 ++++------------
 sources                        |    2 +-
 12 files changed, 15 insertions(+), 397 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e9e39c..1c1cb1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SDL-1.2.13.tar.gz
+/SDL-1.2.15.tar.gz
diff --git a/mingw-SDL.spec b/mingw-SDL.spec
index 1c5a504..52399f3 100644
--- a/mingw-SDL.spec
+++ b/mingw-SDL.spec
@@ -1,8 +1,8 @@
-%?mingw_package_header
+%{?mingw_package_header}
 
 Name:           mingw-SDL
-Version:        1.2.13
-Release:        15%{?dist}
+Version:        1.2.15
+Release:        1%{?dist}
 Summary:        MinGW Windows port of SDL cross-platform multimedia library
 
 License:        LGPLv2+
@@ -12,17 +12,6 @@ Source0:        http://www.libsdl.org/release/SDL-%{version}.tar.gz
 
 BuildArch:      noarch
 
-# Patches from native version.
-Patch0:         SDL-1.2.10-byteorder.patch
-Patch17:        SDL-1.2.13-libdir.patch
-Patch21:        SDL-1.2.12-multilib.patch
-Patch23:        SDL-1.2.11-dynamic-esd.patch
-Patch24:        SDL-1.2.12-x11dyn64.patch
-Patch25:        SDL-1.2.12-disable_yasm.patch
-Patch26:        SDL-1.2.13-dynamic-pulse.patch
-Patch27:        SDL-1.2.13-pulse-rework.patch
-Patch28:        SDL-1.2.13-audiodriver.patch
-
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
@@ -37,11 +26,9 @@ BuildRequires:  mingw64-win-iconv
 # I just haven't worked out how to enable it.
 #BuildRequires:  mingw32-gcc-c++
 
-# If we have nasm in the future, then this would enable future
-# optimizations on x86-based architectures.
-#%ifarch %{ix86}
-#BuildRequires: nasm
-#%endif
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
 
 
 %description
@@ -80,30 +67,10 @@ device.
 
 %prep
 %setup -q -n SDL-%{version}
-%patch0 -p1 -b .byteorder
-%patch17 -p1 -b .libdir
-%patch21 -p1 -b .multilib
-%patch23 -p1 -b .dynamic-esd
-%patch24 -p1 -b .x11dyn64
-%patch25 -p1 -b .disable_yasm
-%patch26 -p1 -b .dynamic-pulse
-%patch27 -p1 -b .pulse-rework
-%patch28 -p1 -b .audiodriver
 
 
 %build
-%mingw_configure \
-  --disable-video-svga --disable-video-ggi --disable-video-aalib \
-  --disable-debug \
-  --enable-sdl-dlopen \
-  --enable-dlopen \
-  --enable-arts-shared \
-  --enable-esd-shared \
-  --enable-pulseaudio-shared \
-  --enable-alsa \
-  --disable-rpath \
-  --disable-directx
-
+%mingw_configure
 %mingw_make %{?_smp_mflags}
 
 
@@ -152,6 +119,12 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sun Jun 02 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.15-1
+- Update to 1.2.15
+- Dropped upstreamed patches
+- Dropped all configure arguments which aren't relevant for the win32/win64 targets
+- Add BR: nasm
+
 * Sat Apr 14 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.13-15
 - Added win64 support
 - Automatically generate debuginfo package
diff --git a/sources b/sources
index 0cb952e..8857a07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6660feea2a6834de10bc71b2f8e4d88  SDL-1.2.13.tar.gz
+9d96df8417572a2afb781a7c4c811a85  SDL-1.2.15.tar.gz