[pulseaudio] 03/04: Fix build on nonlinux archs

Felipe Sateler fsateler at moszumanska.debian.org
Sun Oct 9 16:47:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository pulseaudio.

commit 96734d70b5b242539e2dc760b0d05861fa387339
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Oct 9 13:20:03 2016 -0300

    Fix build on nonlinux archs
    
    - webrtc-audio-processing is not available yet there
    - install the alsa hook only on linux archs, so --fail-missing does not
      complain.
---
 debian/control            | 2 +-
 debian/pulseaudio.install | 2 +-
 debian/rules              | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index c8fb111..0aebc92 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Build-Depends: debhelper (>= 9.20141010),
     libsystemd-dev [linux-any],
     libtdb-dev [!hurd-any],
     libudev-dev (>= 143) [linux-any],
-    libwebrtc-audio-processing-dev (>= 0.2),
+    libwebrtc-audio-processing-dev (>= 0.2) [linux-any],
     libwrap0-dev,
     libx11-xcb-dev,
     libxcb1-dev (>= 1.6),
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index e98d74a..8f83ddc 100755
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -16,7 +16,7 @@ usr/lib/pulse-*/modules/libprotocol-http.so
 usr/lib/pulse-*/modules/libprotocol-native.so
 usr/lib/pulse-*/modules/libprotocol-simple.so
 usr/lib/pulse-*/modules/librtp.so
-usr/lib/pulse-*/modules/libwebrtc-util.so
+[linux-any] usr/lib/pulse-*/modules/libwebrtc-util.so
 [linux-any] usr/lib/pulse-*/modules/module-alsa-sink.so
 [linux-any] usr/lib/pulse-*/modules/module-alsa-source.so
 usr/lib/pulse-*/modules/module-always-sink.so
diff --git a/debian/rules b/debian/rules
index 1a1f238..e8d24b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,12 +39,14 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install
 	find debian/tmp -name "*.la" -delete
+	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
+	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
+ifeq ($(DEB_HOST_ARCH_OS),linux)
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
 	cp -a $(CURDIR)/debian/pulse.conf \
 		$(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
 	cp -a $(CURDIR)/debian/pulse-alsa.conf $(CURDIR)/debian/tmp/usr/share/alsa
-	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
-	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
+endif
 
 override_dh_makeshlibs:
 	sed 's/DEB_VERSION_UPSTREAM/$(DEB_VERSION_UPSTREAM)/' debian/shlibs.local.in > debian/shlibs.local

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git



More information about the pkg-pulseaudio-devel mailing list