[Pkg-sdl-commits] r184 - in unstable/sdl-mixer1.2/debian: . patches

[sho at alioth.debian.org]

Author: sho
Date: 2008-05-21 11:55:31 +0000 (Wed, 21 May 2008)
New Revision: 184

Added:
   unstable/sdl-mixer1.2/debian/patches/00_no_lvorbis_logg.diff
Modified:
   unstable/sdl-mixer1.2/debian/changelog
   unstable/sdl-mixer1.2/debian/patches/01_autoreconf.patch
   unstable/sdl-mixer1.2/debian/patches/series
   unstable/sdl-mixer1.2/debian/rules
Log:
sdl-mixer1.2 (1.2.8-4) unstable; urgency=low

  * debian/rules:
    + Properly link the library with -lvorbisfile and -lsmpeg instead of
      dynamically opening them at runtime.

  * 00_no_lvorbis_logg.diff:
    + New patch. Do not uselessly link with -lvorbis -logg.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 21 May 2008 11:54:21 +0000


Modified: unstable/sdl-mixer1.2/debian/changelog
===================================================================
--- unstable/sdl-mixer1.2/debian/changelog	2008-04-22 20:28:24 UTC (rev 183)
+++ unstable/sdl-mixer1.2/debian/changelog	2008-05-21 11:55:31 UTC (rev 184)
@@ -1,3 +1,14 @@
+sdl-mixer1.2 (1.2.8-4) unstable; urgency=low
+
+  * debian/rules:
+    + Properly link the library with -lvorbisfile and -lsmpeg instead of
+      dynamically opening them at runtime.
+
+  * 00_no_lvorbis_logg.diff:
+    + New patch. Do not uselessly link with -lvorbis -logg.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 21 May 2008 11:54:21 +0000
+
 sdl-mixer1.2 (1.2.8-3) unstable; urgency=low
 
   * debian/control:

Added: unstable/sdl-mixer1.2/debian/patches/00_no_lvorbis_logg.diff
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/00_no_lvorbis_logg.diff	                        (rev 0)
+++ unstable/sdl-mixer1.2/debian/patches/00_no_lvorbis_logg.diff	2008-05-21 11:55:31 UTC (rev 184)
@@ -0,0 +1,13 @@
+Index: sdl-mixer1.2-1.2.8/configure.in
+===================================================================
+--- sdl-mixer1.2-1.2.8.orig/configure.in	2008-05-21 11:51:07.000000000 +0000
++++ sdl-mixer1.2-1.2.8/configure.in	2008-05-21 11:51:18.000000000 +0000
+@@ -317,7 +317,7 @@
+                 echo "-- dynamic libvorbisfile -> $ogg_lib"
+                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
+             else
+-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg"
++                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile"
+             fi
+         fi
+     fi

Modified: unstable/sdl-mixer1.2/debian/patches/01_autoreconf.patch
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/01_autoreconf.patch	2008-04-22 20:28:24 UTC (rev 183)
+++ unstable/sdl-mixer1.2/debian/patches/01_autoreconf.patch	2008-05-21 11:55:31 UTC (rev 184)
@@ -1,7 +1,7 @@
 Index: sdl-mixer1.2-1.2.8/configure
 ===================================================================
---- sdl-mixer1.2-1.2.8.orig/configure	2007-10-07 21:34:59.000000000 +0000
-+++ sdl-mixer1.2-1.2.8/configure	2007-10-07 21:38:38.000000000 +0000
+--- sdl-mixer1.2-1.2.8.orig/configure	2008-05-21 11:50:40.000000000 +0000
++++ sdl-mixer1.2-1.2.8/configure	2008-05-21 11:51:37.000000000 +0000
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -10481,7 +10481,13 @@
  if test $ac_cv_lib_vorbisfile_ov_open_callbacks = yes; then
    have_ogg_lib=yes
  fi
-@@ -20206,38 +21010,38 @@
+@@ -20201,43 +21005,43 @@
+                 echo "-- dynamic libvorbisfile -> $ogg_lib"
+                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
+             else
+-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg"
++                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile"
+             fi
          fi
      fi
  fi

Modified: unstable/sdl-mixer1.2/debian/patches/series
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/series	2008-04-22 20:28:24 UTC (rev 183)
+++ unstable/sdl-mixer1.2/debian/patches/series	2008-05-21 11:55:31 UTC (rev 184)
@@ -1,4 +1,5 @@
 00_link-libm.patch
+00_no_lvorbis_logg.diff
 01_autoreconf.patch
 01_relibtoolize.patch 
 02_hurd.patch -p1

Modified: unstable/sdl-mixer1.2/debian/rules
===================================================================
--- unstable/sdl-mixer1.2/debian/rules	2008-04-22 20:28:24 UTC (rev 183)
+++ unstable/sdl-mixer1.2/debian/rules	2008-05-21 11:55:31 UTC (rev 184)
@@ -13,6 +13,8 @@
 
 confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 confflags += --enable-music-native-midi-gpl --enable-music-libmikmod
+confflags += --disable-music-ogg-shared
+confflags += --disable-music-mp3-shared
 confflags += "CPPFLAGS=-Wall"
 confflags += "LDFLAGS=-Wl,-z,defs -Wl,-Bsymbolic -Wl,--as-needed"