Hello community, here is the log from the commit of package SDL checked in at Sat May 31 12:29:34 CEST 2008. -------- --- SDL/SDL.changes 2008-04-10 13:00:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/SDL/SDL.changes 2008-05-29 00:30:18.388806000 +0200 @@ -1,0 +2,10 @@ +Tue May 27 09:54:45 MST 2008 - wberrier@novell.com + +- Build with pulseaudio support to fix some sdl apps + (xmoto in this case) (bnc#394721) +- Fix dynamic loading on x86_64 for pulse and libasound. + This is mainly done so that libsdl doesn't linked against + libpulse, but it also fixes libasound on x86_64. + (updated SDL-1.2.13-autoconf.patch) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.q20113/_old 2008-05-31 12:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q20113/_new 2008-05-31 12:27:44.000000000 +0200 @@ -13,7 +13,7 @@ %define aalib 0 Name: SDL -BuildRequires: arts-devel esound-devel nasm +BuildRequires: arts-devel esound-devel libpulse-devel nasm %if 0%{?aalib} == 1 BuildRequires: aalib-devel %endif @@ -21,7 +21,7 @@ Group: System/Libraries AutoReqProv: on Version: 1.2.13 -Release: 33 +Release: 48 Summary: Simple DirectMedia Layer Library Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-rpath.patch @@ -130,6 +130,13 @@ %{_libdir}/pkgconfig/sdl.pc %changelog +* Tue May 27 2008 wberrier@novell.com +- Build with pulseaudio support to fix some sdl apps + (xmoto in this case) (bnc#394721) +- Fix dynamic loading on x86_64 for pulse and libasound. + This is mainly done so that libsdl doesn't linked against + libpulse, but it also fixes libasound on x86_64. + (updated SDL-1.2.13-autoconf.patch) * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support @@ -235,7 +242,7 @@ - fixed dangerous compiler warnings * Sat Jan 10 2004 adrian@suse.de - add %%defattr and %%run_ldconfig -* Fri Nov 21 2003 ro@suse.de +* Thu Nov 20 2003 ro@suse.de - compile with -DALSA_PCM_OLD_HW_PARAMS_API * Mon Oct 06 2003 ro@suse.de - added glib2(-devel) to neededforbuild (arts) @@ -243,7 +250,7 @@ - fixed the detection of ALSA device using non-blocking open mode. * Tue Jul 29 2003 aj@suse.de - Fix problems exposed by unit-at-a-time. -* Fri Jun 20 2003 ro@suse.de +* Thu Jun 19 2003 ro@suse.de - fix build with current automake * Mon May 26 2003 ro@suse.de - fix problem with target_cpu macro definition in specfile @@ -252,11 +259,11 @@ - hack to build with current libtool * Mon Mar 31 2003 ro@suse.de - use mesa-devel-packages in neededforbuild -* Wed Nov 20 2002 ro@suse.de +* Tue Nov 19 2002 ro@suse.de - work around problem with latest automake * Tue Nov 12 2002 nadvornik@suse.cz updated to 1.2.5: bugfix release -* Mon Nov 11 2002 ro@suse.de +* Sun Nov 10 2002 ro@suse.de - fix deprecated multiline string literal for gcc-3.3 * Tue Sep 24 2002 froh@suse.de - %%-ifarch'ed Requires: alsa-devel for all but s390 and s390x (#18647) @@ -264,7 +271,7 @@ - Remove kdelibs3-devel from neededforbuild * Tue Aug 20 2002 tiwai@suse.de - fixed endian check using endian.h [bug #18106] -* Mon Aug 12 2002 ro@suse.de +* Sun Aug 11 2002 ro@suse.de - remove OBJCDEPFLAGS from configure.in * Mon Jun 10 2002 meissner@suse.de - use system AM_PROG_LIBTOOL, so we get a newer libtool. @@ -277,7 +284,7 @@ - remove obsolete -malign stuff(opt_flags use -mcpu=i686 now) * Tue Apr 02 2002 nadvornik@suse.cz - fixed to compile with new autoconf -* Fri Feb 15 2002 ro@suse.de +* Thu Feb 14 2002 ro@suse.de - changed neededforbuild <kdelibs3-artsd> to <arts arts-devel> * Mon Feb 04 2002 egmont@suselinux.hu - enable aalib support @@ -353,7 +360,7 @@ * Wed May 03 2000 kukuk@suse.de - Fix configure for new libtool - use defaultdocdir macro -* Sat Apr 08 2000 bk@suse.de +* Fri Apr 07 2000 bk@suse.de - added suse update config macro * Sun Apr 02 2000 sndirsch@suse.de - update to version 1.0.8 (e.g. required by aleclone 1.16.1) ++++++ SDL-1.2.13-autoconf.patch ++++++ --- /var/tmp/diff_new_pack.q20113/_old 2008-05-31 12:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.q20113/_new 2008-05-31 12:27:44.000000000 +0200 @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- configure.in.orig 2008-05-29 00:33:03.535492000 +0200 ++++ configure.in 2008-05-29 00:34:21.277673000 +0200 @@ -90,6 +90,7 @@ LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" @@ -8,7 +8,36 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_PROG_CC -@@ -429,8 +430,13 @@ +@@ -287,6 +288,9 @@ + AC_DEFINE(SDL_ASSEMBLY_ROUTINES) + fi + ++dnl set this to use on systems that use lib64 instead of lib ++base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'` ++ + dnl See if the OSS audio interface is supported + CheckOSS() + { +@@ -348,12 +352,12 @@ + 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" ++ if test "x`ls /$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then ++ ALSA_LIBS="-L/$base_libdir $ALSA_LIBS" ++ elif test "x`ls /usr/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then ++ ALSA_LIBS="-L/usr/$base_libdir $ALSA_LIBS" ++ elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then ++ ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS" + fi + fi + alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'` +@@ -452,8 +456,13 @@ AC_ARG_ENABLE(esd-shared, AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), , enable_esd_shared=yes) @@ -24,12 +53,31 @@ echo "-- $esd_lib_spec -> $esd_lib" AC_DEFINE(SDL_AUDIO_DRIVER_ESD) -@@ -481,7 +487,7 @@ +@@ -501,12 +510,12 @@ + AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]), + , enable_pulse_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" ++ if test "x`ls /$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then ++ PULSE_LIBS="-L/$base_libdir $PULSE_LIBS" ++ elif test "x`ls /usr/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then ++ PULSE_LIBS="-L/usr/$base_libdir $PULSE_LIBS" ++ elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then ++ PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS" + fi + fi + pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'` +@@ -561,7 +570,7 @@ 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.*" -+ arts_lib_spec="$ARTS_PREFIX/lib*/libartsc.so.*" ++ arts_lib_spec="$ARTS_PREFIX/$base_libdir/libartsc.so.*" arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` echo "-- $arts_lib_spec -> $arts_lib" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org