Tue Oct 27 12:52:46 UTC 2009

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4750

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.14-audiodriver.patch SDL-1.2.14-byteorder.patch 
Removed Files:
	SDL-1.2.10-byteorder.patch SDL-1.2.10-libdir.patch 
	SDL-1.2.10-pagesize.patch SDL-1.2.11-dynamic-esd.patch 
	SDL-1.2.11-fixman.patch SDL-1.2.12-x11dyn64.patch 
	SDL-1.2.13-audiodriver.patch SDL-1.2.13-dynamic-pulse.patch 
	SDL-1.2.13-libdir.patch SDL-1.2.13-pa-rewrite.patch 
	SDL-1.2.13-rh484362.patch SDL-1.2.13-rh487720.patch 
Log Message:
- new version 1.2.14
- dropped patches for upstream fixes: libdir, dynamic-esd, x11dyn64,
  dynamic-pulse, pa-rewrite, rh484362 and rh487720



SDL-1.2.14-audiodriver.patch:
 SDL_audio.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE SDL-1.2.14-audiodriver.patch ---
diff -up SDL-1.2.14/src/audio/SDL_audio.c.audiodriver SDL-1.2.14/src/audio/SDL_audio.c
--- SDL-1.2.14/src/audio/SDL_audio.c.audiodriver	2009-10-13 12:25:35.000000000 +0200
+++ SDL-1.2.14/src/audio/SDL_audio.c	2009-10-26 14:36:26.000000000 +0100
@@ -36,15 +36,15 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#if SDL_AUDIO_DRIVER_BSD
-	&BSD_AUDIO_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_PULSE
 	&PULSE_bootstrap,
 #endif
 #if SDL_AUDIO_DRIVER_ALSA
 	&ALSA_bootstrap,
 #endif
+#if SDL_AUDIO_DRIVER_BSD
+	&BSD_AUDIO_bootstrap,
+#endif
 #if SDL_AUDIO_DRIVER_OSS
 	&DSP_bootstrap,
 	&DMA_bootstrap,

SDL-1.2.14-byteorder.patch:
 SDL_endian.h |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE SDL-1.2.14-byteorder.patch ---
diff -up SDL-1.2.14/include/SDL_endian.h.byteorder SDL-1.2.14/include/SDL_endian.h
--- SDL-1.2.14/include/SDL_endian.h.byteorder	2009-10-13 01:07:19.000000000 +0200
+++ SDL-1.2.14/include/SDL_endian.h	2009-10-26 14:27:39.000000000 +0100
@@ -39,6 +39,10 @@
 /*@}*/
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -48,6 +52,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- SDL.spec	24 Jul 2009 16:17:56 -0000	1.66
+++ SDL.spec	27 Oct 2009 12:52:46 -0000	1.67
@@ -1,26 +1,13 @@
 Summary: A cross-platform multimedia library
 Name: SDL
-Version: 1.2.13
-Release: 10%{?dist}
+Version: 1.2.14
+Release: 1%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source1: SDL_config.h
-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
-Patch28: SDL-1.2.13-audiodriver.patch
-# submitted upstream:
-# http://bugzilla.libsdl.org/show_bug.cgi?id=698
-Patch29: SDL-1.2.13-pa-rewrite.patch
-# submitted upstream:
-# http://bugzilla.libsdl.org/show_bug.cgi?id=699
-Patch30: SDL-1.2.13-rh484362.patch
-# upstream patch:
-# qemu-kvm segfaults on startup in SDL_memcpyMMX/SSE
-Patch31: SDL-1.2.13-rh487720.patch
+Patch0: SDL-1.2.14-byteorder.patch
+Patch1: SDL-1.2.12-multilib.patch
+Patch2: SDL-1.2.12-disable_yasm.patch
+Patch3: SDL-1.2.14-audiodriver.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -75,16 +62,9 @@ static SDL applications.
 %prep
 %setup -q 
 %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
-%patch28 -p1 -b .audiodriver
-%patch29 -p1 -b .pa-rewrite
-%patch30 -p1 -b .rh484362
-%patch31 -p1 -b .rh487720
+%patch1 -p1 -b .multilib
+%patch2 -p1 -b .disable_yasm
+%patch3 -p1 -b .audiodriver
 
 %build
 aclocal
@@ -142,6 +122,11 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Oct 27 2009 Thomas Woerner <twoerner at redhat.com> 1.2.14-1
+- new version 1.2.14
+- dropped patches for upstream fixes: libdir, dynamic-esd, x11dyn64,
+  dynamic-pulse, pa-rewrite, rh484362 and rh487720
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.13-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- SDL-1.2.10-byteorder.patch DELETED ---


--- SDL-1.2.10-libdir.patch DELETED ---


--- SDL-1.2.10-pagesize.patch DELETED ---


--- SDL-1.2.11-dynamic-esd.patch DELETED ---


--- SDL-1.2.11-fixman.patch DELETED ---


--- SDL-1.2.12-x11dyn64.patch DELETED ---


--- SDL-1.2.13-audiodriver.patch DELETED ---


--- SDL-1.2.13-dynamic-pulse.patch DELETED ---


--- SDL-1.2.13-libdir.patch DELETED ---


--- SDL-1.2.13-pa-rewrite.patch DELETED ---


--- SDL-1.2.13-rh484362.patch DELETED ---


--- SDL-1.2.13-rh487720.patch DELETED ---


