[yquake2] 06/09: d/p/Only-use-usr-local-opt-openal-soft-on-Darwin.patch: Don't try to link to OpenAL from /usr/local/opt/openal-soft

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository yquake2.

commit 5c35e2484cf4b0fdad1f465cdb3db04b8ef3a609
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jun 18 15:24:26 2017 +0100

    d/p/Only-use-usr-local-opt-openal-soft-on-Darwin.patch: Don't try to link to OpenAL from /usr/local/opt/openal-soft
---
 debian/changelog                                   |  2 ++
 ...-LD-FLAGS-instead-of-overriding-them-to-o.patch |  2 +-
 ...y-use-usr-local-opt-openal-soft-on-Darwin.patch | 32 ++++++++++++++++++++++
 .../Remove-unwanted-rpaths-from-LDFLAGS.patch      |  4 +--
 debian/patches/series                              |  1 +
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97eff72..3e8d0a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ yquake2 (7.00~dfsg1-1) UNRELEASED; urgency=medium
     - d/copyright: Update
     - d/patches: Refresh
   * d/control: Fix spelling of "contributors"
+  * d/p/Only-use-usr-local-opt-openal-soft-on-Darwin.patch:
+    Don't try to link to OpenAL from /usr/local/opt/openal-soft
 
  -- Simon McVittie <smcv at debian.org>  Wed, 22 Feb 2017 10:32:04 +0000
 
diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index 28f50e8..7d26252 100644
--- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
@@ -12,7 +12,7 @@ but yquake2 doesn't.
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 6d654bb..3c65958 100755
+index ee4940d..396822d 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -155,12 +155,13 @@ endif
diff --git a/debian/patches/Only-use-usr-local-opt-openal-soft-on-Darwin.patch b/debian/patches/Only-use-usr-local-opt-openal-soft-on-Darwin.patch
new file mode 100644
index 0000000..084a152
--- /dev/null
+++ b/debian/patches/Only-use-usr-local-opt-openal-soft-on-Darwin.patch
@@ -0,0 +1,32 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 18 Jun 2017 14:54:16 +0100
+Subject: Only use /usr/local/opt/openal-soft on Darwin
+
+Commit 883781c selected these paths for all OSs, but when linking to
+a system copy of OpenAL for Linux distribution binaries we want the
+normal OpenAL in /usr.
+
+Signed-off-by: Simon McVittie <smcv at debian.org>
+---
+ Makefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6d654bb..ee4940d 100755
+--- a/Makefile
++++ b/Makefile
+@@ -430,8 +430,12 @@ else
+ release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"' -DDLOPEN_OPENAL
+ endif
+ else # !DLOPEN_OPENAL
+-release/quake2 : CFLAGS += -DUSE_OPENAL -I/usr/local/opt/openal-soft/include
+-release/quake2 : LDFLAGS += -lopenal -L/usr/local/opt/openal-soft/lib
++release/quake2 : CFLAGS += -DUSE_OPENAL
++release/quake2 : LDFLAGS += -lopenal
++ifeq ($(YQ2_OSTYPE), Darwin)
++release/quake2 : CFLAGS += -I/usr/local/opt/openal-soft/include
++release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib
++endif # Darwin
+ endif # !DLOPEN_OPENAL
+ endif # WITH_OPENAL
+ 
diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
index 73c13c0..640fc18 100644
--- a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
+++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
@@ -8,10 +8,10 @@ Forwarded: no, Debian-specific
  1 file changed, 21 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 3c65958..6d5aeac 100755
+index 396822d..50f62e5 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -453,27 +453,6 @@ ifneq ($(YQ2_OSTYPE), Darwin)
+@@ -457,27 +457,6 @@ ifneq ($(YQ2_OSTYPE), Darwin)
  release/ref_gl1.so : LDFLAGS += -lGL
  endif
  
diff --git a/debian/patches/series b/debian/patches/series
index 8b9c105..e56bd4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+Only-use-usr-local-opt-openal-soft-on-Darwin.patch
 Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
 Remove-unwanted-rpaths-from-LDFLAGS.patch

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