[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3++final-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 3a9686743ec5bd560cd1a63f57d4c1914a6f974d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 09:49:16 2010 +0200

    support parallel building

diff --git a/debian/rules b/debian/rules
index a25dbb8..c39ae0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,19 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+# Support multiple makes at once
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+# on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS
+ifeq      ($(DEB_HOST_ARCH),i386)
+NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+else ifeq ($(DEB_HOST_ARCH),amd64)
+NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+endif
+endif
+
+
 # do not run the actual rules of this makefile in parallel. sub-makes
 # can go in parallel
 .NOTPARALLEL:
@@ -99,7 +112,7 @@ debian/mplayer/usr/bin/mplayer:
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
 	$(CLEAN_ENV) \
-	$(MAKE) mplayer
+	$(MAKE) $(NUMJOBS) mplayer 
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
 	$(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
 	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
@@ -111,7 +124,7 @@ debian/mencoder/usr/bin/mencoder:
 	dh_testdir
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
-	$(MAKE) mencoder
+	$(MAKE) $(NUMJOBS) mencoder
 	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
 
 # build gui version
@@ -120,7 +133,7 @@ debian/mplayer-gui/usr/bin/gmplayer:
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
 	$(CLEAN_ENV) \
-	$(MAKE) mplayer
+	$(MAKE) $(NUMJOBS) mplayer
 	install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
 	install -D -m 644 etc/mplayer.desktop \
 	                  $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop

-- 
mplayer packaging