rpms/SDL/devel SDL-1.2.13-audiodriver.patch, NONE, 1.1 SDL.spec, 1.61, 1.62 SDL-1.2.12-preferalsa.patch, 1.1, NONE SDL_pulseaudio_hack.csh, 1.1, NONE SDL_pulseaudio_hack.sh, 1.1, NONE

[Thomas Woerner]

Author: twoerner

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

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.13-audiodriver.patch 
Removed Files:
	SDL-1.2.12-preferalsa.patch SDL_pulseaudio_hack.csh 
	SDL_pulseaudio_hack.sh 
Log Message:
- dropped pulseaudio hack (rhbz#448270)
- pulseaudio is now used by default
- simplified spec file for new architecture support (rhbz#433618)



SDL-1.2.13-audiodriver.patch:

--- NEW FILE SDL-1.2.13-audiodriver.patch ---
diff -up SDL-1.2.13/src/audio/SDL_audio.c.audiodriver SDL-1.2.13/src/audio/SDL_audio.c
--- SDL-1.2.13/src/audio/SDL_audio.c.audiodriver	2007-12-31 05:47:59.000000000 +0100
+++ SDL-1.2.13/src/audio/SDL_audio.c	2008-09-01 14:53:58.000000000 +0200
@@ -36,6 +36,12 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
+#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
@@ -43,12 +49,6 @@ static AudioBootStrap *bootstrap[] = {
 	&DSP_bootstrap,
 	&DMA_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_ALSA
-	&ALSA_bootstrap,
-#endif
-#if SDL_AUDIO_DRIVER_PULSE
-	&PULSE_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_QNXNTO
 	&QNXNTOAUDIO_bootstrap,
 #endif


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- SDL.spec	14 Jul 2008 16:00:05 -0000	1.61
+++ SDL.spec	2 Sep 2008 14:58:48 -0000	1.62
@@ -1,24 +1,18 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.13
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source1: SDL_config.h
-# Temporary hack: Use pulseaudio via esd so SDL apps don't lock up when they
-# attempt to use ALSA via pulseaudio.  This will be removed when...
-# 1) SDL's pulseaudio support is working natively without problems
-# 2) it conditionally switches to pulseaudio or ALSA automatically
-Source2: SDL_pulseaudio_hack.csh
-Source3: SDL_pulseaudio_hack.sh
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.13-libdir.patch
-Patch19: SDL-1.2.12-preferalsa.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
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -74,13 +68,13 @@
 %setup -q 
 %patch0 -p1 -b .byteorder
 %patch17 -p1 -b .libdir
-%patch19 -p1 -b .preferalsa
 %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
 aclocal
@@ -104,27 +98,12 @@
 
 # Rename SDL_config.h to SDL_config-<arch>.h to avoid file conflicts on
 # multilib systems and install SDL_config.h wrapper
-basearch=%{_arch}
-# always use i386 for iX86
-%ifarch %{ix86}
-basearch=i386
-%endif
-# always use arm for arm*
-%ifarch %{arm}
-basearch=arm
-%endif
-# Rename SDL_config.h
-mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-${basearch}.h
+mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-%{_arch}.h
 install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/SDL/SDL_config.h
 
 # remove libtool .la file
 rm -f %{buildroot}%{_libdir}/*.la
 
-# Temporary SDL pulseaudio hack
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 %clean
 rm -rf %{buildroot}
 
@@ -136,8 +115,6 @@
 %defattr(-,root,root)
 %doc README-SDL.txt COPYING CREDITS BUGS
 %{_libdir}/lib*.so.*
-# Temporary SDL pulseaudio hack
-%{_sysconfdir}/profile.d/*
 
 %files devel
 %defattr(-,root,root)
@@ -155,6 +132,11 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Sep  2 2008 Thomas Woerner <twoerner at redhat.com> 1.2.13-6
+- dropped pulseaudio hack (rhbz#448270)
+- pulseaudio is now used by default
+- simplified spec file for new architecture support (rhbz#433618)
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.13-5
 - fix license tag
 


--- SDL-1.2.12-preferalsa.patch DELETED ---


--- SDL_pulseaudio_hack.csh DELETED ---


--- SDL_pulseaudio_hack.sh DELETED ---