[SCM] cmus/master: Re-introduce Roaraudio support:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Aug 14 12:34:05 UTC 2014


The following commit has been merged in the master branch:
commit 3a6191de2cf5a9a57f7c7ffc9637c7a2468afe12
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Aug 14 13:30:17 2014 +0100

    Re-introduce Roaraudio support:
    
    - debian/control: Add build-dependency on libroad-dev.
    - debian/rules:
      + Tune dpkg-shlibdeps call to move pulse and roar's
        dependencies to Recommends. Made the whole mechanism
        slightly more elegant.

diff --git a/debian/control b/debian/control
index f3f0415..ed1b44f 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
  libmpcdec-dev,
  libncursesw5-dev,
  libpulse-dev (>= 0.9.19),
+ libroar-dev,
  libvorbis-dev,
  libwavpack-dev,
  pkg-config
diff --git a/debian/rules b/debian/rules
index cc4665d..3f1c690 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,11 @@
 LDFLAGS+=-Wl,--as-needed
 CFLAGS+=-I/usr/include/ncursesw
 
+recommended_deps = pulse roar
+
+EXTRA_CMUS_DIR_OP_PLUGINS = debian/cmus/usr/lib/cmus/op/
+EXTRA_CMUS_PLUGINS := $(foreach plugin,$(recommended_deps),$(plugin).so)
+
 %:
 	dh $@
 
@@ -24,8 +29,8 @@ override_dh_install:
 		/usr/lib/cmus/ip/ffmpeg.so
 
 override_dh_shlibdeps:
-	dh_shlibdeps -pcmus -Xroar.so -Xpulse.so
+	dh_shlibdeps -pcmus $(foreach plugin,$(EXTRA_CMUS_PLUGINS),-X$(plugin))
 	dpkg-shlibdeps -O -dRecommends \
-		debian/cmus/usr/lib/cmus/op/pulse.so | \
-		cat >> debian/cmus.substvars
+		$(foreach plugin,$(EXTRA_CMUS_PLUGINS),$(EXTRA_CMUS_DIR_OP_PLUGINS)$(plugin)) \
+		>> debian/cmus.substvars
 	dh_shlibdeps --remaining-packages

-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list