diff options
| author | pav <pav@FreeBSD.org> | 2010-01-26 03:15:18 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2010-01-26 03:15:18 +0800 |
| commit | dfee6d5c62ab6b269042d70b16ee7a2529db951e (patch) | |
| tree | be83fbf870c86e4040bbca6fff53505cd1e7c8e2 | |
| parent | 4c40a810f99571b1f539a6fbd7c3a13147bb82c0 (diff) | |
| download | freebsd-ports-gnome-dfee6d5c62ab6b269042d70b16ee7a2529db951e.tar.gz freebsd-ports-gnome-dfee6d5c62ab6b269042d70b16ee7a2529db951e.tar.zst freebsd-ports-gnome-dfee6d5c62ab6b269042d70b16ee7a2529db951e.zip | |
- Introduce USE_OPENAL variable for OpenAL consumers
- Switch to openal-soft as a default OpenAL implementation
PR: ports/142123
Submitted by: mva
Tested by: pointyhat exp-run
Approved by: portmgr (hat)
66 files changed, 332 insertions, 148 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e8c127332688..4b0336defeae 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -395,6 +395,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. ## +# USE_OPENAL - If set, this port relies on the OpenAL package. +# Legal values are: al, soft, si, alut. +# If set to an unknown value, the port is marked broken. +# WANT_OPENAL - User-specific OpenAL wishes. +# Legal values are: soft, si. The default is soft. +## # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. @@ -1744,6 +1750,83 @@ CONFIGURE_ENV+= MAKE=${GMAKE} .include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif +.if defined(USE_OPENAL) +_OPENAL_ALL= al si soft alut +_OPENAL_LIBS= si soft +# Default choie. +_DEFAULT_OPENAL= soft + +_OPENAL_SOFT= openal.1:${PORTSDIR}/audio/openal-soft +_OPENAL_SI= openal.0:${PORTSDIR}/audio/openal +_OPENAL_ALUT= alut.1:${PORTSDIR}/audio/freealut + +.if exists(${LOCALBASE}/lib/libopenal.a) +_HAVE_OPENAL= si +.elif exists(${LOCALBASE}/bin/openal-info) +_HAVE_OPENAL= soft +.endif + +.if ${USE_OPENAL} == "yes" +# Be friendly. +USE_OPENAL= ${_DEFAULT_OPENAL} +.endif + +__USED_OPENAL= +_USE_OPENAL= +.for component in ${USE_OPENAL} +.if ${__USED_OPENAL:M${component}} == "" +__USED_OPENAL+= ${component} + +.if ${_OPENAL_ALL:M${component}} == "" +BROKEN= OPENAL mismatch: unknown component ${component} +.elif ${_OPENAL_ALL:M${component}} == "al" + +# Check if the user wish matches the found OpenAL system. +.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${WANT_OPENAL} +BROKEN= OPENAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired +.endif # WANT_OPENAL + +.if defined(_HAVE_OPENAL) +_OPENAL_SYSTEM= ${_HAVE_OPENAL} +.elif defined(WANT_OPENAL) +_OPENAL_SYSTEM= ${WANT_OPENAL} +.else +_OPENAL_SYSTEM= ${_DEFAULT_OPENAL} +.endif # _HAVE_OPENAL + +_USE_OPENAL+= ${_OPENAL_${_OPENAL_SYSTEM:U}} + +.else # ${_OPENAL_ALL:M${component}} == "" + +.if ${_OPENAL_LIBS:M${component}} == ${component} +# Check for the system implementation to use. +.if defined(WANT_OPENAL) && ${WANT_OPENAL} != ${component} +BROKEN= OPENAL mismatch: wants to use ${component}, while you wish to use ${WANT_OPENAL} +.endif +.if defined(_OPENAL_SYSTEM) +BROKEN= OPENAL mismatch: cannot use ${component} and al together. +.endif +.if defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${component} +BROKEN= OPENAL mismatch: wants to use ${component}, but ${_HAVE_OPENAL} is installed +.endif + +_OPENAL_SYSTEM= ${component} + +.endif # ${_OPENAL_LIBS:M${component}} == ${component} + +_USE_OPENAL+= ${_OPENAL_${component:U}} + +.endif # ${_OPENAL_ALL:M${component}} == "" + +.endif # ${__USED_OPENAL:M${component} == "" +.endfor # component in ${USE_OPENAL} + +.for dep in ${_USE_OPENAL} +LIB_DEPENDS+= ${dep} +.endfor + +.endif # USE_OPENAL + .if defined(USE_FAM) DEFAULT_FAM_SYSTEM= gamin # Currently supported FAM systems diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index 951e56c88fec..e77177113832 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -7,20 +7,19 @@ PORTNAME= freealut PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://connect.creativelabs.com/openal/Downloads/ALUT/ MAINTAINER= oliver@FreeBSD.org COMMENT= The OpenAL Utility Toolkit -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal - USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack +USE_OPENAL= al USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile index a6a4fdeb074d..e992ee842989 100644 --- a/audio/hs-ALUT/Makefile +++ b/audio/hs-ALUT/Makefile @@ -7,6 +7,7 @@ PORTNAME= ALUT PORTVERSION= 2.2.0.0 +PORTREVISION= 1 CATEGORIES= audio haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,14 +21,13 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \ hs-OpenAL>=1.4.0.0:${PORTSDIR}/audio/hs-OpenAL -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut GHC_VERSION= 6.10.4 HSALUT_VERSION= ${PORTVERSION} GHC_CMD= ${LOCALBASE}/bin/ghc SETUP_CMD= ./setup +USE_OPENAL= al alut CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile index 209e18952361..e5ed4c0776bb 100644 --- a/audio/hs-OpenAL/Makefile +++ b/audio/hs-OpenAL/Makefile @@ -7,6 +7,7 @@ PORTNAME= OpenAL PORTVERSION= 1.4.0.0 +PORTREVISION= 1 CATEGORIES= audio haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -22,8 +23,8 @@ RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc \ hs-StateVar>=1.0.0.0:${PORTSDIR}/devel/hs-StateVar \ hs-Tensor>=1.0.0.1:${PORTSDIR}/devel/hs-Tensor \ hs-ObjectName>=1.0.0.0:${PORTSDIR}/devel/hs-ObjectName -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al GHC_VERSION= 6.10.4 HSOPENAL_VERSION= ${PORTVERSION} diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile index 58158de3af57..8d92acdb0f76 100644 --- a/audio/py-openal/Makefile +++ b/audio/py-openal/Makefile @@ -7,7 +7,7 @@ PORTNAME= openal PORTVERSION= 0.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio python MASTER_SITES= http://download.gna.org/pyopenal/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,10 +16,8 @@ DISTNAME= PyOpenAL-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= PyOpenAL is a binding of OpenAL for Python -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - DIST_SUBDIR= python +USE_OPENAL= al alut USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyOpenAL diff --git a/audio/py-openal/files/patch-setup.py b/audio/py-openal/files/patch-setup.py index 4c19744e6b7e..676207cddf3c 100644 --- a/audio/py-openal/files/patch-setup.py +++ b/audio/py-openal/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py Sun Apr 30 10:23:44 2006 -+++ setup.py Mon Aug 21 00:25:58 2006 -@@ -1,14 +1,14 @@ +--- setup.py.orig 2006-04-30 17:23:44.000000000 +0200 ++++ setup.py 2009-12-26 17:50:57.000000000 +0100 +@@ -1,17 +1,17 @@ import os from distutils.core import setup, Extension @@ -9,7 +9,8 @@ LIBS = ["openal", "alut"] try: - openal_version = os.popen("openal-config --version").read() +- openal_version = os.popen("openal-config --version").read() ++ openal_version = os.popen("pkg-config --modversion openal").read() if openal_version[0] == "0": - LIBDIRS = ["/usr/lib", "/usr/local/lib"] - LIBS = ["openal"] @@ -17,7 +18,11 @@ + LIBS = ["openal","alut"] except: - print "Warning: error while running 'openal-config --version', using default values..." +- print "Warning: error while running 'openal-config --version', using default values..." ++ print "Warning: error while running 'pkg-config --modversion', using default values..." + + + setup( @@ -38,7 +38,7 @@ ext_modules = [Extension("_openal", diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 9672fc78e021..848a5d74ca06 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -7,6 +7,7 @@ PORTNAME= xneur PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \ http://mirror.amdmi3.ru/distfiles/ @@ -60,7 +61,7 @@ USE_GSTREAMER= yes CONFIGURE_ARGS+= --with-sound=gstreamer .endif .if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+= --with-sound=openal .endif .if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL) diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile index 23222804c504..ea2709cddf7c 100644 --- a/devel/allegro-devel/Makefile +++ b/devel/allegro-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= allegro DISTVERSION= 4.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SF/alleg/${PORTNAME}-unstable/${PORTVERSION} PKGNAMESUFFIX= -devel @@ -51,7 +51,7 @@ PORTSCOUT= limit:^4\.3\.[0-9]* .include <bsd.port.pre.mk> .if defined(WITH_AL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+=--enable-sgialdigi PLIST_SUB+= AL="" .else diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index 30c993e29d21..5c759bf11077 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -7,7 +7,7 @@ PORTNAME= sfml PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF DISTNAME= SFML-${PORTVERSION}-sdk-linux-32 @@ -16,12 +16,12 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple and Fast Multimedia Library LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ - openal.0:${PORTSDIR}/audio/openal \ jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes +USE_OPENAL= al USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 5bfa991377b0..fbaa0103d9a1 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -7,7 +7,7 @@ PORTNAME= SimGear PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= ftp://ftp.de.simgear.org/pub/simgear/Source/ \ ftp://ftp.simgear.org/pub/simgear/Source/ @@ -17,9 +17,7 @@ COMMENT= A toolkit for 3D games and simulations BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - jpeg.10:${PORTSDIR}/graphics/jpeg \ - alut.1:${PORTSDIR}/audio/freealut \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ boost_thread.4:${PORTSDIR}/devel/boost-libs .if defined(WITH_OSG_DEVEL) @@ -29,6 +27,7 @@ LIB_DEPENDS+= osg.55:${PORTSDIR}/graphics/osg .endif USE_XORG= ice sm x11 xext xi xt xmu +USE_OPENAL= al alut USE_GL= gl glu glut GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile index 2a2644e3627e..970ef7e20c7e 100644 --- a/emulators/bsnes/Makefile +++ b/emulators/bsnes/Makefile @@ -6,6 +6,7 @@ PORTNAME= bsnes PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://byuu.org/files/ \ ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ @@ -58,7 +59,7 @@ VIDEO_DRIVER+= video.qtimage .endif .if defined(WITH_SOUND_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al AUDIO_DRIVER+= audio.openal .endif diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 1196997a4860..a339439fe59c 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -7,7 +7,7 @@ PORTNAME= allacrost PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= allacrost_demo_source_${PORTVERSION} @@ -18,12 +18,12 @@ COMMENT= A single player 2D role-playing game BUILD_DEPENDS= ${LOCALBASE}/lib/libluabind.a:${PORTSDIR}/devel/luabind LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ - openal.0:${PORTSDIR}/audio/openal \ ogg.6:${PORTSDIR}/audio/libogg \ vorbis.4:${PORTSDIR}/audio/libvorbis GNU_CONFIGURE= yes USE_GMAKE= yes +USE_OPENAL= al USE_LUA= 5.0 USE_SDL= sdl ttf net USE_GL= yes diff --git a/games/apricots/Makefile b/games/apricots/Makefile index c23c550b953a..1f9c9f5902de 100644 --- a/games/apricots/Makefile +++ b/games/apricots/Makefile @@ -7,7 +7,7 @@ PORTNAME= apricots PORTVERSION= 0.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.fishies.org.uk/ \ http://mirror.amdmi3.ru/distfiles/ @@ -37,8 +37,7 @@ OPTIONS= OPENAL "Enable OpenAL audio" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut .endif post-patch: diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile index 0ab90fbfed2c..002a3da481f5 100644 --- a/games/assaultcube/Makefile +++ b/games/assaultcube/Makefile @@ -7,7 +7,7 @@ PORTNAME= assaultcube PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/actiongame/AssaultCube/1.0 DISTNAME= AssaultCube_v${PORTVERSION} @@ -15,9 +15,8 @@ DISTNAME= AssaultCube_v${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Total conversion of the FPS game called Cube -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal - USE_BZIP2= yes +USE_OPENAL= al USE_GMAKE= yes GNU_CONFIGURE= yes ALL_TARGET= libenet diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index 14ac1de581be..b0d8f94ed1f5 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= atr3d PORTVERSION= 0.6 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ftp://ftp.avoidtheroid.com/pub/${PORTNAME}/ DISTNAME= ${PORTNAME}_source_${PORTVERSION} @@ -39,7 +39,7 @@ LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include <bsd.port.pre.mk> .if !defined(WITHOUT_SOUND) -LIB_DEPENDS+= alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= alut CONFIGURE_ARGS+= --enable-sound .else CONFIGURE_ARGS+= --disable-sound diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index 0586d3c6a320..52a351355acf 100644 --- a/games/battletanks/Makefile +++ b/games/battletanks/Makefile @@ -7,7 +7,7 @@ PORTNAME= btanks PORTVERSION= 0.7.5800 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTNAME}-source-${PORTVERSION} @@ -15,12 +15,12 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Fast 2D tank arcade game with multiplayer and split-screen modes LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \ - openal.0:${PORTSDIR}/audio/openal \ expat.6:${PORTSDIR}/textproc/expat2 \ vorbisfile.6:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_LDCONFIG= yes +USE_OPENAL= al USE_SCONS= yes USE_SDL= image sdl SCONS_BUILDENV= ${SCONS_ENV} LDFLAGS=${PTHREAD_LIBS} diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile index 46f3102a51af..1c430c5aa672 100644 --- a/games/blackshadeselite/Makefile +++ b/games/blackshadeselite/Makefile @@ -7,7 +7,7 @@ PORTNAME= blackshadeselite PORTVERSION= 0.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://download.gna.org/blackshadeselite/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,14 +15,13 @@ MASTER_SITES= http://download.gna.org/blackshadeselite/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Psychic Bodyguard FPS - protect the VIP -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_GMAKE= yes USE_SDL= sdl USE_GL= yes +USE_OPENAL= al alut MAKE_ARGS= CC=${CC} CXX=${CXX} diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index 5b866ce19cf3..fde2f8d9fae7 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -7,7 +7,7 @@ PORTNAME= chromium-bsu PORTVERSION= 0.9.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Chromium%20B.S.U.%20source%20code/${PORTVERSION} @@ -46,8 +46,7 @@ CONFIGURE_ARGS+=--disable-glut USE_SDL+= mixer CONFIGURE_ARGS+=--disable-openal .else -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut CONFIGURE_ARGS+=--disable-sdlmixer .endif diff --git a/games/deng/Makefile b/games/deng/Makefile index 1bfea1ac4b7e..a39e83b739ff 100644 --- a/games/deng/Makefile +++ b/games/deng/Makefile @@ -7,6 +7,7 @@ PORTNAME= deng PORTVERSION= 1.9.0b6.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Doomsday%20Engine/1.9.0-beta6.8 DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/-beta/} @@ -38,8 +39,8 @@ OPTIONS= OPENAL "Build OpenAL sound plugin" off .include <bsd.port.pre.mk> -.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so.0) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +.if defined(WITH_OPENAL) || exists(${LOCALBASE}/lib/libopenal.so) +USE_OPENAL= al CMAKE_ARGS+= -DBUILDOPENAL:BOOL=ON PLIST_SUB= OPENAL="" .else diff --git a/games/el/Makefile b/games/el/Makefile index 0c89c797e1f7..61ce4220fa4d 100644 --- a/games/el/Makefile +++ b/games/el/Makefile @@ -7,7 +7,7 @@ PORTNAME= el PORTVERSION= 180 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} @@ -17,15 +17,14 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - openal.0:${PORTSDIR}/audio/openal \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - cal3d.12:${PORTSDIR}/graphics/cal3d \ - alut.1:${PORTSDIR}/audio/freealut + cal3d.12:${PORTSDIR}/graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data PROJECTHOST= bsdistfiles USE_BZIP2= yes USE_GMAKE= yes +USE_OPENAL= al alut USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes diff --git a/games/ember/Makefile b/games/ember/Makefile index 32c966649a40..f092b3c61eb5 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -7,7 +7,7 @@ PORTNAME= ember PORTVERSION= 0.5.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \ http://amber.worldforge.org/ember/releases/stable/ @@ -24,8 +24,6 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ eris-1.3:${PORTSDIR}/devel/eris \ varconf-1.0.6:${PORTSDIR}/devel/varconf \ mercator-0.2.6:${PORTSDIR}/devel/mercator \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ wfut-0.2:${PORTSDIR}/devel/libwfut \ boost_thread.4:${PORTSDIR}/devel/boost-libs @@ -36,6 +34,7 @@ USE_SDL= sdl GNU_CONFIGURE= YES USE_LDCONFIG= YES USE_LUA= 5.1 +USE_OPENAL= al alut USE_GNOME= gnomehack USE_BZIP2= YES CPPFLAGS= -DBR_NO_MACROS diff --git a/games/evq3/Makefile b/games/evq3/Makefile index bd6e393f81bb..4881cd667fe2 100644 --- a/games/evq3/Makefile +++ b/games/evq3/Makefile @@ -7,7 +7,7 @@ PORTNAME= evq3 PORTVERSION= 1.3.20080810 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -76,7 +76,7 @@ MAKE_ENV+= USE_CURL_DLOPEN=1 . endif # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/evq3/files/patch-code_client_snd_openal.c b/games/evq3/files/patch-code_client_snd_openal.c new file mode 100644 index 000000000000..60bba3c924d8 --- /dev/null +++ b/games/evq3/files/patch-code_client_snd_openal.c @@ -0,0 +1,11 @@ +--- code/client/snd_openal.c.orig 2009-12-26 18:05:56.000000000 +0100 ++++ code/client/snd_openal.c 2009-12-26 18:06:06.000000000 +0100 +@@ -1707,7 +1707,7 @@ + #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 + + /* diff --git a/games/excido/Makefile b/games/excido/Makefile index 016fff02e478..827ab811317e 100644 --- a/games/excido/Makefile +++ b/games/excido/Makefile @@ -7,7 +7,7 @@ PORTNAME= excido PORTVERSION= 0.1.5c -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org/excido/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -15,15 +15,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= alepulver@FreeBSD.org COMMENT= A portable fast-paced 3d shooter -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_GMAKE= yes USE_GL= yes +USE_OPENAL= al alut USE_SDL= image sdl ttf post-install: diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index d921531e32b6..1b7ca7ae52e3 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -7,7 +7,7 @@ PORTNAME= FlightGear PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \ @@ -22,8 +22,7 @@ MASTER_SITES= ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \ MAINTAINER= ganael.laplanche@martymac.com COMMENT= The FlightGear flight simulator -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ @@ -38,6 +37,7 @@ LIB_DEPENDS+= osg.55:${PORTSDIR}/graphics/osg USE_XORG= ice sm x11 xext xi xt xmu USE_GL= gl glu glut +USE_OPENAL= al USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index f23488a17069..cb3be8e79b0a 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -7,7 +7,7 @@ PORTNAME= freeorion PORTVERSION= 0.3.13.3318 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= oliver @@ -16,7 +16,6 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= Open-source, platform independent galactic conquest game LIB_DEPENDS= GiGi.0:${PORTSDIR}/x11-toolkits/gigi \ - alut.1:${PORTSDIR}/audio/freealut \ graph:${PORTSDIR}/graphics/graphviz \ log4cpp.4:${PORTSDIR}/devel/log4cpp \ vorbisfile.6:${PORTSDIR}/audio/libvorbis @@ -29,6 +28,7 @@ USE_PYTHON= yes USE_SCONS= yes SCONS_ARGS= with_builtin_sdlnet=0 SCONS_BUILDENV= PYTHON_LIB=${PYTHON_VERSION} LINKFLAGS=${LDFLAGS} +USE_OPENAL= alut USE_SDL= sdl net WRKSRC= ${WRKDIR}/${PORTNAME}/FreeOrion diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile index 72717b434b4f..a82475fdea43 100644 --- a/games/gemrb/Makefile +++ b/games/gemrb/Makefile @@ -7,15 +7,14 @@ PORTNAME= gemrb PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= SF/${PORTNAME}/GemRB%20Sources/GemRB%20${PORTVERSION}%20Sources MAINTAINER= beyert@cs.ucr.edu COMMENT= GemRB (Game engine made with preRendered Background) -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" @@ -24,6 +23,7 @@ CONFIGURE_ARGS= -libdir=${LOCALBASE}/lib \ USE_GMAKE= yes USE_SDL= sdl +USE_OPENAL= al alut USE_LDCONFIG= yes USE_PYTHON= 2.4+ diff --git a/games/glest/Makefile b/games/glest/Makefile index e63e033a5553..fe5e2ba956f8 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -7,7 +7,7 @@ PORTNAME= glest PORTVERSION= 3.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION} DISTNAME= ${PORTNAME}_source_${PORTVERSION} @@ -17,14 +17,13 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free 3d real-time customizable strategy game LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut + vorbis.4:${PORTSDIR}/audio/libvorbis BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data USE_AUTOTOOLS= automake:15:env autoconf:262:env USE_ZIP= yes +USE_OPENAL= al alut USE_DOS2UNIX= yes USE_LUA= 5.1 USE_SDL= yes diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile index 9ff06eadb05b..25937c453d4a 100644 --- a/games/ioquake3/Makefile +++ b/games/ioquake3/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ioquake3 DISTVERSION?= 1.36 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= games MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/ @@ -67,7 +67,7 @@ MAKE_ARGS+= USE_CURL=0 .endif # OpenAL .if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al .else MAKE_ARGS+= USE_OPENAL=0 .endif diff --git a/games/ioquake3/files/patch-code-client-snd_openal.c b/games/ioquake3/files/patch-code-client-snd_openal.c new file mode 100644 index 000000000000..411fb3564ea8 --- /dev/null +++ b/games/ioquake3/files/patch-code-client-snd_openal.c @@ -0,0 +1,11 @@ +--- code/client/snd_openal.c.orig 2009-12-26 18:10:44.000000000 +0100 ++++ code/client/snd_openal.c 2009-12-26 18:11:00.000000000 +0100 +@@ -1719,7 +1719,7 @@ + #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 + + /* diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile index a84c84abe2ac..8b6bb609a64b 100644 --- a/games/iourbanterror/Makefile +++ b/games/iourbanterror/Makefile @@ -7,7 +7,7 @@ PORTNAME= iourbanterror DISTVERSION= 2007_12_20 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ DISTNAME= ioUrbanTerrorSource_${DISTVERSION} @@ -78,7 +78,7 @@ MAKE_ENV+= USE_CURL_DLOPEN=1 . endif # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/iourbanterror/files/patch-code_client_snd_openal.c b/games/iourbanterror/files/patch-code_client_snd_openal.c new file mode 100644 index 000000000000..e35fc7cbf9ac --- /dev/null +++ b/games/iourbanterror/files/patch-code_client_snd_openal.c @@ -0,0 +1,11 @@ +--- code/client/snd_openal.c.orig 2009-12-26 18:12:52.000000000 +0100 ++++ code/client/snd_openal.c 2009-12-26 18:13:00.000000000 +0100 +@@ -1676,7 +1676,7 @@ + #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 + + /* diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile index afa06752e1ec..f6ff91a9f934 100644 --- a/games/kmquake2/Makefile +++ b/games/kmquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmquake2 PORTVERSION= 0.19 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \ http://qexpo2005.quakedev.com/uploaded/54/:data \ @@ -88,9 +88,9 @@ MAKE_ENV+= KMQ2_ADDONS="${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}" .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL) LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ - openal.0:${PORTSDIR}/audio/openal \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis +USE_OPENAL= al USE_GL= yes .endif diff --git a/games/linwarrior/Makefile b/games/linwarrior/Makefile index 8d9e588d6513..b30bdcff59fb 100644 --- a/games/linwarrior/Makefile +++ b/games/linwarrior/Makefile @@ -7,6 +7,7 @@ PORTNAME= linwarrior PORTVERSION= 20091108 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.hackcraft.de/games/linwarrior_3d/downloads/ \ http://mirror.amdmi3.ru/distfiles/ @@ -15,10 +16,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Navigate a mech through a 3D world and fire at enemies -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_GMAKE= yes +USE_OPENAL= al alut USE_GL= gl glu USE_SDL= sdl MAKE_JOBS_SAFE= yes diff --git a/games/openarena/Makefile b/games/openarena/Makefile index aeff19584311..35f03d5c594c 100644 --- a/games/openarena/Makefile +++ b/games/openarena/Makefile @@ -7,7 +7,7 @@ PORTNAME= openarena PORTVERSION= 0.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://openarena.ws/rel/070/:src \ http://download.tuxfamily.net/cooker/openarena/rel070/:data \ @@ -66,7 +66,7 @@ MAKE_ENV+= HAVE_VM_COMPILED=true .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP) # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/openarena/files/patch-code_client_snd_openal.c b/games/openarena/files/patch-code_client_snd_openal.c new file mode 100644 index 000000000000..4aaf9f885242 --- /dev/null +++ b/games/openarena/files/patch-code_client_snd_openal.c @@ -0,0 +1,11 @@ +--- code/client/snd_openal.c.orig 2009-12-26 18:20:08.000000000 +0100 ++++ code/client/snd_openal.c 2009-12-26 18:20:27.000000000 +0100 +@@ -1676,7 +1676,7 @@ + #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 + + /* diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile index 30b3421ca4b1..8f9316317c73 100644 --- a/games/openastromenace/Makefile +++ b/games/openastromenace/Makefile @@ -7,7 +7,7 @@ PORTNAME= openastromenace PORTVERSION= 1.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF DISTFILES= openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \ @@ -18,12 +18,11 @@ MAINTAINER= proler@gmail.com COMMENT= Hardcore 3D space shooter with spaceship upgrade possibilities LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis \ - jpeg:${PORTSDIR}/graphics/jpeg \ - openal:${PORTSDIR}/audio/openal \ - alut:${PORTSDIR}/audio/freealut + jpeg:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes USE_GL= gl glu +USE_OPENAL= al alut WANT_SDL= yes USE_SDL= sdl USE_CMAKE= yes diff --git a/games/rigsofrods/Makefile b/games/rigsofrods/Makefile index e987b5540b12..4f74acd83d0e 100644 --- a/games/rigsofrods/Makefile +++ b/games/rigsofrods/Makefile @@ -7,6 +7,7 @@ PORTNAME= rigsofrods PORTVERSION= 0.36.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \ @@ -16,8 +17,7 @@ EXTRACT_ONLY= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Truck, car, airplane and boat simulator with advanced physics -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - zzip.13:${PORTSDIR}/devel/zziplib \ +LIB_DEPENDS= zzip.13:${PORTSDIR}/devel/zziplib \ freetype.9:${PORTSDIR}/print/freetype2 \ CEGUIBase.3:${PORTSDIR}/graphics/cegui \ freeimage.3:${PORTSDIR}/graphics/freeimage @@ -29,6 +29,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois \ BROKEN= does not build USE_ZIP= yes +USE_OPENAL= al USE_XORG= x11 xt xaw sm ice xext WRKSRC= ${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build USE_WX= 2.6+ diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index b58ad725319d..05a53e161b50 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/ DISTNAME= Scorched3D-${SCORCH_VERSION}-src @@ -14,10 +15,7 @@ DISTNAME= Scorched3D-${SCORCH_VERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Scorched is a game based loosely on the classic DOS game -BUILD_DEPENDS= openal-config:${PORTSDIR}/audio/openal -RUN_DEPENDS= openal-config:${PORTSDIR}/audio/openal -LIB_DEPENDS= alut.1:${PORTSDIR}/audio/freealut \ - fftw3f:${PORTSDIR}/math/fftw3-float \ +LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ fftw3:${PORTSDIR}/math/fftw3 \ jpeg:${PORTSDIR}/graphics/jpeg \ png:${PORTSDIR}/graphics/png @@ -27,6 +25,7 @@ SCORCH_VERSION= 42.1 .if defined(WITH_MYSQL) USE_MYSQL= yes .endif +USE_OPENAL= al alut USE_SDL= mixer net sdl GNU_CONFIGURE= yes USE_GL= yes diff --git a/games/scorched3d/files/patch-configure-al.m4 b/games/scorched3d/files/patch-configure-al.m4 new file mode 100644 index 000000000000..f2ed2880a5f7 --- /dev/null +++ b/games/scorched3d/files/patch-configure-al.m4 @@ -0,0 +1,31 @@ +--- configure-al.m4.orig 2009-12-26 18:48:59.000000000 +0100 ++++ configure-al.m4 2009-12-26 18:50:56.000000000 +0100 +@@ -7,25 +7,9 @@ + [ --disable-openaltest Do not try to compile and run a test OpenAL program], + , enable_openaltest=yes) + AC_MSG_CHECKING(for OpenAL support) +-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) +-if test x$OPENAL_CONFIG = xno; then +- echo "*** The openal-config script installed by OpenAL could not be found" +- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" +- echo "*** environment variable to the full path to openal-config." +- +- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) +-else +- +- if test x"$use_static_openal" = x"yes"; then +- AL_LIBS="/usr/local/lib/libopenal.a" +- else +- AL_LIBS="`$OPENAL_CONFIG --libs`" +- fi +- +- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" +- +- AC_MSG_RESULT(yes) +-fi ++AL_LIBS="`pkg-config --libs openal`" ++AL_CFLAGS="`pkg-config --cflags openal`" ++AC_MSG_RESULT(yes) + + AC_MSG_CHECKING(for Freealut support) + AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) diff --git a/games/spring/Makefile b/games/spring/Makefile index 26d8e17f2c2d..49851045bf18 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -7,6 +7,7 @@ PORTNAME= spring PORTVERSION= 0.80.5.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_src @@ -15,7 +16,6 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A project aiming to create a new and versatile RTS Engine LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - openal.0:${PORTSDIR}/audio/openal \ GLEW.1:${PORTSDIR}/graphics/glew \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ IL.2:${PORTSDIR}/graphics/devil \ @@ -28,6 +28,7 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= relies on x86 floating-point math USE_SDL= sdl +USE_OPENAL= al USE_GL= gl glu USE_XORG= x11 xcursor USE_LDCONFIG= yes diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile index 3833efce1034..cbd7eaf52d5a 100644 --- a/games/supertuxkart/Makefile +++ b/games/supertuxkart/Makefile @@ -7,6 +7,7 @@ PORTNAME= supertuxkart PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/supertuxkart/SuperTuxKart/${PORTVERSION} EXTRACT_SUFX= -src.tar.bz2 @@ -15,13 +16,12 @@ MAINTAINER= amdmi3@FreeBSD.ru COMMENT= Free 3D kart racing game BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - vorbisfile.6:${PORTSDIR}/audio/libvorbis \ +LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis \ ogg.6:${PORTSDIR}/audio/libogg USE_BZIP2= yes USE_GL= gl glu glut +USE_OPENAL= al alut USE_GMAKE= yes GNU_CONFIGURE= yes USE_SDL= sdl diff --git a/games/tnl/Makefile b/games/tnl/Makefile index a8fcd4fbf64e..56c0a82cdb91 100644 --- a/games/tnl/Makefile +++ b/games/tnl/Makefile @@ -7,7 +7,7 @@ PORTNAME= tnl PORTVERSION= 071111 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://tnlgame.net/downloads/tnl/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ @@ -20,9 +20,7 @@ COMMENT= Futuristic action flight simulator and realtime strategy game BUILD_DEPENDS= ${LOCALBASE}/lib/libiovmall.so:${PORTSDIR}/lang/io RUN_DEPENDS= ${BUILD_DEPENDS} -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ - sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ +LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ CEGUIBase.3:${PORTSDIR}/graphics/cegui \ png.5:${PORTSDIR}/graphics/png \ GLEW.1:${PORTSDIR}/graphics/glew @@ -33,6 +31,7 @@ USE_GMAKE= yes USE_SDL= sdl USE_GCC= 4.2+ USE_GL= yes +USE_OPENAL= al alut CONFIGURE_ARGS= --with-io-cflags="-I${LOCALBASE}/include/io" \ --with-io-libs="-L${LOCALBASE}/lib -liovmall" diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 3ecea3525203..263689f19723 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -7,7 +7,7 @@ PORTNAME= torcs DISTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/all-in-one/${PORTVERSION} @@ -15,12 +15,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Open Racing Car Simulator BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr +USE_OPENAL= al alut USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/games/toycars/Makefile b/games/toycars/Makefile index 5d01ea84daeb..43f8806b2ea5 100644 --- a/games/toycars/Makefile +++ b/games/toycars/Makefile @@ -7,17 +7,15 @@ PORTNAME= toycars PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Physics-based 2D racing game -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_SDL= mixer image sdl +USE_OPENAL= al alut USE_GL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile index 0a2ba04ec6ae..f186e2cfc22e 100644 --- a/games/tremulous/Makefile +++ b/games/tremulous/Makefile @@ -7,7 +7,7 @@ PORTNAME= tremulous PORTVERSION= 1.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1 \ http://0day.icculus.org/mirrors/tremulous/ \ @@ -59,7 +59,7 @@ MAKE_ENV+= HAVE_VM_COMPILED=true .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP) # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/tremulous/files/patch-src_client_snd_openal.c b/games/tremulous/files/patch-src_client_snd_openal.c new file mode 100644 index 000000000000..a5151f4fc424 --- /dev/null +++ b/games/tremulous/files/patch-src_client_snd_openal.c @@ -0,0 +1,11 @@ +--- ./tremulous-1.1.0-src/src/client/snd_openal.c.orig 2009-12-26 18:56:43.000000000 +0100 ++++ ./tremulous-1.1.0-src/src/client/snd_openal.c 2009-12-26 18:56:49.000000000 +0100 +@@ -1526,7 +1526,7 @@ + #ifdef _WIN32 + #define ALDRIVER_DEFAULT "OpenAL32.dll" + #else +-#define ALDRIVER_DEFAULT "libopenal.so.0" ++#define ALDRIVER_DEFAULT "libopenal.so" + #endif + + /* diff --git a/games/trigger/Makefile b/games/trigger/Makefile index fc4ffff924fb..8ef968836cb2 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -7,7 +7,7 @@ PORTNAME= trigger PORTVERSION= 0.5.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-rally/${PORTNAME}-rally/${PORTNAME}-${PORTVERSION} DISTFILES= trigger-${PORTVERSION}-src${EXTRACT_SUFX} \ @@ -17,10 +17,9 @@ MAINTAINER= makc@FreeBSD.org COMMENT= A rally car racing game BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam -LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ - alut.1:${PORTSDIR}/audio/freealut +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs +USE_OPENAL= al alut USE_SDL= sdl image USE_GL= yes USE_BZIP2= yes diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile index a879ceb5d09b..a54ad3ae7588 100644 --- a/games/ultimatestunts/Makefile +++ b/games/ultimatestunts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ultimatestunts PORTVERSION= 0.7.5.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= srcdata- DISTVERSION= ${PORTVERSION:S/.//g} CATEGORIES= games @@ -16,10 +16,8 @@ MASTER_SITES= SF/${PORTNAME}/sourcecode/0.7.5%20release%201 MAINTAINER= ports@FreeBSD.org COMMENT= Racing game with elaborate stunts -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut - USE_GETTEXT= yes +USE_OPENAL= al alut USE_GL= gl glu USE_SDL= sdl image GNU_CONFIGURE= yes diff --git a/games/uqm/Makefile b/games/uqm/Makefile index c5b728fcaaff..ae52975a7bc4 100644 --- a/games/uqm/Makefile +++ b/games/uqm/Makefile @@ -14,7 +14,7 @@ PORTNAME= uqm PORTVERSION= 0.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm @@ -52,7 +52,7 @@ PLIST_SUB+= MUSICADDON="@comment " .endif .ifdef(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al .endif post-extract: diff --git a/games/vamos/Makefile b/games/vamos/Makefile index 5ce3a7e4e0aa..7f60b9215ffe 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -7,16 +7,16 @@ PORTNAME= vamos PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= An automotive simulation framework -LIB_DEPENDS= alut.1:${PORTSDIR}/audio/freealut \ - openal.0:${PORTSDIR}/audio/openal \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +USE_OPENAL= al alut USE_GL= glut USE_SDL= sdl USE_GMAKE= yes diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index 0e8fb8f207dc..04687441fa15 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -7,6 +7,7 @@ PORTNAME= vavoom PORTVERSION= 1.30 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION} @@ -87,7 +88,7 @@ CMAKE_ARGS+= -DWITH_MIKMOD=N .endif .if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al CMAKE_ARGS+= -DWITH_OPENAL=Y .else CMAKE_ARGS+= -DWITH_OPENAL=N diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index 157866928acc..a50be6018160 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -7,7 +7,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= vegastrike-source-${PORTVERSION} @@ -17,10 +17,10 @@ COMMENT= Opensource 3D space simulator RUN_DEPENDS= ${DATADIR}/vegastrike.ico:${PORTSDIR}/games/vegastrike-data LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - openal.0:${PORTSDIR}/audio/openal \ vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg.6:${PORTSDIR}/audio/libogg +USE_OPENAL= al USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 788f941a57b6..1fbb2ac19fe8 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -7,6 +7,7 @@ PORTNAME= warsow PORTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://woe.crying-wolves.net/ \ http://www.derchris.eu/warsow/ \ @@ -83,7 +84,7 @@ PLIST_SUB+= QF="@comment " .endif .if !defined(WITHOUT_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al ALL_TARGET+= openal PLIST_SUB+= OPENAL="" .else diff --git a/games/warsow/files/patch-snd_openal_snd_main.c b/games/warsow/files/patch-snd_openal_snd_main.c new file mode 100644 index 000000000000..84c1d6ed71b6 --- /dev/null +++ b/games/warsow/files/patch-snd_openal_snd_main.c @@ -0,0 +1,11 @@ +--- ./snd_openal/snd_main.c.orig 2009-12-26 19:07:05.000000000 +0100 ++++ ./snd_openal/snd_main.c 2009-12-26 19:07:13.000000000 +0100 +@@ -231,7 +231,7 @@ + #define ALDRIVER "/System/Library/Frameworks/OpenAL.framework/OpenAL" + #define ALDEVICE_DEFAULT NULL + #else +-#define ALDRIVER "libopenal.so.0" ++#define ALDRIVER "libopenal.so" + #define ALDEVICE_DEFAULT NULL + #endif + diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index c9453bab533b..c1c7976af699 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -7,6 +7,7 @@ PORTNAME= warzone2100 PORTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Warzone%202100%20${PORTVERSION} @@ -19,7 +20,6 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.6:${PORTSDIR}/audio/libogg \ - openal.0:${PORTSDIR}/audio/openal \ physfs.1:${PORTSDIR}/devel/physfs \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis \ @@ -30,6 +30,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fo USE_BISON= build GNU_CONFIGURE= yes +USE_OPENAL= al USE_GL= yes USE_GMAKE= yes USE_SDL= net sdl diff --git a/games/windstille/Makefile b/games/windstille/Makefile index c1e8cddf8f5f..c6e67b961cab 100644 --- a/games/windstille/Makefile +++ b/games/windstille/Makefile @@ -7,15 +7,14 @@ PORTNAME= windstille PORTVERSION= 0.3.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games MASTER_SITES= BERLIOS CENKES MAINTAINER= amdmi3@FreeBSD.org COMMENT= Classic 2D jump-n-shoot game -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - physfs.1:${PORTSDIR}/devel/physfs \ +LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \ ogg.6:${PORTSDIR}/audio/libogg \ vorbis.4:${PORTSDIR}/audio/libvorbis \ png.5:${PORTSDIR}/graphics/png \ @@ -26,6 +25,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost USE_BZIP2= yes USE_SCONS= yes +USE_OPENAL= al USE_GL= gl USE_SDL= sdl image USE_BISON= build diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile index e2146ac514c9..14b2169d3175 100644 --- a/games/worldofpadman/Makefile +++ b/games/worldofpadman/Makefile @@ -7,7 +7,7 @@ PORTNAME= worldofpadman PORTVERSION= 1.2.20080621 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://thilo.kickchat.com/download/:full \ http://btc3x6.che.uni-bayreuth.de/~tl/wop_final/:full \ @@ -74,7 +74,7 @@ MAKE_ENV+= USE_CURL_DLOPEN=1 . endif # OpenAL . if defined(WITH_OPENAL) -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal +USE_OPENAL= al MAKE_ENV+= USE_OPENAL=1 . if defined(WITH_OPENAL_DLOPEN) MAKE_ENV+= USE_OPENAL_DLOPEN=1 diff --git a/games/worldofpadman/files/patch-code_client_snd_openal.c b/games/worldofpadman/files/patch-code_client_snd_openal.c new file mode 100644 index 000000000000..811f58495a71 --- /dev/null +++ b/games/worldofpadman/files/patch-code_client_snd_openal.c @@ -0,0 +1,11 @@ +--- ./code/client/snd_openal.c.orig 2009-12-26 20:07:28.000000000 +0100 ++++ ./code/client/snd_openal.c 2009-12-26 20:07:36.000000000 +0100 +@@ -1686,7 +1686,7 @@ + #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 + + /* diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile index 83dcd04621a3..20a31ce8ef1f 100644 --- a/games/xpilot-ng-server/Makefile +++ b/games/xpilot-ng-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xpilot-ng PORTVERSION= 4.7.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/xpilot/xpilot_ng/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX?= -server @@ -74,7 +74,7 @@ PLIST_SUB+= SDL="@comment " .endif .if defined(WITH_SOUND) -LIB_DEPENDS+= openal:${PORTSDIR}/audio/openal +USE_OPENAL= al CONFIGURE_ARGS+=--enable-sound CPPFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile index 0a92767b92b8..c250604571ff 100644 --- a/graphics/Coin/Makefile +++ b/graphics/Coin/Makefile @@ -7,6 +7,7 @@ PORTNAME= Coin PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ ftp://ftp.coin3d.org/pub/coin/src/all/ @@ -14,9 +15,9 @@ MASTER_SITES= http://ftp.coin3d.org/coin/src/all/ \ MAINTAINER= ports@FreeBSD.org COMMENT= C++ 3D graphics library based on the Open Inventor 2.1 API -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - simage.26:${PORTSDIR}/graphics/simage +LIB_DEPENDS= simage.26:${PORTSDIR}/graphics/simage +USE_OPENAL= al USE_GL= yes USE_XORG= xt x11 GNU_CONFIGURE= yes diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 4352aaf53d31..2c17e34c6388 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.49b +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -147,8 +148,7 @@ CFLAGS+= -O3 -ffast-math .if defined(WITH_OPENAL) MAKE_ENV+= NAN_NO_OPENAL="false" MAKE_ENV+= NAN_OPENAL="${LOCALBASE}/" -LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= al alut .else MAKE_ENV+= NAN_NO_OPENAL="true" .endif diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index 4604c287963f..2a0cc9632023 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= crystalspace PORTVERSION= 1.0.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= SF/crystal/crystal/${PORTVERSION} DISTNAME= ${PORTNAME:S/$/-src/}-${PORTVERSION} @@ -22,14 +22,13 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm \ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.10:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ CEGUIBase.3:${PORTSDIR}/graphics/cegui CONFLICTS= crystalspace-devel-[0-9]* USE_BZIP2= yes GNU_CONFIGURE= yes +USE_OPENAL= al alut USE_GL= yes WANT_PERL= yes LDFLAGS+= -L/usr/lib -lc diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile index f24dcda26ad5..1ba44aac5a27 100644 --- a/graphics/py-pyglet/Makefile +++ b/graphics/py-pyglet/Makefile @@ -7,6 +7,7 @@ PORTNAME= pyglet PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= graphics multimedia x11-toolkits python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,12 +16,12 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform windowing and multimedia library for Python LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - openal.0:${PORTSDIR}/audio/openal + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GL= gl glu +USE_OPENAL= al PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 6aaeff827fdd..8d956148b637 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= soya3d PORTVERSION= 0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= http://download.gna.org/soya/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,8 +22,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d \ GLEW.1:${PORTSDIR}/graphics/glew \ - openal.0:${PORTSDIR}/audio/openal \ - alut.1:${PORTSDIR}/audio/freealut \ freetype.9:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-editobj \ ${PYTHON_SITELIBDIR}/tofu/client.py:${PORTSDIR}/net/py-tofu \ @@ -32,6 +30,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:${PORTSDIR}/graphics/py-edit USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +USE_OPENAL= al alut USE_GL= gl USE_GMAKE= yes USE_SDL= sdl diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile index 70cfe5026fa5..eceb6372afe6 100644 --- a/graphics/reallyslick/Makefile +++ b/graphics/reallyslick/Makefile @@ -7,6 +7,7 @@ PORTNAME= reallyslick PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION} DISTNAME= rss-glx_${PORTVERSION} @@ -39,7 +40,7 @@ LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> .if defined(WITH_FREEALUT) -LIB_DEPENDS+= alut.1:${PORTSDIR}/audio/freealut +USE_OPENAL= alut .else CONFIGURE_ARGS+= --disable-sound .endif |