rpms/SDL/F-8 SDL_pulseaudio_hack.csh, NONE, 1.1 SDL_pulseaudio_hack.sh, NONE, 1.1 SDL.spec, 1.56, 1.57

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/SDL/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16610

Modified Files:
	SDL.spec 
Added Files:
	SDL_pulseaudio_hack.csh SDL_pulseaudio_hack.sh 
Log Message:
- Build with --enable-pulseaudio-shared for testing purposes (#343911)
  It is known to not work in some cases, so not enabled by default.
- Move pulseaudio enabler hack from SDL_mixer (#426275)
- Make pulseaudio enabler hack conditional.  It will only attempt to use it if
  alsa-plugins-pulseaudio is installed.



--- NEW FILE SDL_pulseaudio_hack.csh ---
# Temporary hack until SDL directly supports pulseaudio
# If alsa-plugins-pulseaudio is installed, force SDL to output sound to esd
set nonomatch
if ( -e /usr/lib*/alsa-lib/libasound_module_pcm_pulse.so ) setenv SDL_AUDIODRIVER esd 


--- NEW FILE SDL_pulseaudio_hack.sh ---
# Temporary hack until SDL directly supports pulseaudio
# If alsa-plugins-pulseaudio is installed, force SDL to output sound to esd
[ -e /usr/lib*/alsa-lib/libasound_module_pcm_pulse.so ] && export SDL_AUDIODRIVER=esd


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/F-8/SDL.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SDL.spec	6 Nov 2007 16:18:15 -0000	1.56
+++ SDL.spec	20 Dec 2007 04:28:42 -0000	1.57
@@ -1,9 +1,15 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source2: 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
+Source1: SDL_pulseaudio_hack.csh
+Source2: SDL_pulseaudio_hack.sh
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
 Patch19: SDL-1.2.12-preferalsa.patch
@@ -19,6 +25,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: arts-devel audiofile-devel
 BuildRequires: esound-devel alsa-lib-devel
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
 BuildRequires: libXrender-devel libXrandr-devel gettext-devel
@@ -73,6 +80,7 @@
    --enable-dlopen \
    --enable-arts-shared \
    --enable-esd-shared \
+   --enable-pulseaudio-shared \
    --enable-alsa \
    --disable-rpath
 make %{?_smp_mflags}
@@ -100,6 +108,11 @@
 # remove libtool .la file
 rm -f %{buildroot}%{_libdir}/*.la
 
+# Temporary SDL pulseaudio hack
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
+install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
+install -m 644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
+
 %clean
 rm -rf %{buildroot}
 
@@ -111,6 +124,8 @@
 %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)
@@ -125,6 +140,13 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Wed Dec 19 2007 Warren Togami <wtogami at redhat.com> 1.2.12-4
+- Build with --enable-pulseaudio-shared for testing purposes (#343911)
+  It is known to not work in some cases, so not enabled by default.
+- Move pulseaudio enabler hack from SDL_mixer (#426275)
+- Make pulseaudio enabler hack conditional.  It will only attempt to use it if
+  alsa-plugins-pulseaudio is installed.
+
 * Tue Nov  6 2007 Thomas Woerner <twoerner at redhat.com> 1.2.12-3
 - fixed latest multiarch conflicts: dropped libdir from sdl-config completely
   (rhbz#343141)