[SCM] audacity/master: Build with jack on all architectures.

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Mon Sep 20 16:06:04 UTC 2010


The following commit has been merged in the master branch:
commit 0586b278849083e1f9ba8e3c6ddca70cf5cc8470
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Mon Sep 20 16:37:21 2010 +0200

    Build with jack on all architectures.
    
    Due to a bug, jack was enabled on all architectures except on i386, amd64,
    powerpc. Instead it should have been enabled only on i386, amd64, powerpc.

diff --git a/debian/rules b/debian/rules
index 80feffd..00696ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,5 @@
 #!/usr/bin/make -f
 
-# only enable jack on i386 and powerpc (See #406754)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifeq (,$(filter $(DEB_HOST_ARCH_CPU),i386 amd64 powerpc))
-WITH_JACK_CONFFLAG := --with-jack=yes
-else
-WITH_JACK_CONFFLAG := --with-jack=no
-endif
-
 # Do not link against unused libraries (make dpkg-shlibdeps happy).
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
@@ -15,7 +7,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(WITH_JACK_CONFFLAG) \
+	dh_auto_configure -- \
 		--with-expat=system \
 		--with-ffmpeg=system \
 		--with-libflac=system \

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list