On Sat, 28 Jan 2017 at 17:56:33 +0000, Simon McVittie wrote:
> This package build-depends on oss4-dev, which is built by RC-buggy source
> package oss4.
Please see attached patch (against pkg-multimedia git). I have uploaded
a NMU to DELAYED/7 since it's rather trivial, to make sure qmmp doesn't
get removed from testing as a result of its oss4 dependency; I'm happy
to cancel it or have it pre-empted by a maintainer upload if you would
prefer.
Regards,
S
>From c2d39f3ca5e8eff71537a73aceb7281d78d9bba1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Sun, 29 Jan 2017 12:01:01 +0000
Subject: [PATCH] Drop build-dependency on oss4-dev on Linux kernel (Closes:
#852986)
- d/rules: explicitly disable OSS4 on Linux, for predictability
---
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 11fb195..8576ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qmmp (1.1.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop build-dependency on oss4-dev on Linux kernel (Closes: #852986)
+ - d/rules: explicitly disable OSS4 on Linux, for predictability
+
+ -- Simon McVittie <[email protected]> Sun, 29 Jan 2017 12:00:10 +0000
+
qmmp (1.1.6-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 6230f2c..385c163 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Matteo Cypriani <[email protected]>
Build-Depends: debhelper (>= 10), cmake, pkg-config, qtbase5-dev (>= 5.4),
libqt5x11extras5-dev (>= 5.4), qttools5-dev-tools (>= 5.4),
- qtchooser, libx11-dev, oss4-dev, libmad0-dev, libvorbis-dev,
+ qtchooser, libx11-dev, oss4-dev [!linux-any], libmad0-dev, libvorbis-dev,
libogg-dev, libasound2-dev [linux-any], libtag1-dev (>= 1.10),
libcurl4-gnutls-dev, qtmultimedia5-dev (>= 5.4), libmms-dev,
libflac-dev, libmpcdec-dev, libjack-jackd2-dev, libsoxr-dev,
diff --git a/debian/rules b/debian/rules
index c9a33c0..28808e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifeq ($(DEB_HOST_ARCH_OS),linux)
- EXTRA_CMAKE_ARGS = -DUSE_HAL:BOOL=FALSE
+ EXTRA_CMAKE_ARGS = -DUSE_HAL:BOOL=FALSE -DUSE_OSS4:BOOL=FALSE
else
EXTRA_CMAKE_ARGS = -DUSE_ALSA:BOOL=FALSE -DUSE_UDISKS:BOOL=FALSE
endif
--
2.11.0
