[allegro4.4] 01/02: Remove build-depend on oss4-dev on Linux, use ALSA instead (Closes: #852983)

Andreas Rönnquist gusnan at moszumanska.debian.org
Sat Jan 28 18:52:27 UTC 2017


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

gusnan pushed a commit to branch master
in repository allegro4.4.

commit 0c64f2474f61c6c2d12eaadc061ff300d981bcb5
Author: Andreas Rönnquist <gusnan at debian.org>
Date:   Sat Jan 28 19:42:18 2017 +0100

    Remove build-depend on oss4-dev on Linux, use ALSA instead (Closes: #852983)
---
 debian/control | 2 +-
 debian/rules   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 75ddbb9..0c8ce3b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libxt-dev,
                libxcursor-dev,
                libasound2-dev (>= 0.9) [linux-any],
-               oss4-dev,
+               oss4-dev [kfreebsd-any],
                libxxf86dga-dev,
                libxxf86vm-dev,
                libgl1-mesa-dev,
diff --git a/debian/rules b/debian/rules
index 42ed26e..d3c235b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DWANT_MODULES=ON \
-		-DWANT_OSS=ON \
 		-DWANT_ALSA=ON \
 		-DWANT_JACK=OFF \
 		-DWANT_SGIAUDIO=OFF \
@@ -34,6 +33,13 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DWANT_EXAMPLES=ON \
 		-DWANT_TESTS=ON
 
+# kFreeBSD specific flags, use OSS only on kfreebsd
+ifeq (,$(filter-out kfreebsd,$(DEB_HOST_ARCH_OS)))
+DEB_CMAKE_OPTIONS += -DWANT_OSS=ON
+else
+DEB_CMAKE_OPTIONS += -DWANT_OSS=OFF
+endif
+
 DOC_DIR ?= usr/share/doc/allegro4-doc/
 DOC_INFO_DIR ?= usr/share/info/
 DOC_HTML_DIR ?= usr/share/doc/allegro4-doc/html/

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



More information about the Pkg-games-commits mailing list