[Pkg-sdl-commits] r149 - in unstable/libsdl1.2/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Mon Dec 17 23:11:42 UTC 2007
Author: aurel32
Date: 2007-12-17 23:11:42 +0000 (Mon, 17 Dec 2007)
New Revision: 149
Added:
unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff
Modified:
unstable/libsdl1.2/debian/changelog
unstable/libsdl1.2/debian/patches/series
unstable/libsdl1.2/debian/rules
Log:
* debian/patches/030_pulseaudio_enable.diff:
+ Fix pulseaudio argument parsing.
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2007-12-17 23:09:34 UTC (rev 148)
+++ unstable/libsdl1.2/debian/changelog 2007-12-17 23:11:42 UTC (rev 149)
@@ -2,6 +2,8 @@
* debian/rules:
+ Add --enable-pulseaudio-shared=no to the configure args.
+ * debian/patches/030_pulseaudio_enable.diff:
+ + Fix pulseaudio argument parsing.
-- Aurelien Jarno <aurel32 at debian.org> Tue, 18 Dec 2007 00:08:39 +0100
Added: unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff (rev 0)
+++ unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff 2007-12-17 23:11:42 UTC (rev 149)
@@ -0,0 +1,36 @@
+--- libsdl1.2-1.2.12.orig/configure.in 2007-12-17 23:32:30.000000000 +0100
++++ libsdl1.2-1.2.12/configure.in 2007-12-17 23:33:09.000000000 +0100
+@@ -470,8 +470,8 @@
+ {
+ AC_ARG_ENABLE(pulseaudio,
+ AC_HELP_STRING([--enable-pulseaudio], [use PulseAudio [[default=yes]]]),
+- , enable_pulse=yes)
+- if test x$enable_audio = xyes -a x$enable_pulse = xyes; then
++ , enable_pulseaudio=yes)
++ if test x$enable_audio = xyes -a x$enable_pulseaudio = xyes; then
+ audio_pulse=no
+
+ PULSE_REQUIRED_VERSION=0.9
+@@ -490,7 +490,7 @@
+ 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"
+@@ -508,11 +508,11 @@
+ 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"
Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series 2007-12-17 23:09:34 UTC (rev 148)
+++ unstable/libsdl1.2/debian/patches/series 2007-12-17 23:11:42 UTC (rev 149)
@@ -3,6 +3,7 @@
011_no_yasm.diff
012_nasm_include.diff
020_libcaca_new_api.diff
+030_pulseaudio_enable.diff
040_propagate_pic_to_nasm.diff
100_relibtoolize.diff
205_lock_keys.diff
Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules 2007-12-17 23:09:34 UTC (rev 148)
+++ unstable/libsdl1.2/debian/rules 2007-12-17 23:11:42 UTC (rev 149)
@@ -5,6 +5,13 @@
MAKE=make
+# Support multiple makes at once based on number of processors
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NJOBS := 1
+endif
+
export SHLIBVER=(>= 1.2.10-1)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -20,7 +27,7 @@
confflags += --disable-rpath --enable-dlopen \
--enable-dependency-tracking \
--enable-arts-shared=no --enable-alsa-shared=no \
- --enable-esd-shared=no
+ --enable-esd-shared=no --enable-pulseaudio-shared=no
all_confflags = --disable-video-ggi \
--enable-video-aalib --enable-video-directfb \
--enable-video-caca
@@ -31,9 +38,10 @@
--disable-video-opengl --disable-video-xbios \
--disable-video-gem --disable-video-caca \
--disable-audio --disable-audio-arts --disable-audio-esd \
- --disable-audio-oss --disable-audio-nas --disable-audio-alsa
+ --disable-audio-oss --disable-audio-nas --disable-audio-alsa \
+ --disable-pulseaudio
-FLAVOURS = arts esd oss nas
+FLAVOURS = arts esd oss nas pulseaudio
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -51,14 +59,9 @@
# Only build SVGA support on linux-x86 and linux-amd64
ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 i386))
all_confflags += --enable-video-svga
- LIBSVGA1-DEV = libsvga1-dev
else
all_confflags += --disable-video-svga
endif
-# Only depends on libusbhid-dev on GNU/kFreeBSD
-ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
- LIBUSBHID-DEV = libusbhid-dev
-endif
# Only use NASM routines on x86 CPUs
ifeq ($(DEB_BUILD_ARCH_CPU),i386)
confflags += --enable-nasm
@@ -67,10 +70,8 @@
# Only build ALSA support on Linux targets
ifeq ($(DEB_BUILD_ARCH_OS),linux)
FLAVOURS += alsa
- LIBASOUND2-DEV = libasound2-dev
no_libasound =
else
- LIBASOUND2-DEV =
no_libasound = -Nlibsdl1.2debian-alsa
endif
@@ -103,7 +104,7 @@
build-stamp: configure-stamp
dh_testdir
for dir in all $(FLAVOURS) udeb; do \
- $(MAKE) -C builddir/$$dir || exit 1; \
+ $(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \
done
touch build-stamp
@@ -155,7 +156,7 @@
for dir in all $(FLAVOURS) udeb; do echo "libSDL-1.2 0 libsdl1.2debian $$SHLIBVER" > debian/libsdl1.2debian-$$dir/DEBIAN/shlibs; done
dh_installdeb
dh_shlibdeps
- dh_gencontrol $(no_libasound) -- -Vlibsvga1-dev=$(LIBSVGA1-DEV) -Vlibasound2-dev=$(LIBASOUND2-DEV) -Vlibusbhid-dev=$(LIBUSBHID-DEV)
+ dh_gencontrol $(no_libasound)
dh_md5sums
dh_builddeb $(no_libasound)
More information about the pkg-sdl-commits
mailing list