OS X has built-in OpenAL, so use that; also fixed building with OpenAL.framework

4 files changed, 51 insertions, 3 deletions

diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
index 5a17a785e5a..d5c9f7af16f 100644
--- a/emulators/fs-uae/Makefile
+++ b/emulators/fs-uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/11/04 21:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/07 13:30:21 adam Exp $
 
 DISTNAME=	fs-uae-2.6.2
 CATEGORIES=	emulators
@@ -15,12 +15,12 @@ GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "Darwin"
+.include "../../audio/openal/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .endif
-.include "../../audio/openal/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/emulators/fs-uae/distinfo b/emulators/fs-uae/distinfo
index ad7f96a7e0a..97eb26bc529 100644
--- a/emulators/fs-uae/distinfo
+++ b/emulators/fs-uae/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.1 2015/11/04 21:24:14 adam Exp $
+$NetBSD: distinfo,v 1.2 2015/11/07 13:30:21 adam Exp $
 
 SHA1 (fs-uae-2.6.2.tar.gz) = d997924b12bd4e4b95a860da8a13bf59b806c42a
 RMD160 (fs-uae-2.6.2.tar.gz) = 4d4af938177eb589e21c99bf91de5f265959206c
 SHA512 (fs-uae-2.6.2.tar.gz) = 94ead53f0e15cf3917c3b914fa4e611d5b38e9be8d149bff442c564140ce2d3b43f0447e82bb243c9443cd52491825955b4e3decb12b61e7ca91fd426bd5290a
 Size (fs-uae-2.6.2.tar.gz) = 4573533 bytes
+SHA1 (patch-configure) = c0db0d05dae3918d624f3af86b386f63db2ff200
+SHA1 (patch-libfsemu_src_emu_audio__openal.c) = ef59599314071eb07ead34e2b78b4b66414195db
 SHA1 (patch-manymouse_x11__xinput2.c) = 9b2891d1ce62affb694ac11b2386115799ed6fa9
 SHA1 (patch-src_od-fs_bsdsocket__posix.cpp) = 78ecdd2efe903fdebfb0e144a4fc775296b73048
diff --git a/emulators/fs-uae/patches/patch-configure b/emulators/fs-uae/patches/patch-configure
new file mode 100644
index 00000000000..71a6b6d3cc6
--- /dev/null
+++ b/emulators/fs-uae/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2015/11/07 13:30:21 adam Exp $
+
+Fix OpenAL support on Darwin.
+
+--- configure.orig	2015-11-07 13:22:13.000000000 +0000
++++ configure
+@@ -7122,7 +7122,7 @@ fi
+ $as_echo "$as_me: Using OpenAL.framework" >&6;}
+ 		# OPENAL_CFLAGS="-I/System/Library/Frameworks/OpenAL.framework/Headers"
+ 		# OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
+-		OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
++		OPENAL_CFLAGS="-framework OpenAL"
+ 		OPENAL_LIBS="-framework OpenAL"
+ 
+ 	 ;; #(
+@@ -7148,7 +7148,7 @@ $as_echo "no" >&6; }
+ $as_echo "$as_me: Using OpenAL.framework" >&6;}
+ 		# OPENAL_CFLAGS="-I/System/Library/Frameworks/OpenAL.framework/Headers"
+ 		# OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
+-		OPENAL_CFLAGS="-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenAL.framework/Headers"
++		OPENAL_CFLAGS="-framework OpenAL"
+ 		OPENAL_LIBS="-framework OpenAL"
+ 
+ 	 ;; #(
diff --git a/emulators/fs-uae/patches/patch-libfsemu_src_emu_audio__openal.c b/emulators/fs-uae/patches/patch-libfsemu_src_emu_audio__openal.c
new file mode 100644
index 00000000000..5055708a19c
--- /dev/null
+++ b/emulators/fs-uae/patches/patch-libfsemu_src_emu_audio__openal.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-libfsemu_src_emu_audio__openal.c,v 1.1 2015/11/07 13:30:21 adam Exp $
+
+Fix OpenAL support on Darwin.
+
+--- libfsemu/src/emu/audio_openal.c.orig	2015-11-07 13:27:07.000000000 +0000
++++ libfsemu/src/emu/audio_openal.c
+@@ -14,11 +14,15 @@
+ 
+ #ifdef HAVE_AL_AL_H
+ #include <AL/al.h>
++#elif defined(__APPLE__)
++#include <OpenAL/al.h>
+ #else
+ #include <al.h>
+ #endif
+ #ifdef HAVE_AL_ALC_H
+ #include <AL/alc.h>
++#elif defined(__APPLE__)
++#include <OpenAL/alc.h>
+ #else
+ #include <alc.h>
+ #endif