[Pkg-sdl-commits] r148 - unstable/libsdl1.2/debian

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-12-17 23:09:34 +0000 (Mon, 17 Dec 2007)
New Revision: 148

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/rules
Log:
  * debian/rules:
    + Add --enable-pulseaudio-shared=no to the configure args.



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2007-12-15 10:14:45 UTC (rev 147)
+++ unstable/libsdl1.2/debian/changelog	2007-12-17 23:09:34 UTC (rev 148)
@@ -1,3 +1,10 @@
+libsdl1.2 (1.2.12-3) unstable; urgency=low
+
+  * debian/rules:
+    + Add --enable-pulseaudio-shared=no to the configure args.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Dec 2007 00:08:39 +0100
+
 libsdl1.2 (1.2.12-2) unstable; urgency=low
 
   * debian/control:

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2007-12-15 10:14:45 UTC (rev 147)
+++ unstable/libsdl1.2/debian/rules	2007-12-17 23:09:34 UTC (rev 148)
@@ -5,13 +5,6 @@
 
 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)
@@ -38,10 +31,9 @@
 		 --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-pulseaudio
+		 --disable-audio-oss --disable-audio-nas --disable-audio-alsa
 
-FLAVOURS = arts esd oss nas pulseaudio
+FLAVOURS = arts esd oss nas
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -59,9 +51,14 @@
 # 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
@@ -70,8 +67,10 @@
 # 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
 
@@ -104,7 +103,7 @@
 build-stamp: configure-stamp
 	dh_testdir
 	for dir in all $(FLAVOURS) udeb; do \
-	    $(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \
+	    $(MAKE) -C builddir/$$dir || exit 1; \
 	done
 	touch build-stamp
 
@@ -156,7 +155,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) 
+	dh_gencontrol $(no_libasound) -- -Vlibsvga1-dev=$(LIBSVGA1-DEV) -Vlibasound2-dev=$(LIBASOUND2-DEV) -Vlibusbhid-dev=$(LIBUSBHID-DEV)
 	dh_md5sums
 	dh_builddeb $(no_libasound)