rpms/SDL/FC-4 SDL-1.2.8-preferalsa.patch, NONE, 1.1 SDL.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/SDL/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20007

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.8-preferalsa.patch 
Log Message:
[tw] - prefer alsa sound output, then artsd and esd



SDL-1.2.8-preferalsa.patch:
 SDL_audio.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE SDL-1.2.8-preferalsa.patch ---
--- SDL-1.2.8/src/audio/SDL_audio.c.prefer	2004-12-13 08:54:31.000000000 +0100
+++ SDL-1.2.8/src/audio/SDL_audio.c	2006-01-26 14:47:17.000000000 +0100
@@ -40,6 +40,15 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
+#ifdef ALSA_SUPPORT
+	&ALSA_bootstrap,
+#endif
+#ifdef ARTSC_SUPPORT
+	&ARTSC_bootstrap,
+#endif
+#ifdef ESD_SUPPORT
+	&ESD_bootstrap,
+#endif
 #ifdef OPENBSD_AUDIO_SUPPORT
 	&OPENBSD_AUDIO_bootstrap,
 #endif
@@ -47,9 +56,6 @@
 	&DSP_bootstrap,
 	&DMA_bootstrap,
 #endif
-#ifdef ALSA_SUPPORT
-	&ALSA_bootstrap,
-#endif
 #ifdef QNXNTOAUDIO_SUPPORT
 	&QNXNTOAUDIO_bootstrap,
 #endif
@@ -59,12 +65,6 @@
 #ifdef DMEDIA_SUPPORT
 	&DMEDIA_bootstrap,
 #endif
-#ifdef ARTSC_SUPPORT
-	&ARTSC_bootstrap,
-#endif
-#ifdef ESD_SUPPORT
-	&ESD_bootstrap,
-#endif
 #ifdef NAS_SUPPORT
 	&NAS_bootstrap,
 #endif


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/FC-4/SDL.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SDL.spec	26 May 2005 22:01:35 -0000	1.28
+++ SDL.spec	26 Jan 2006 13:53:36 -0000	1.29
@@ -1,10 +1,9 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.8
-Release: 3.2
+Release: 4
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.1.7-byteorder.patch
-Patch4: SDL-1.2.3-prefersounddaemons.patch
 Patch5: SDL-1.2.3-c++.patch
 Patch8: SDL-1.2.6-no_rpath.patch
 Patch13: SDL-1.2.7-ppc_modes.patch
@@ -12,6 +11,7 @@
 Patch15: SDL-1.2.8-gcc4.patch
 Patch16: SDL-1.2.8-x86_64.patch
 Patch17: SDL-1.2.8-libdir.patch
+Patch18: SDL-1.2.8-preferalsa.patch
 URL: http://www.libsdl.org/
 License: LGPL
 Group: System Environment/Libraries
@@ -40,7 +40,6 @@
 
 %setup -q 
 %patch0 -p1 -b .byte
-%patch4 -p1 -b .prefer
 %patch5 -p1 -b .c++
 %patch8 -p1 -b .no_rpath
 %patch13 -p1 -b .ppc_modes
@@ -48,6 +47,7 @@
 %patch15 -p1 -b .gcc4
 %patch16 -p1 -b .x86_64
 %patch17 -p1 -b .libdir
+%patch18 -p1 -b .prefer
 
 %build
 #libtoolize --copy --force
@@ -99,6 +99,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Thu Jan 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.8-4
+- prefer alsa sound output, then artsd and esd
+
 * Thu May 26 2005 Bill Nottingham <notting at redhat.com> 1.2.8-3.2
 - fix configure script for libdir so library deps are identical on all
   arches (#158346)