diff options
33 files changed, 359 insertions, 152 deletions
diff --git a/audio/openal/Makefile b/audio/openal/Makefile index a2c4fb2..586ea1a 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -6,24 +6,20 @@ # PORTNAME= openal -PORTVERSION= 20050401 -PORTREVISION= 1 +PORTVERSION= 20060211 CATEGORIES= audio -MASTER_SITES= http://math.missouristate.edu/~erik/files/fbsd/\ - http://www.smluc.org/~erik/files/fbsd/ +MASTER_SITES= http://openal.org/openal_webstf/downloads/ +DISTVERSION= 0.0.8 MAINTAINER= erik@smluc.org COMMENT= A 3D positional spatialized sound library -INFO= openal - -WRKSRC= ${WRKDIR}/${DISTNAME}/linux GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-capture USE_GMAKE= yes -USE_GNOME= pkgconfig +USE_GNOME= pkgconfig gnomehack WANT_SDL= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes @@ -43,27 +39,37 @@ WITH_SDL= yes # smpeg requires SDL .if defined(WITH_ARTS) LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts CONFIGURE_ARGS+=--enable-arts +.else +CONFIGURE_ARGS+=--disable-arts .endif .if defined(WITH_ESD) USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd +.else +CONFIGURE_ARGS+=--disable-esd .endif .if defined(WITH_SDL) USE_SDL+= sdl CONFIGURE_ENV+= HAVESDL="${SDL_CONFIG}" CONFIGURE_ARGS+=--enable-sdl +.else +CONFIGURE_ARGS+=--disable-sdl .endif .if defined(WITH_VORBIS) LIB_DEPENDS+= vorbisfile.4:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis +.else +CONFIGURE_ARGS+=--disable-vorbis .endif .if defined(WITH_SMPEG) LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg CONFIGURE_ARGS+=--enable-smpeg +.else +CONFIGURE_ARGS+=--disable-smpeg .endif post-patch: @@ -72,7 +78,4 @@ post-patch: @${REINPLACE_CMD} -e '/#include/ s|SDL/||' \ ${WRKSRC}/src/extensions/al_ext_mp3.c -post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info - .include <bsd.port.post.mk> diff --git a/audio/openal/distinfo b/audio/openal/distinfo index b8938570..5e0d016 100644 --- a/audio/openal/distinfo +++ b/audio/openal/distinfo @@ -1,3 +1,3 @@ -MD5 (openal-20050401.tar.gz) = a715c159a1de35e743ca5ccb13f6d118 -SHA256 (openal-20050401.tar.gz) = 36873403226a225987038186296393d6e8eee6caf7e10c4fe8eaafbbb139f55b -SIZE (openal-20050401.tar.gz) = 346077 +MD5 (openal-0.0.8.tar.gz) = 641cf53761f35ee979f3e888614797a0 +SHA256 (openal-0.0.8.tar.gz) = 723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe +SIZE (openal-0.0.8.tar.gz) = 870671 diff --git a/audio/openal/files/patch-src-backends-alc_backend_bsd.c b/audio/openal/files/patch-src-backends-alc_backend_bsd.c new file mode 100644 index 0000000..8ee8e3c --- /dev/null +++ b/audio/openal/files/patch-src-backends-alc_backend_bsd.c @@ -0,0 +1,13 @@ +--- src/backends/alc_backend_bsd.c.orig Sat Apr 22 12:25:15 2006 ++++ src/backends/alc_backend_bsd.c Sat Apr 22 12:26:15 2006 +@@ -9,7 +9,10 @@ + */ + #include "al_siteconfig.h" + ++#define __BSD_VISIBLE 1 ++ + #include <AL/al.h> ++#include <AL/alext.h> + #include <assert.h> + #include <fcntl.h> + #include <sys/soundcard.h> diff --git a/audio/openal/files/patch-src-backends-alc_backend_esd.c b/audio/openal/files/patch-src-backends-alc_backend_esd.c new file mode 100644 index 0000000..ad1f5d1 --- /dev/null +++ b/audio/openal/files/patch-src-backends-alc_backend_esd.c @@ -0,0 +1,10 @@ +--- src/backends/alc_backend_esd.c.orig Sat Apr 22 21:06:15 2006 ++++ src/backends/alc_backend_esd.c Sat Apr 22 21:05:33 2006 +@@ -15,6 +15,7 @@ + #include <string.h> + #include <sys/ioctl.h> + #include <sys/mman.h> ++#include <sys/select.h> + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/types.h> diff --git a/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c b/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c deleted file mode 100644 index ce94d0e..0000000 --- a/audio/openal/files/patch-src_arch_bsd_bsd__dsp.c +++ /dev/null @@ -1,58 +0,0 @@ ---- src/arch/bsd/bsd_dsp.c.orig Wed Nov 9 13:15:27 2005 -+++ src/arch/bsd/bsd_dsp.c Wed Nov 9 14:09:12 2005 -@@ -113,7 +113,6 @@ - */ - void *grab_write_native(void) { - const char *dsppath = "/dev/dsp"; -- int divisor = _alSpot(_AL_DEF_BUFSIZ) | (2<<16); - - dsp_fd = open(dsppath, O_WRONLY | O_NONBLOCK); - -@@ -126,10 +125,6 @@ - perror("fcntl"); - } - -- if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) { -- perror("ioctl SETFRAGMENT"); -- } -- - _alBlitBuffer = native_blitbuffer; - - FD_ZERO(&dsp_fd_set); -@@ -320,10 +315,11 @@ - } - - ALboolean set_write_native(UNUSED(void *handle), -- UNUSED(unsigned int *bufsiz), -+ unsigned int *bufsiz, - ALenum *fmt, - unsigned int *speed) { - ALuint channels = _al_ALCHANNELS(*fmt); -+ int divisor; - - if(dsp_fd < 0) { - return AL_FALSE; -@@ -365,6 +361,23 @@ - - - *fmt = BSD2ALFMT(*fmt, channels); -+ -+ if(ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, bufsiz) < 0) { -+#ifdef DEBUG_MAXIMUS -+ fprintf(stderr, "blksize %d\n", *bufsiz); -+ perror("get_devsp blksize ioctl"); -+#endif -+ return AL_FALSE; -+ } -+ -+ divisor = _alSpot(*bufsiz) | (2<<16); -+ if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) { -+#ifdef DEBUG_MAXIMUS -+ fprintf(stderr, "divisor %d\n", divisor); -+ perror("set_devsp fragment ioctl"); -+#endif -+ return AL_FALSE; -+ } - - return AL_TRUE; - } diff --git a/audio/openal/pkg-plist b/audio/openal/pkg-plist index 8a64e49c..bb4ccc3 100644 --- a/audio/openal/pkg-plist +++ b/audio/openal/pkg-plist @@ -1,15 +1,10 @@ bin/openal-config include/AL/al.h include/AL/alc.h -include/AL/alctypes.h include/AL/alext.h -include/AL/alexttypes.h -include/AL/altypes.h -include/AL/alut.h -include/AL/aluttypes.h lib/libopenal.a +lib/libopenal.la lib/libopenal.so lib/libopenal.so.0 -lib/libopenal.so.0.0.8 libdata/pkgconfig/openal.pc @dirrm include/AL diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile index 2280f6d..d226408 100644 --- a/audio/py-openal/Makefile +++ b/audio/py-openal/Makefile @@ -15,7 +15,8 @@ DISTNAME= PyOpenAL-${PORTVERSION} MAINTAINER= acardenas@bsd.org.pe COMMENT= PyOpenAL is a binding of OpenAL for Python -LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal +LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut DIST_SUBDIR= python USE_REINPLACE= yes diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 7cef850..47a6f65 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -17,7 +17,8 @@ COMMENT= A toolkit for 3D games and simulations BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.9:${PORTSDIR}/graphics/jpeg \ + alut.0:${PORTSDIR}/audio/freealut USE_X_PREFIX= yes USE_GL= yes diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index 851837b..934f53c 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -17,7 +17,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D asteroids-like multiplayer game LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - glut.4:${PORTSDIR}/graphics/libglut + glut.4:${PORTSDIR}/graphics/libglut \ + alut.0:${PORTSDIR}/audio/freealut SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config @@ -42,6 +43,7 @@ pre-patch: @${PERL} -pi.orig -e 's|^aclocal|${ACLOCAL}|; \ s|^autoconf|${AUTOCONF}|; s|^automake|${AUTOMAKE}|' \ ${WRKSRC}/autogen.sh + @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|' ${WRKSRC}/Makefile.am pre-configure: cd ${WRKSRC}; ${SH} autogen.sh diff --git a/games/atr3d/files/patch-sound.cpp b/games/atr3d/files/patch-sound.cpp new file mode 100644 index 0000000..22f8945 --- /dev/null +++ b/games/atr3d/files/patch-sound.cpp @@ -0,0 +1,21 @@ +--- sound.cpp.orig Wed Mar 29 15:09:51 2006 ++++ sound.cpp Wed Mar 29 15:11:11 2006 +@@ -288,6 +288,7 @@ + { + int i; + char filename[1000]; ++ ALboolean loop; + + for (i=0; i<NUM_SOUNDS; i++) { + #ifdef WINDOWS +@@ -296,8 +297,8 @@ + sprintf(filename, "%s/atr3d/sounds/%d.wav", DATADIR, i); + #endif + +- alutLoadWAV(filename, &Wavs[i].wave, &Wavs[i].format, +- &Wavs[i].size, &Wavs[i].bits, &Wavs[i].freq); ++ alutLoadWAVFile((ALbyte*)filename, &Wavs[i].format, &Wavs[i].wave, ++ &Wavs[i].size, &Wavs[i].freq, &loop); + } + } + #endif diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile index bb7585f..2703ded 100644 --- a/games/chromium-bsu/Makefile +++ b/games/chromium-bsu/Makefile @@ -18,12 +18,16 @@ COMMENT= An arcade-style, top-scrolling space shooter LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ smpeg.1:${PORTSDIR}/multimedia/smpeg \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut USE_GL= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/Chromium-0.9 +post-patch: + @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' ${WRKSRC}/configure + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin ${MKDIR} ${DATADIR}/data diff --git a/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp b/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp new file mode 100644 index 0000000..5965504 --- /dev/null +++ b/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp @@ -0,0 +1,76 @@ +--- src/AudioOpenAL.cpp.orig Thu Mar 30 15:34:34 2006 ++++ src/AudioOpenAL.cpp Thu Mar 30 16:32:00 2006 +@@ -153,13 +153,8 @@ + + checkError("AudioOpenAL::~Audio()"); + +- #ifdef _WIN32 + if(context_id) + alcDestroyContext((ALCcontext*)context_id); +- #else +- if(context_id) +- alcDestroyContext(context_id); +- #endif + + fprintf(stderr, "done.\n"); + } +@@ -200,7 +195,7 @@ + ALCdevice *dev; + dev = alcOpenDevice( NULL ); + context_id = alcCreateContext(dev, NULL); +- alcMakeContextCurrent(context_id); ++ alcMakeContextCurrent((ALCcontext*)context_id); + #endif + #endif + +@@ -310,7 +305,7 @@ + + //-- check AttenuationScale extension + alAttenuationScale = (void (*)(ALfloat param)) +- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI"); ++ alGetProcAddress((ALchar *)"alAttenuationScale_LOKI"); + if(alAttenuationScale == NULL) + fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n"); + else +@@ -318,9 +313,9 @@ + + //-- check Audio Channel extension + alcGetAudioChannel = (float (*)(ALuint channel)) +- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI"); ++ alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI"); + alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume)) +- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI"); ++ alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI"); + #ifdef CD_VOLUME + if(alcGetAudioChannel) + origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI); +@@ -328,10 +323,10 @@ + + //-- check MP3 extension + alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) +- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); ++ alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI"); + //-- check Ogg/Vorbis extension + alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) +- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); ++ alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI"); + + #endif //_WIN32 + } +@@ -471,6 +466,7 @@ + ALsizei size, freq, bits; + ALenum format; + ALvoid *data; ++ ALboolean loop; + + for(i = 0; i < NumSoundTypes; i++) + { +@@ -481,7 +477,7 @@ + else + { + #ifndef _WIN32 +- alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq); ++ alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop); + alBufferData (buffer[i], format, data, size, freq); + free(data); + #else //_WIN32 diff --git a/games/chromium-bsu/scripts/configure b/games/chromium-bsu/scripts/configure index 340d352..0db67b0 100644 --- a/games/chromium-bsu/scripts/configure +++ b/games/chromium-bsu/scripts/configure @@ -1,13 +1,13 @@ SDL_CONFIG=sdl11-config SMPEG_CONFIG=smpeg-config -OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg--enable-vorbis" +OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg --enable-vorbis" SDL_LIBS="\`\$(SDL_CONFIG) --libs\`" SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL" SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`" SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`" GL_LIBS="-lglpng -lGL -lGLU -lm" -AL_LIBS="-L${LOCALBASE}/lib -lopenal" +AL_LIBS="-L${LOCALBASE}/lib -lopenal -lalut" AL_CFLAGS="-I${LOCALBASE}/include" PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\"" diff --git a/games/chromium/Makefile b/games/chromium/Makefile index bb7585f..2703ded 100644 --- a/games/chromium/Makefile +++ b/games/chromium/Makefile @@ -18,12 +18,16 @@ COMMENT= An arcade-style, top-scrolling space shooter LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \ smpeg.1:${PORTSDIR}/multimedia/smpeg \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut USE_GL= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/Chromium-0.9 +post-patch: + @${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' ${WRKSRC}/configure + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin ${MKDIR} ${DATADIR}/data diff --git a/games/chromium/files/patch-src-AudioOpenAL.cpp b/games/chromium/files/patch-src-AudioOpenAL.cpp new file mode 100644 index 0000000..5965504 --- /dev/null +++ b/games/chromium/files/patch-src-AudioOpenAL.cpp @@ -0,0 +1,76 @@ +--- src/AudioOpenAL.cpp.orig Thu Mar 30 15:34:34 2006 ++++ src/AudioOpenAL.cpp Thu Mar 30 16:32:00 2006 +@@ -153,13 +153,8 @@ + + checkError("AudioOpenAL::~Audio()"); + +- #ifdef _WIN32 + if(context_id) + alcDestroyContext((ALCcontext*)context_id); +- #else +- if(context_id) +- alcDestroyContext(context_id); +- #endif + + fprintf(stderr, "done.\n"); + } +@@ -200,7 +195,7 @@ + ALCdevice *dev; + dev = alcOpenDevice( NULL ); + context_id = alcCreateContext(dev, NULL); +- alcMakeContextCurrent(context_id); ++ alcMakeContextCurrent((ALCcontext*)context_id); + #endif + #endif + +@@ -310,7 +305,7 @@ + + //-- check AttenuationScale extension + alAttenuationScale = (void (*)(ALfloat param)) +- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI"); ++ alGetProcAddress((ALchar *)"alAttenuationScale_LOKI"); + if(alAttenuationScale == NULL) + fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n"); + else +@@ -318,9 +313,9 @@ + + //-- check Audio Channel extension + alcGetAudioChannel = (float (*)(ALuint channel)) +- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI"); ++ alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI"); + alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume)) +- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI"); ++ alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI"); + #ifdef CD_VOLUME + if(alcGetAudioChannel) + origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI); +@@ -328,10 +323,10 @@ + + //-- check MP3 extension + alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) +- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); ++ alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI"); + //-- check Ogg/Vorbis extension + alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) +- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); ++ alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI"); + + #endif //_WIN32 + } +@@ -471,6 +466,7 @@ + ALsizei size, freq, bits; + ALenum format; + ALvoid *data; ++ ALboolean loop; + + for(i = 0; i < NumSoundTypes; i++) + { +@@ -481,7 +477,7 @@ + else + { + #ifndef _WIN32 +- alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq); ++ alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop); + alBufferData (buffer[i], format, data, size, freq); + free(data); + #else //_WIN32 diff --git a/games/chromium/scripts/configure b/games/chromium/scripts/configure index 340d352..0db67b0 100644 --- a/games/chromium/scripts/configure +++ b/games/chromium/scripts/configure @@ -1,13 +1,13 @@ SDL_CONFIG=sdl11-config SMPEG_CONFIG=smpeg-config -OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg--enable-vorbis" +OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg --enable-vorbis" SDL_LIBS="\`\$(SDL_CONFIG) --libs\`" SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL" SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`" SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`" GL_LIBS="-lglpng -lGL -lGLU -lm" -AL_LIBS="-L${LOCALBASE}/lib -lopenal" +AL_LIBS="-L${LOCALBASE}/lib -lopenal -lalut" AL_CFLAGS="-I${LOCALBASE}/include" PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\"" diff --git a/games/el/Makefile b/games/el/Makefile index 10ab688..524dfc3 100644 --- a/games/el/Makefile +++ b/games/el/Makefile @@ -17,7 +17,8 @@ COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ vorbis.3:${PORTSDIR}/audio/libvorbis \ - cal3d.11:${PORTSDIR}/graphics/cal3d + cal3d.11:${PORTSDIR}/graphics/cal3d \ + alut.0:${PORTSDIR}/audio/freealut RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip USE_GNOME= libxml2 diff --git a/games/el/files/patch-Makefile.bsd b/games/el/files/patch-Makefile.bsd index 4c3036c..6b6f2eb 100644 --- a/games/el/files/patch-Makefile.bsd +++ b/games/el/files/patch-Makefile.bsd @@ -47,8 +47,8 @@ +CXXFLAGS=${CFLAGS} -fno-exceptions .else -CFLAGS=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe -+CFLAGS+=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe -+CXXFLAGS=-Wall -Wno-deprecated -Werror -ggdb -pipe -fno-exceptions ++CFLAGS+=-Wdeclaration-after-statement -ggdb -pipe ++CXXFLAGS=-ggdb -pipe -fno-exceptions .endif -CFLAGS+=-march=i686 -DBSD -DELC -CFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags` @@ -59,7 +59,8 @@ +CFLAGS+=${CPPFLAGS} +CXXFLAGS+=${CPPFLAGS} LDFLAGS+=-L${X11BASE}/lib -lGL `${SDL_CONFIG} --libs` `${LIBXML2_CONFIG} --libs` - LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lGLU -lvorbis -lvorbisfile -lm +-LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lGLU -lvorbis -lvorbisfile -lm ++LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lalut -lGLU -lvorbis -lvorbisfile -lm .if CAL3D -SRCS+=cal3dwrap.c +SRCS+=cal3d_wrapper.cpp diff --git a/games/ember/Makefile b/games/ember/Makefile index c514b3b..46a8b38 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -6,8 +6,8 @@ # PORTNAME= ember -PORTVERSION= 0.3.4 -PORTREVISION= 2 +PORTVERSION= 0.4.0 +PORTREVISION= 0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://amber.worldforge.org/ember/releases/stable/ @@ -16,13 +16,14 @@ MASTER_SITE_SUBDIR=worldforge MAINTAINER= oliver@FreeBSD.org COMMENT= Ember is a WorldForge 3d client using the OGRE 3d library -RUN_DEPENDS= ${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut +#RUN_DEPENDS= ${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ - OgreMain.9:${PORTSDIR}/graphics/ogre3d \ + OgreMain.10:${PORTSDIR}/graphics/ogre3d \ eris-1.3:${PORTSDIR}/devel/eris \ varconf-1.0.6:${PORTSDIR}/devel/varconf \ mercator-0.2.4:${PORTSDIR}/devel/mercator \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit USE_SDL= sdl image @@ -32,6 +33,7 @@ INSTALLS_SHLIB= YES USE_GCC= 3.4 USE_X_PREFIX= YES USE_GNOME= gnomehack +USE_BZIP2= YES CPPFLAGS= -DBR_NO_MACROS .include <bsd.port.pre.mk> @@ -59,6 +61,10 @@ post-patch: /Plugin=Plugin_CgProgramManager.so/d; \ s|/usr/lib/OGRE|${X11BASE}/lib/OGRE|' \ ${WRKSRC}/src/components/ogre/plugins.cfg + @${REINPLACE_CMD} -e 's|/altypes\.h|/al\.h|' \ + ${WRKSRC}/src/services/sound/SoundService.h + @${REINPLACE_CMD} -e 's|@LDFLAGS@|& -lopenal -lalut|' \ + ${WRKSRC}/src/components/ogre/Makefile.in .if ${OSVERSION} < 500000 @${REINPLACE_CMD} -e 's|lrintf|(long int)rintf|g' \ ${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \ diff --git a/games/ember/distinfo b/games/ember/distinfo index 28ecc92..911acac 100644 --- a/games/ember/distinfo +++ b/games/ember/distinfo @@ -1,3 +1,3 @@ -MD5 (ember-0.3.4.tar.gz) = 49b4181a415ba9a75b0315ae55ac52bc -SHA256 (ember-0.3.4.tar.gz) = 864cdbeb5f9f89fc135bdd94d7359589e4f00d7b8278b5581d78dbbf7896243d -SIZE (ember-0.3.4.tar.gz) = 1316934 +MD5 (ember-0.4.0.tar.bz2) = c60cfe1227e2f0f810e5fa9b24f2096e +SHA256 (ember-0.4.0.tar.bz2) = 17780eec446b5e3959d657a61a85533f5072e00b629a1755ce51d75509fedd6a +SIZE (ember-0.4.0.tar.bz2) = 2275373 diff --git a/games/ember/files/patch-ember b/games/ember/files/patch-ember index 474dff4..8d1b70f 100644 --- a/games/ember/files/patch-ember +++ b/games/ember/files/patch-ember @@ -1,5 +1,5 @@ ---- ember.orig Tue Sep 27 22:04:31 2005 -+++ ember Wed Oct 12 17:32:30 2005 +--- ember.orig Mon Feb 13 00:33:13 2006 ++++ ember Wed Mar 8 06:28:31 2006 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -18,22 +18,16 @@ #if [ "$fullpath" = "" ]; then if [ "$test" = "." ]; then path=${PWD} -@@ -77,12 +78,12 @@ - # See if Updater exists in home dir - if [ ! -e $homedata/$WFUT_JAR ] ; then - # Check to see if its in the install dir -- if [ -e $datadir/$WFUT_JAR ] ; then -+ if [ -e $bindir/$WFUT_JAR ] ; then - # Install into home dir - echo "Installing Updater" +@@ -56,7 +57,7 @@ + etcdir=${prefix}/etc/ember + homedata=$HOME/.ember - # Copy WFUT to home dir -- cp $datadir/$WFUT_JAR $homedata -+ cp $bindir/$WFUT_JAR $homedata +-WFUT_JAR=$datadir/WFUT.jar ++WFUT_JAR=$bindir/WFUT.jar - fi - fi -@@ -124,5 +125,6 @@ + # Create dir if required + if [ ! -d $homedata ] ; then +@@ -96,5 +97,6 @@ # Execute real ember binary echo "Starting Ember...." #we have to do the LD_PRELOAD thing, because else at least I get an error: libnvidia-tls.so.1: cannot handle TLS data /ehj diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist index 72fe864..14ba924 100644 --- a/games/ember/pkg-plist +++ b/games/ember/pkg-plist @@ -20,25 +20,33 @@ share/games/ember/carpenter/modelblockspecs/general.modelblocks.xml share/games/ember/jesus/modelmappings/general.modelmapping.xml share/games/ember/media/gui/CEGUIConfig.xsd share/games/ember/media/gui/Font.xsd +share/games/ember/media/gui/Falagard.xsd share/games/ember/media/gui/GUILayout.xsd share/games/ember/media/gui/GUIScheme.xsd share/games/ember/media/gui/Imageset.xsd share/games/ember/media/gui/cegui/datafiles/configs/cegui.config share/games/ember/media/gui/cegui/datafiles/fonts/Font.xsd +share/games/ember/media/gui/cegui/datafiles/fonts/Vera.ttf share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml share/games/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf +share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-14.xml +share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-10.xml +share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-8.xml +share/games/ember/media/gui/cegui/datafiles/fonts/ share/games/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.imageset -share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLookMouse.imageset share/games/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset -share/games/ember/media/gui/cegui/datafiles/layouts/ChatWidget.xml +share/games/ember/media/gui/cegui/datafiles/layouts/Chat.layout share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml -share/games/ember/media/gui/cegui/datafiles/layouts/DebugWidget.xml -share/games/ember/media/gui/cegui/datafiles/layouts/GiveWidget.xml +share/games/ember/media/gui/cegui/datafiles/layouts/Debug.layout +share/games/ember/media/gui/cegui/datafiles/layouts/Demo8.layout +share/games/ember/media/gui/cegui/datafiles/layouts/EntityEditWidget.xml +share/games/ember/media/gui/cegui/datafiles/layouts/EntityPicker.layout +share/games/ember/media/gui/cegui/datafiles/layouts/Give.layout share/games/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd share/games/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml share/games/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml @@ -49,24 +57,36 @@ share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditFile.widget share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget share/games/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml share/games/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget -share/games/ember/media/gui/cegui/datafiles/layouts/Performance.widget +share/games/ember/media/gui/cegui/datafiles/layouts/ModelEdit.layout +share/games/ember/media/gui/cegui/datafiles/layouts/Performance.layout share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget -share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowserWidget.xml +share/games/ember/media/gui/cegui/datafiles/layouts/ScriptEdit.layout +share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowser.layout share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml +share/games/ember/media/gui/cegui/datafiles/lua_scripts/Bootstrap.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/Chat.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/Debug.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/demo8.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/EntityPicker.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/Give.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/ModelEdit.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/Performance.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/ServerBrowser.lua +share/games/ember/media/gui/cegui/datafiles/lua_scripts/ScriptEdit.lua +share/games/ember/media/gui/cegui/datafiles/imagesets/EmberLook.imageset +share/games/ember/media/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel +share/games/ember/media/gui/cegui/datafiles/looknfeel/Vanilla.looknfeel +share/games/ember/media/gui/cegui/datafiles/looknfeel/WindowsLook.looknfeel +share/games/ember/media/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel +share/games/ember/media/gui/cegui/datafiles/schemes/EmberLookSkin.scheme share/games/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme +share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookSkin.scheme share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme -share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgets.scheme share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme -share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookWidgets.scheme -share/games/ember/media/modeldefinitions/buildingelements.modeldef.xml -share/games/ember/media/modeldefinitions/characters.modeldef.xml -share/games/ember/media/modeldefinitions/creatures.modeldef.xml -share/games/ember/media/modeldefinitions/environment.modeldef.xml -share/games/ember/media/modeldefinitions/items.modeldef.xml -share/games/ember/media/modeldefinitions/placeholder.modeldef.xml -share/games/ember/media/modeldefinitions/trees/dynamic/trees.modeldef.xml -share/games/ember/media/modeldefinitions/trees/pregenerated/trees.modeldef.xml +share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookSkin.scheme +share/games/ember/media/packs/EmberCore.zip +share/games/ember/media/packs/OgreCore.zip share/icons/worldforge/ember.png %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/COPYING @@ -85,15 +105,13 @@ share/icons/worldforge/ember.png @dirrm share/games/ember/media/gui/cegui/datafiles/fonts @dirrm share/games/ember/media/gui/cegui/datafiles/imagesets @dirrm share/games/ember/media/gui/cegui/datafiles/layouts +@dirrm share/games/ember/media/gui/cegui/datafiles/looknfeel @dirrm share/games/ember/media/gui/cegui/datafiles/lua_scripts @dirrm share/games/ember/media/gui/cegui/datafiles/schemes @dirrm share/games/ember/media/gui/cegui/datafiles @dirrm share/games/ember/media/gui/cegui @dirrm share/games/ember/media/gui -@dirrm share/games/ember/media/modeldefinitions/trees/dynamic -@dirrm share/games/ember/media/modeldefinitions/trees/pregenerated -@dirrm share/games/ember/media/modeldefinitions/trees -@dirrm share/games/ember/media/modeldefinitions +@dirrm share/games/ember/media/packs @dirrm share/games/ember/media @dirrm share/games/ember @dirrm share/games diff --git a/games/excido/Makefile b/games/excido/Makefile index 6c696cb..e53bd15 100644 --- a/games/excido/Makefile +++ b/games/excido/Makefile @@ -15,7 +15,8 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= A portable fast-paced 3d shooter LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - physfs-1.0.1:${PORTSDIR}/devel/physfs + physfs-1.0.1:${PORTSDIR}/devel/physfs \ + alut.0:${PORTSDIR}/audio/freealut WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/games/excido/files/patch-Makefile b/games/excido/files/patch-Makefile index c109c3a..114ba0d 100644 --- a/games/excido/files/patch-Makefile +++ b/games/excido/files/patch-Makefile @@ -7,7 +7,7 @@ #CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2 OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}} -LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU -+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU ++LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU -PREFIX=/usr/local BINDIR=$(PREFIX)/bin/ diff --git a/games/glest/Makefile b/games/glest/Makefile index 1fbd6b3..000e750 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -19,7 +19,8 @@ COMMENT= Free 3d real-time customizable strategy game LIB_DEPENDS= xerces-c.26:${PORTSDIR}/textproc/xerces-c2 \ vorbis.3:${PORTSDIR}/audio/libvorbis \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam USE_REINPLACE= yes diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index aef8511..c117c9b 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -22,6 +22,7 @@ BUILD_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \ wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \ openal-config:${PORTSDIR}/audio/openal +LIB_DEPENDS= alut.0:${PORTSDIR}/audio/freealut SCORCH_VERSION= 39.1 diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac index fbc27d6..7b21829 100644 --- a/games/scorched3d/files/patch-configure.ac +++ b/games/scorched3d/files/patch-configure.ac @@ -1,6 +1,29 @@ ---- configure.ac.orig Fri Oct 14 10:18:06 2005 -+++ configure.ac Fri Oct 14 10:19:33 2005 -@@ -248,13 +248,13 @@ +--- configure.ac.orig Mon Jul 25 19:06:13 2005 ++++ configure.ac Wed Mar 29 14:07:50 2006 +@@ -103,6 +103,7 @@ + , enable_openaltest=yes) + AC_MSG_CHECKING(for OpenAL) + AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) ++AC_PATH_PROG(ALUT_CONFIG, freealut-config, no) + have_openal=yes + if test x$OPENAL_CONFIG = xno; then + echo "*** The openal-config script installed by OpenAL could not be found" +@@ -114,11 +115,11 @@ + if test x"$use_static_openal" = x"yes"; then + LIBS="$LIBS /usr/local/lib/libopenal.a" + else +- LIBS="$LIBS `$OPENAL_CONFIG --libs`" ++ LIBS="$LIBS `$OPENAL_CONFIG --libs` `$ALUT_CONFIG --libs`" + fi + +- CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`" +- CXXFLAGS="$CXXFLAGS `$OPENAL_CONFIG --cflags`" ++ CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags` `$ALUT_CONFIG --cflags`" ++ CXXFLAGS="$CXXFLAGS `$OPENAL_CONFIG --cflags` `$ALUT_CONFIG --cflags`" + fi + + AC_MSG_CHECKING(for OpenAL compilation) +@@ -248,13 +249,13 @@ ]) fi diff --git a/games/torcs/Makefile b/games/torcs/Makefile index 55b3f75..d512826 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -17,7 +17,8 @@ COMMENT= The Open Racing Car Simulator BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_BZIP2= yes diff --git a/games/trigger/Makefile b/games/trigger/Makefile index 852bb31..25ffacf 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -18,7 +18,8 @@ COMMENT= A rally car racing game BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \ - physfs:${PORTSDIR}/devel/physfs + physfs:${PORTSDIR}/devel/physfs \ + alut.0:${PORTSDIR}/audio/freealut USE_X_PREFIX= yes USE_SDL= sdl image @@ -42,7 +43,8 @@ post-patch: @${REINPLACE_CMD} -e 's|SDL/||' \ ${WRKSRC}/src/trigger/main.cpp \ ${WRKSRC}/src/pengine/texture.cpp - @${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|' \ + @${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|; \ + s|-lopenal|& -lalut|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/Jamrules diff --git a/games/warzone/Makefile b/games/warzone/Makefile index f908871..1f970e9 100644 --- a/games/warzone/Makefile +++ b/games/warzone/Makefile @@ -19,7 +19,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.5:${PORTSDIR}/audio/libogg \ openal.0:${PORTSDIR}/audio/openal \ - vorbis.3:${PORTSDIR}/audio/libvorbis + vorbis.3:${PORTSDIR}/audio/libvorbis \ + alut.0:${PORTSDIR}/audio/freealut USE_BZIP2= yes USE_REINPLACE= yes @@ -43,7 +44,9 @@ post-patch: .for f in configure *.c *.h @${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e \ - 's|\(#include.*\)SDL/\(SDL.*\)|\1\2|' + 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ + s|-lopenal |&-lalut|g ; \ + s|"-lalut|"-lopenal -lalut|' .endfor do-install: diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index f908871..1f970e9 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -19,7 +19,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.5:${PORTSDIR}/audio/libogg \ openal.0:${PORTSDIR}/audio/openal \ - vorbis.3:${PORTSDIR}/audio/libvorbis + vorbis.3:${PORTSDIR}/audio/libvorbis \ + alut.0:${PORTSDIR}/audio/freealut USE_BZIP2= yes USE_REINPLACE= yes @@ -43,7 +44,9 @@ post-patch: .for f in configure *.c *.h @${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e \ - 's|\(#include.*\)SDL/\(SDL.*\)|\1\2|' + 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ + s|-lopenal |&-lalut|g ; \ + s|"-lalut|"-lopenal -lalut|' .endfor do-install: diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile index 09a2338..72cfb72 100644 --- a/graphics/crystalspace-devel/Makefile +++ b/graphics/crystalspace-devel/Makefile @@ -20,7 +20,8 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut USE_X_PREFIX= yes USE_BZIP2= yes @@ -156,7 +157,8 @@ CONFIGURE_ARGS+= --without-bfd .endif pre-configure: - @${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g; \ + s,86\*),86\*|amd64|ia64),' ${WRKSRC}/configure post-configure: .if defined(NOPORTDOCS) diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index 09a2338..72cfb72 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -20,7 +20,8 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib \ - openal.0:${PORTSDIR}/audio/openal + openal.0:${PORTSDIR}/audio/openal \ + alut.0:${PORTSDIR}/audio/freealut USE_X_PREFIX= yes USE_BZIP2= yes @@ -156,7 +157,8 @@ CONFIGURE_ARGS+= --without-bfd .endif pre-configure: - @${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g; \ + s,86\*),86\*|amd64|ia64),' ${WRKSRC}/configure post-configure: .if defined(NOPORTDOCS) |
