OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
allow games/openarena to use openal

From: Jacob Meuser (jakemsrsdf.lonestar.org)
Date: Thu Aug 26 2010 - 19:44:13 CDT


new style port constructs while here too.

this is a soft dependency. it's dlopened and openarena uses it's own
headers. if you have openarena configured to use openal, but it's
not installed, it falls back to the sndio backend and still
"just works". actually, that's how it works now, but it always
fails loading "libopenal.so.0" ...

ok?

--
jakemsrsdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openarena/Makefile,v
retrieving revision 1.7
diff -N -u -p Makefile
--- Makefile 27 May 2010 03:47:28 -0000 1.7
+++ Makefile 27 Aug 2010 00:38:37 -0000
-12,9 +12,12 CATEGORIES = games x11
 
 V = 0.8.1
 
-PKGNAME-main = openarena-${V}p1
-PKGNAME-server = openarena-server-${V}p0
-PKGNAME-data = openarena-data-${V}p1
+PKGNAME-main = openarena-${V}
+REVISION-main = 2
+PKGNAME-server = openarena-server-${V}
+REVISION-server = 0
+PKGNAME-data = openarena-data-${V}
+REVISION-data = 1
 
 PKG_ARCH-data = amd64,i386,macppc
 
-33,19 +36,20 PERMIT_PACKAGE_FTP = Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB-main = GL c m pthread sndio
+WANTLIB-main = GL SDL.>=7 c m ogg.>=5 pthread sndio \
+ vorbis.>=6 vorbisfile.>=5
 WANTLIB-server = c m
 
-LIB_DEPENDS-main = ogg.>=5::audio/libogg \
- SDL.>=7::devel/sdl \
- vorbis.>=6::audio/libvorbis \
- vorbisfile.>=5::audio/libvorbis
+LIB_DEPENDS-main = ::audio/libogg \
+ ::devel/sdl \
+ ::audio/libvorbis \
+ ::audio/libvorbis
 RUN_DEPENDS-main = :openarena-data-*:${BUILD_PKGPATH},-data
 RUN_DEPENDS-server = :openarena-data-*:${BUILD_PKGPATH},-data
 
 ALL_TARGET = release
 USE_GMAKE = Yes
-MAKE_FLAGS = USE_OPENAL=0 \
+MAKE_FLAGS = USE_OPENAL=1 \
                         BINEXT='' \
                         DEFAULT_BASEDIR=${LOCALBASE}/share/openarena
 
Index: patches/patch-code_client_snd_openal_c
===================================================================
RCS file: patches/patch-code_client_snd_openal_c
diff -N -u -p patches/patch-code_client_snd_openal_c
--- /dev/null 26 Aug 2010 18:38:37 -0000
+++ patches/patch-code_client_snd_openal_c 27 Aug 2010 00:38:37 -0000
-0,0 +1,12
+$OpenBSD$
+--- code/client/snd_openal.c.orig Thu Aug 26 16:36:59 2010
++++ code/client/snd_openal.c Thu Aug 26 16:39:51 2010
+ -1707,7 +1707,7 static cvar_t *s_alCapture;
+ #elif defined(MACOS_X)
+ #define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
+ #else
+-#define ALDRIVER_DEFAULT "libopenal.so.0"
++#define ALDRIVER_DEFAULT "libopenal.so"
+ #endif
+
+ /*