rpms/SDL/devel SDL-1.2.13-dynamic-pulse.patch, NONE, 1.1 SDL-1.2.13-libdir.patch, NONE, 1.1 SDL_pulseaudio_hack.csh, NONE, 1.1 SDL_pulseaudio_hack.sh, NONE, 1.1 SDL.spec, 1.56, 1.57 sources, 1.15, 1.16
Thomas Woerner (twoerner)
fedora-extras-commits at redhat.com
Mon Jan 7 18:03:58 UTC 2008
Author: twoerner
Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14945
Modified Files:
SDL.spec sources
Added Files:
SDL-1.2.13-dynamic-pulse.patch SDL-1.2.13-libdir.patch
SDL_pulseaudio_hack.csh SDL_pulseaudio_hack.sh
Log Message:
- new version 1.2.13
- fixes i810 video overlay problem (rhbz#310841)
- fixes c++ style comments in header files (rhbz#426475)
- review fixes: spec file cleanup, dropped static libs (rhbz#226402)
- fixed pulseaudio hack scripts from Warren for multilib systems (rhbz#426579)
- fixed pulseaudio detection in configure to enable dynamic use of pulseaudio
libraries
SDL-1.2.13-dynamic-pulse.patch:
--- NEW FILE SDL-1.2.13-dynamic-pulse.patch ---
diff -up SDL-1.2.13/configure.in.dynamic-pulse SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.dynamic-pulse 2008-01-07 12:31:57.000000000 +0100
+++ SDL-1.2.13/configure.in 2008-01-07 12:32:02.000000000 +0100
@@ -500,14 +510,15 @@ AC_HELP_STRING([--enable-pulseaudio], [u
if test x$audio_pulse = xyes; then
AC_ARG_ENABLE(pulseaudio-shared,
AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
- , enable_pulse_shared=yes)
+ , enable_pulseaudio_shared=yes)
if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
- if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
- PULSE_LIBS="-L/lib $PULSE_LIBS"
- elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
- PULSE_LIBS="-L/usr/lib $PULSE_LIBS"
- elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
- PULSE_LIBS="-L/usr/local/lib $PULSE_LIBS"
+ pfx=${libdir##*/}
+ if test "x`ls /${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+ PULSE_LIBS="-L/${pfx} $PULSE_LIBS"
+ elif test "x`ls /usr/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+ PULSE_LIBS="-L/usr/${pfx} $PULSE_LIBS"
+ elif test "x`ls /usr/local/${pfx}/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+ PULSE_LIBS="-L/usr/local/${pfx} $PULSE_LIBS"
fi
fi
pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
@@ -518,11 +529,11 @@ AC_HELP_STRING([--enable-pulseaudio-shar
SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
if test x$have_loadso != xyes && \
- test x$enable_pulse_shared = xyes; then
+ test x$enable_pulseaudio_shared = xyes; then
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
fi
if test x$have_loadso = xyes && \
- test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
+ test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"
SDL-1.2.13-libdir.patch:
--- NEW FILE SDL-1.2.13-libdir.patch ---
diff -up SDL-1.2.13/configure.in.libdir SDL-1.2.13/configure.in
--- SDL-1.2.13/configure.in.libdir 2007-12-31 05:48:39.000000000 +0100
+++ SDL-1.2.13/configure.in 2008-01-07 11:56:10.000000000 +0100
@@ -348,12 +348,13 @@ AC_HELP_STRING([--enable-alsa], [support
AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
, enable_alsa_shared=yes)
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/lib $ALSA_LIBS"
- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+ pfx=${libdir##*/}
+ if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+ elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+ elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
fi
fi
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
@@ -561,7 +572,8 @@ AC_HELP_STRING([--enable-arts], [support
AC_ARG_ENABLE(arts-shared,
AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
, enable_arts_shared=yes)
- arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+ pfx=${libdir##*/}
+ arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $arts_lib_spec -> $arts_lib"
diff -up SDL-1.2.13/configure.libdir SDL-1.2.13/configure
--- SDL-1.2.13/configure.libdir 2007-12-31 06:09:39.000000000 +0100
+++ SDL-1.2.13/configure 2008-01-07 12:01:32.000000000 +0100
@@ -24888,12 +24888,13 @@ else
fi
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/lib $ALSA_LIBS"
- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
+ pfx=${libdir##*/}
+ if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
+ elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
+ elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
+ ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
fi
fi
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
@@ -25643,7 +25634,8 @@ else
enable_arts_shared=yes
fi
- arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
+ pfx=${libdir##*/}
+ arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $arts_lib_spec -> $arts_lib"
--- 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
if ( -e /usr/lib/alsa-lib/libasound_module_pcm_pulse.so || -e /usr/lib64/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 -o -e /usr/lib64/alsa-lib/libasound_module_pcm_pulse.so ] && export SDL_AUDIODRIVER=esd
Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SDL.spec 6 Nov 2007 16:15:28 -0000 1.56
+++ SDL.spec 7 Jan 2008 18:03:23 -0000 1.57
@@ -1,17 +1,23 @@
Summary: A cross-platform multimedia library
Name: SDL
-Version: 1.2.12
-Release: 3%{?dist}
+Version: 1.2.13
+Release: 1%{?dist}
Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-Source2: SDL_config.h
+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.10-libdir.patch
+Patch17: SDL-1.2.13-libdir.patch
Patch19: SDL-1.2.12-preferalsa.patch
Patch21: SDL-1.2.12-multilib.patch
-Patch22: SDL-1.2.11-fixman.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
URL: http://www.libsdl.org/
License: LGPL
@@ -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
@@ -33,7 +40,7 @@
device.
%package devel
-Summary: Files needed to develop Simple DirectMedia Layer applications.
+Summary: Files needed to develop Simple DirectMedia Layer applications
Group: Development/Libraries
Requires: SDL = %{version}-%{release} alsa-lib-devel
Requires: libX11-devel
@@ -42,6 +49,8 @@
Requires: libGLU-devel
Requires: libXrender-devel
Requires: libXrandr-devel
+Requires: pkgconfig
+Requires: automake
%description devel
Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -50,22 +59,19 @@
resources needed for developing SDL applications.
%prep
-rm -rf %{buildroot}
-
%setup -q
%patch0 -p1 -b .byteorder
%patch17 -p1 -b .libdir
%patch19 -p1 -b .preferalsa
%patch21 -p1 -b .multilib
-%patch22 -p1 -b .fixman
%patch23 -p1 -b .dynamic-esd
%patch24 -p1 -b .x11dyn64
%patch25 -p1 -b .disable_yasm
+%patch26 -p1 -b .dynamic-pulse
%build
aclocal
autoconf
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
%configure \
--disable-video-svga --disable-video-ggi --disable-video-aalib \
--disable-debug \
@@ -73,6 +79,7 @@
--enable-dlopen \
--enable-arts-shared \
--enable-esd-shared \
+ --enable-pulseaudio-shared \
--enable-alsa \
--disable-rpath
make %{?_smp_mflags}
@@ -95,10 +102,17 @@
%endif
# Rename SDL_config.h
mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-${basearch}.h
-install -m644 %{SOURCE2} %{buildroot}/%{_includedir}/SDL/SDL_config.h
+install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/SDL/SDL_config.h
# remove libtool .la file
rm -f %{buildroot}%{_libdir}/*.la
+# remove static libs
+rm -f %{buildroot}%{_libdir}/*.a
+
+# 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}
@@ -111,20 +125,41 @@
%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)
-%doc README README-SDL.txt COPYING CREDITS BUGS WhatsNew docs.html docs/html
+%doc README WhatsNew docs.html docs/html
%doc docs/index.html
%{_bindir}/*-config
%{_libdir}/lib*.so
-%{_libdir}/*a
%{_libdir}/pkgconfig/sdl.pc
%{_includedir}/SDL
%{_datadir}/aclocal/*
%{_mandir}/man3/SDL*.3*
%changelog
+* Mon Jan 7 2008 Thomas Woerner <twoerner at redhat.com> 1.2.13-1
+- new version 1.2.13
+ - fixes i810 video overlay problem (rhbz#310841)
+ - fixes c++ style comments in header files (rhbz#426475)
+- review fixes: spec file cleanup, dropped static libs (rhbz#226402)
+- fixed pulseaudio hack scripts from Warren for multilib systems (rhbz#426579)
+- fixed pulseaudio detection in configure to enable dynamic use of pulseaudio
+ libraries
+
+* Fri Dec 21 2007 Warren Togami <wtogami at redhat.com> 1.2.12-5
+- correct stupid mistake that broke SDL-devel
+ RPM should error out if a SourceX is defined twice...
+
+* 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)
@@ -460,7 +495,7 @@
- Re-integrated spec file into SDL distribution
- 'name' and 'version' come from configure
- Some of the documentation is devel specific
-- Removed SMP support from %build - it doesn't work with libtool anyway
+- Removed SMP support from %%build - it doesn't work with libtool anyway
* Tue Jan 18 2000 Hakan Tandogan <hakan at iconsult.com>
- Hacked Mandrake sdl spec to build 1.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 27 Aug 2007 16:32:32 -0000 1.15
+++ sources 7 Jan 2008 18:03:23 -0000 1.16
@@ -1 +1 @@
-544b4554986e51eed6d34435cf9c5f3f SDL-1.2.12.tar.gz
+c6660feea2a6834de10bc71b2f8e4d88 SDL-1.2.13.tar.gz
More information about the fedora-extras-commits
mailing list