[Pkg-sdl-commits] r150 - in unstable/libsdl1.2/debian: . patches

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-12-17 23:12:25 +0000 (Mon, 17 Dec 2007)
New Revision: 150

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
Log:
  * debian/patches/100_relibtoolize.diff
    + Update.



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2007-12-17 23:11:42 UTC (rev 149)
+++ unstable/libsdl1.2/debian/changelog	2007-12-17 23:12:25 UTC (rev 150)
@@ -4,8 +4,10 @@
     + Add --enable-pulseaudio-shared=no to the configure args.
   * debian/patches/030_pulseaudio_enable.diff:
     + Fix pulseaudio argument parsing.
+  * debian/patches/100_relibtoolize.diff
+    + Update.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Dec 2007 00:08:39 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Dec 2007 00:12:00 +0100
 
 libsdl1.2 (1.2.12-2) unstable; urgency=low
 

Modified: unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/100_relibtoolize.diff	2007-12-17 23:11:42 UTC (rev 149)
+++ unstable/libsdl1.2/debian/patches/100_relibtoolize.diff	2007-12-17 23:12:25 UTC (rev 150)
@@ -32199,7 +32199,7 @@
              esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'`
              esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
              echo "-- $esd_lib_spec -> $esd_lib"
-@@ -24709,13 +25490,13 @@
+@@ -24709,22 +25490,22 @@
  
  CheckPulseAudio()
  {
@@ -32210,14 +32210,16 @@
 -
 +  enableval=$enable_pulseaudio;
  else
-   enable_pulse=yes
+-  enable_pulse=yes
 -fi;
+-    if test x$enable_audio = xyes -a x$enable_pulse = xyes; then
++  enable_pulseaudio=yes
 +fi
 +
-     if test x$enable_audio = xyes -a x$enable_pulse = xyes; then
++    if test x$enable_audio = xyes -a x$enable_pulseaudio = xyes; then
          audio_pulse=no
  
-@@ -24723,8 +25504,8 @@
+         PULSE_REQUIRED_VERSION=0.9
  
          # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -32285,13 +32287,29 @@
 -
 +  enableval=$enable_pulseaudio_shared;
  else
-   enable_pulse_shared=yes
+-  enable_pulse_shared=yes
 -fi;
++  enable_pulseaudio_shared=yes
 +fi
 +
              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"
+@@ -24801,12 +25583,12 @@
+             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
+                 { echo "$as_me:$LINENO: WARNING: You must have SDL_LoadObject() support for dynamic PulseAudio loading" >&5
+ echo "$as_me: WARNING: You must have SDL_LoadObject() support for dynamic PulseAudio loading" >&2;}
+             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
+                 cat >>confdefs.h <<_ACEOF
+ #define SDL_AUDIO_DRIVER_PULSE_DYNAMIC "$pulse_lib"
+ _ACEOF
 @@ -24821,18 +25603,18 @@
  
  CheckARTSC()