[pkg-wine-party] [wine] 01/02: Enable oss on kfreebsd, explicitly disable it on other archs.

[Jens Reyer]

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

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit f42080a44afa763f24043baec87c0e6fa19424ff
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jan 29 03:10:18 2017 +0100

    Enable oss on kfreebsd, explicitly disable it on other archs.
    
    Explicitly pass --without-oss on all other architectures to
    prevent accidentally building with oss.
    On kfreebsd pulse is not available, so use oss instead.
---
 debian/changelog  | 6 ++++++
 debian/control.in | 1 +
 debian/rules      | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 02db609..07dbfa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wine (1.8.6-5) UNRELEASED; urgency=medium
+
+  * Enable oss on kfreebsd, explicitly disable it on other archs.
+
+ -- Jens Reyer <jre.winesim at gmail.com>  Thu, 02 Feb 2017 13:25:43 +0100
+
 wine (1.8.6-4) unstable; urgency=medium
 
   * Remove outdated oss4 build dependency (closes: #852988).
diff --git a/debian/control.in b/debian/control.in
index 863e152..c889875 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -30,6 +30,7 @@ Build-Depends:
  bison,
  quilt,
  gettext,
+ oss4-dev [kfreebsd-any],
  sharutils,
  dctrl-tools,
  khronos-api,
diff --git a/debian/rules b/debian/rules
index ac43eb4..9edeab3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_BUILD_ARCH_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 DEB_BUILD_ARCH_BITS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
 
@@ -51,6 +52,11 @@ ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
 export DEB_LDFLAGS_MAINT_APPEND+=-lfreebsd-glue
 endif
 
+# enable oss only on kfreebsd
+ifneq ($(DEB_HOST_ARCH_OS), kfreebsd)
+CONFLAGS+=--without-oss
+endif
+
 # enable wine64 on 64-bit architectures
 ifeq ($(DEB_BUILD_ARCH_BITS), 64)
 CONFLAGS+=--enable-win64

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