Attachment #63902 for bug #95192

View | Details | Raw Unified | Return to bug 95192
Collapse All | Expand All




#

PORTNAME=	openal
PORTVERSION=	0.0.8
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	http://openal.org/openal_webstf/downloads/
		http://www.smluc.org/~erik/files/fbsd/

MAINTAINER=	erik@smluc.org
COMMENT=	A 3D positional spatialized sound library

INFO=		openal

WRKSRC=		${WRKDIR}/${DISTNAME}/linux
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--program-transform-name=''
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--enable-capture
USE_GMAKE=	yes
USE_GNOME=	pkgconfig gnomehack
WANT_SDL=	yes
INSTALLS_SHLIB=	yes
USE_REINPLACE=	yes


post-patch:
	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/; \
		s|#define _POSIX_C_SOURCE 199309|/\*&\*/|; \
		s/x86_64\*/amd64\* | \*ia64\*/g; \
		/CPPFLAGS=/ d' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e '/#include/ s|SDL/||' \
		${WRKSRC}/src/extensions/al_ext_mp3.c
	@${REINPLACE_CMD} -e 's|"mixaudio16_mmx_prk.h"|"arch/i386/mixaudio16_mmx_prk.h"|' \
		${WRKSRC}/src/mixaudio16.h
	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)audio/openal/distinfo (-3 / +3 lines)
1	MD5 (openal-20050401.tar.gz) = a715c159a1de35e743ca5ccb13f6d118	1	MD5 (openal-0.0.8.tar.gz) = 641cf53761f35ee979f3e888614797a0
2	SHA256 (openal-20050401.tar.gz) = 36873403226a225987038186296393d6e8eee6caf7e10c4fe8eaafbbb139f55b	2	SHA256 (openal-0.0.8.tar.gz) = 723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
3	SIZE (openal-20050401.tar.gz) = 346077	3	SIZE (openal-0.0.8.tar.gz) = 870671

Added Link Here

(-)audio/openal/files/patch-src-backends-alc_backend_bsd.c (+10 lines)
1	--- src/backends/alc_backend_bsd.c.orig Tue Mar 28 20:00:39 2006
2	+++ src/backends/alc_backend_bsd.c Tue Mar 28 20:00:52 2006
3	@@ -10,6 +10,7 @@
4	#include "al_siteconfig.h"
5
6	#include <AL/al.h>
7	+#include <AL/alext.h>
8	#include <assert.h>
9	#include <fcntl.h>
10	#include <sys/soundcard.h>




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

Lines 15-21 Link Here

(-)audio/py-openal/Makefile (-1 / +2 lines)
15	MAINTAINER= acardenas@bsd.org.pe	15	MAINTAINER= acardenas@bsd.org.pe
16	COMMENT= PyOpenAL is a binding of OpenAL for Python	16	COMMENT= PyOpenAL is a binding of OpenAL for Python
17		17
18	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal	18	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
		19	alut.0:${PORTSDIR}/audio/freealut
19		20
20	DIST_SUBDIR= python	21	DIST_SUBDIR= python
21	USE_REINPLACE= yes	22	USE_REINPLACE= yes

Lines 18-24 Link Here

(-)devel/simgear/Makefile (-1 / +2 lines)
18	BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib	18	BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
19	RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib	19	RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
20	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \	20	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
21	jpeg.9:${PORTSDIR}/graphics/jpeg	21	jpeg.9:${PORTSDIR}/graphics/jpeg \
		22	alut.0:${PORTSDIR}/audio/freealut
22		23
23	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
24	USE_REINPLACE= yes	25	USE_REINPLACE= yes

Lines 17-23 Link Here

(-)games/atr3d/Makefile (-1 / +3 lines)
17	COMMENT= 3D asteroids-like multiplayer game	17	COMMENT= 3D asteroids-like multiplayer game
18		18
19	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \	19	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
20	glut.4:${PORTSDIR}/graphics/libglut	20	glut.4:${PORTSDIR}/graphics/libglut \
		21	alut.0:${PORTSDIR}/audio/freealut
21		22
22	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config	23	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
23		24
Lines 42-47 Link Here
42	@${PERL} -pi.orig -e 's\|^aclocal\|${ACLOCAL}\|; \	43	@${PERL} -pi.orig -e 's\|^aclocal\|${ACLOCAL}\|; \
43	s\|^autoconf\|${AUTOCONF}\|; s\|^automake\|${AUTOMAKE}\|' \	44	s\|^autoconf\|${AUTOCONF}\|; s\|^automake\|${AUTOMAKE}\|' \
44	${WRKSRC}/autogen.sh	45	${WRKSRC}/autogen.sh
		46	@${REINPLACE_CMD} -e 's\|-lopenal\|& -lalut\|' ${WRKSRC}/Makefile.am
45		47
46	pre-configure:	48	pre-configure:
47	cd ${WRKSRC}; ${SH} autogen.sh	49	cd ${WRKSRC}; ${SH} autogen.sh




--- 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

Lines 19-25 Link Here

(-)games/glest/Makefile (-1 / +2 lines)
19		19
20	LIB_DEPENDS= xerces-c.26:${PORTSDIR}/textproc/xerces-c2 \	20	LIB_DEPENDS= xerces-c.26:${PORTSDIR}/textproc/xerces-c2 \
21	vorbis.3:${PORTSDIR}/audio/libvorbis \	21	vorbis.3:${PORTSDIR}/audio/libvorbis \
22	openal.0:${PORTSDIR}/audio/openal	22	openal.0:${PORTSDIR}/audio/openal \
		23	alut.0:${PORTSDIR}/audio/freealut
23	BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam	24	BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
24		25
25	USE_REINPLACE= yes	26	USE_REINPLACE= yes

Lines 17-23 Link Here

(-)games/torcs/Makefile (-1 / +2 lines)
17		17
18	BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib	18	BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
19	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	19	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
20	openal.0:${PORTSDIR}/audio/openal	20	openal.0:${PORTSDIR}/audio/openal \
		21	alut.0:${PORTSDIR}/audio/freealut
21	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash	22	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
22		23
23	USE_BZIP2= yes	24	USE_BZIP2= yes

Lines 18-29 Link Here

(-)games/chromium/Makefile (-1 / +5 lines)
18		18
19	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \	19	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
20	smpeg.1:${PORTSDIR}/multimedia/smpeg \	20	smpeg.1:${PORTSDIR}/multimedia/smpeg \
21	openal.0:${PORTSDIR}/audio/openal	21	openal.0:${PORTSDIR}/audio/openal \
		22	alut.0:${PORTSDIR}/audio/freealut
22		23
23	USE_GL= yes	24	USE_GL= yes
24	USE_GMAKE= yes	25	USE_GMAKE= yes
25	WRKSRC= ${WRKDIR}/Chromium-0.9	26	WRKSRC= ${WRKDIR}/Chromium-0.9
26		27
		28	post-patch:
		29	@${REINPLACE_CMD} -e 's\|-lopenal\|& -lalut\|g' ${WRKSRC}/configure
		30
27	do-install:	31	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin	32	${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
29	${MKDIR} ${DATADIR}/data	33	${MKDIR} ${DATADIR}/data




--- 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





SDL_CONFIG=sdl11-config
SMPEG_CONFIG=smpeg-config
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 -lalut" 
AL_CFLAGS="-I${LOCALBASE}/include"
PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\""


Lines 17-23 Link Here

(-)games/el/Makefile (-1 / +2 lines)
17		17
18	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \	18	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
19	vorbis.3:${PORTSDIR}/audio/libvorbis \	19	vorbis.3:${PORTSDIR}/audio/libvorbis \
20	cal3d.11:${PORTSDIR}/graphics/cal3d	20	cal3d.11:${PORTSDIR}/graphics/cal3d \
		21	alut.0:${PORTSDIR}/audio/freealut
21	RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip	22	RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
22		23
23	USE_GNOME= libxml2	24	USE_GNOME= libxml2




+CXXFLAGS=${CFLAGS} -fno-exceptions
 .else
-CFLAGS=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe
+CFLAGS+=-Wdeclaration-after-statement -ggdb -pipe
+CXXFLAGS=-ggdb -pipe -fno-exceptions
 .endif
-CFLAGS+=-march=i686 -DBSD -DELC
-CFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags`

+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 -lalut -lGLU -lvorbis -lvorbisfile -lm
 .if CAL3D
-SRCS+=cal3dwrap.c
+SRCS+=cal3d_wrapper.cpp

Lines 22-27 Link Here

(-)games/scorched3d/Makefile (+1 lines)
22	RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \	22	RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
23	wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \	23	wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
24	openal-config:${PORTSDIR}/audio/openal	24	openal-config:${PORTSDIR}/audio/openal
		25	LIB_DEPENDS= alut.0:${PORTSDIR}/audio/freealut
25		26
26	SCORCH_VERSION= 39.1	27	SCORCH_VERSION= 39.1
27		28




--- 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
      





BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
LIB_DEPENDS=	openal:${PORTSDIR}/audio/openal \
		physfs:${PORTSDIR}/devel/physfs \
		alut.0:${PORTSDIR}/audio/freealut

USE_X_PREFIX=	yes
USE_SDL=	sdl image

	@${REINPLACE_CMD} -e 's|SDL/||' \
		${WRKSRC}/src/trigger/main.cpp \
		${WRKSRC}/src/pengine/texture.cpp
	@${REINPLACE_CMD} -e 's|\$${prefix}/share|${DATADIR}|; \
		s|-lopenal|& -lalut|g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/Jamrules


Lines 19-25 Link Here

(-)games/warzone2100/Makefile (-2 / +5 lines)
19	mad.2:${PORTSDIR}/audio/libmad \	19	mad.2:${PORTSDIR}/audio/libmad \
20	ogg.5:${PORTSDIR}/audio/libogg \	20	ogg.5:${PORTSDIR}/audio/libogg \
21	openal.0:${PORTSDIR}/audio/openal \	21	openal.0:${PORTSDIR}/audio/openal \
22	vorbis.3:${PORTSDIR}/audio/libvorbis	22	vorbis.3:${PORTSDIR}/audio/libvorbis \
		23	alut.0:${PORTSDIR}/audio/freealut
23		24
24	USE_BZIP2= yes	25	USE_BZIP2= yes
25	USE_REINPLACE= yes	26	USE_REINPLACE= yes
Lines 43-49 Link Here
43	.for f in configure .c .h	44	.for f in configure .c .h
44	@${FIND} ${WRKSRC} -type f -name "${f}" -print0 \| \	45	@${FIND} ${WRKSRC} -type f -name "${f}" -print0 \| \
45	${XARGS} -0 ${REINPLACE_CMD} -e \	46	${XARGS} -0 ${REINPLACE_CMD} -e \
46	's\|$#include.$SDL/$SDL.$\|\1\2\|'	47	's\|$#include.$SDL/$SDL.$\|\1\2\| ; \
		48	s\|-lopenal \|&-lalut\|g ; \
		49	s\|"-lalut\|"-lopenal -lalut\|'
47	.endfor	50	.endfor
48		51
49	do-install:	52	do-install:




#

PORTNAME=	ember
PORTVERSION=	0.4.0
PORTREVISION=	0
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://amber.worldforge.org/ember/releases/stable/

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
LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
		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 \
		alut.0:${PORTSDIR}/audio/freealut

CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
USE_SDL=	sdl image

USE_GCC=	3.4
USE_X_PREFIX=	YES
USE_GNOME=	gnomehack
USE_BZIP2=	YES
CPPFLAGS=	-DBR_NO_MACROS

.include <bsd.port.pre.mk>

		 /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 \

Lines 1-3 Link Here

(-)games/ember/distinfo (-3 / +3 lines)
1	MD5 (ember-0.3.4.tar.gz) = 49b4181a415ba9a75b0315ae55ac52bc	1	MD5 (ember-0.4.0.tar.bz2) = c60cfe1227e2f0f810e5fa9b24f2096e
2	SHA256 (ember-0.3.4.tar.gz) = 864cdbeb5f9f89fc135bdd94d7359589e4f00d7b8278b5581d78dbbf7896243d	2	SHA256 (ember-0.4.0.tar.bz2) = 17780eec446b5e3959d657a61a85533f5072e00b629a1755ce51d75509fedd6a
3	SIZE (ember-0.3.4.tar.gz) = 1316934	3	SIZE (ember-0.4.0.tar.bz2) = 2275373




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/Chat.layout
share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.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

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/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/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/WindowsLookSkin.scheme
share/games/ember/media/packs/EmberCore.zip
share/games/ember/media/packs/OgreCore.zip
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/icons/worldforge/ember.png
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/COPYING

@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/packs
@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
@dirrm share/games/ember
@dirrm share/games




--- 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

 #if [ "$fullpath" = "" ]; then
 if [ "$test" = "." ]; then
 	path=${PWD}
@@ -56,7 +57,7 @@
 etcdir=${prefix}/etc/ember
 homedata=$HOME/.ember
 
-WFUT_JAR=$datadir/WFUT.jar
+WFUT_JAR=$bindir/WFUT.jar
 
 # Create dir if required 
 if [ ! -d $homedata ] ; then
@@ -96,5 +97,6 @@
-      cp $datadir/$WFUT_JAR $homedata
+      cp $bindir/$WFUT_JAR $homedata
 
     fi
   fi
@@ -124,5 +125,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

Lines 15-21 Link Here

(-)games/excido/Makefile (-1 / +2 lines)
15	COMMENT= A portable fast-paced 3d shooter	15	COMMENT= A portable fast-paced 3d shooter
16		16
17	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \	17	LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \
18	physfs-1.0.1:${PORTSDIR}/devel/physfs	18	physfs-1.0.1:${PORTSDIR}/devel/physfs \
		19	alut.0:${PORTSDIR}/audio/freealut
19		20
20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
21		22

Lines 7-13 Link Here

(-)games/excido/files/patch-Makefile (-1 / +1 lines)
7	#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2	7	#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2
8	OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}	8	OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}
9	-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU	9	-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU
10	+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU	10	+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU
11	#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	11	#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
12	-PREFIX=/usr/local	12	-PREFIX=/usr/local
13	BINDIR=$(PREFIX)/bin/	13	BINDIR=$(PREFIX)/bin/




LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
		jpeg.9:${PORTSDIR}/graphics/jpeg \
		aa.1:${PORTSDIR}/graphics/aalib \
		openal.0:${PORTSDIR}/audio/openal \
		alut.0:${PORTSDIR}/audio/freealut

USE_X_PREFIX=	yes
USE_BZIP2=	yes

.endif

pre-configure:
	@${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g; \
		s,86\*),86\*|amd64|ia64),' ${WRKSRC}/configure

post-configure:
.if defined(NOPORTDOCS)

Return to bug 95192

Lines 6-29 Link Here

(-)audio/openal/Makefile (-14 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= openal	8	PORTNAME= openal
9	PORTVERSION= 20050401	9	PORTVERSION= 0.0.8
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://math.missouristate.edu/~erik/files/fbsd/\	11	MASTER_SITES= http://openal.org/openal_webstf/downloads/
13	http://www.smluc.org/~erik/files/fbsd/
14		12
15	MAINTAINER= erik@smluc.org	13	MAINTAINER= erik@smluc.org
16	COMMENT= A 3D positional spatialized sound library	14	COMMENT= A 3D positional spatialized sound library
17		15
18	INFO= openal
19
20	WRKSRC= ${WRKDIR}/${DISTNAME}/linux
21	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
22	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	17	CONFIGURE_ARGS= --program-transform-name=''
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
24	CONFIGURE_ARGS= --enable-capture
25	USE_GMAKE= yes	18	USE_GMAKE= yes
26	USE_GNOME= pkgconfig	19	USE_GNOME= pkgconfig gnomehack
27	WANT_SDL= yes	20	WANT_SDL= yes
28	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
29	USE_REINPLACE= yes	22	USE_REINPLACE= yes
Lines 68-78 Link Here
68		62
69	post-patch:	63	post-patch:
70	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/; \	64	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/; \
		65	s\|#define _POSIX_C_SOURCE 199309\|/\&\/\|; \
		66	s/x86_64\/amd64\ \| \ia64\/g; \
71	/CPPFLAGS=/ d' ${WRKSRC}/configure	67	/CPPFLAGS=/ d' ${WRKSRC}/configure
72	@${REINPLACE_CMD} -e '/#include/ s\|SDL/\|\|' \	68	@${REINPLACE_CMD} -e '/#include/ s\|SDL/\|\|' \
73	${WRKSRC}/src/extensions/al_ext_mp3.c	69	${WRKSRC}/src/extensions/al_ext_mp3.c
74		70	@${REINPLACE_CMD} -e 's\|"mixaudio16_mmx_prk.h"\|"arch/i386/mixaudio16_mmx_prk.h"\|' \
75	post-install:	71	${WRKSRC}/src/mixaudio16.h
76	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
77		72
78	.include <bsd.port.post.mk>	73	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)audio/openal/pkg-plist (-6 / +1 lines)
1	bin/openal-config	1	bin/openal-config
2	include/AL/al.h	2	include/AL/al.h
3	include/AL/alc.h	3	include/AL/alc.h
4	include/AL/alctypes.h
5	include/AL/alext.h	4	include/AL/alext.h
6	include/AL/alexttypes.h
7	include/AL/altypes.h
8	include/AL/alut.h
9	include/AL/aluttypes.h
10	lib/libopenal.a	5	lib/libopenal.a
		6	lib/libopenal.la
11	lib/libopenal.so	7	lib/libopenal.so
12	lib/libopenal.so.0	8	lib/libopenal.so.0
13	lib/libopenal.so.0.0.8
14	libdata/pkgconfig/openal.pc	9	libdata/pkgconfig/openal.pc
15	@dirrm include/AL	10	@dirrm include/AL

Added Link Here

(-)games/atr3d/files/patch-sound.cpp (+21 lines)
1	--- sound.cpp.orig Wed Mar 29 15:09:51 2006
2	+++ sound.cpp Wed Mar 29 15:11:11 2006
3	@@ -288,6 +288,7 @@
4	{
5	int i;
6	char filename[1000];
7	+ ALboolean loop;
8
9	for (i=0; i<NUM_SOUNDS; i++) {
10	#ifdef WINDOWS
11	@@ -296,8 +297,8 @@
12	sprintf(filename, "%s/atr3d/sounds/%d.wav", DATADIR, i);
13	#endif
14
15	- alutLoadWAV(filename, &Wavs[i].wave, &Wavs[i].format,
16	- &Wavs[i].size, &Wavs[i].bits, &Wavs[i].freq);
17	+ alutLoadWAVFile((ALbyte*)filename, &Wavs[i].format, &Wavs[i].wave,
18	+ &Wavs[i].size, &Wavs[i].freq, &loop);
19	}
20	}
21	#endif

Added Link Here

(-)games/chromium/files/patch-src-AudioOpenAL.cpp (+76 lines)
1	--- src/AudioOpenAL.cpp.orig Thu Mar 30 15:34:34 2006
2	+++ src/AudioOpenAL.cpp Thu Mar 30 16:32:00 2006
3	@@ -153,13 +153,8 @@
4
5	checkError("AudioOpenAL::~Audio()");
6
7	- #ifdef _WIN32
8	if(context_id)
9	alcDestroyContext((ALCcontext*)context_id);
10	- #else
11	- if(context_id)
12	- alcDestroyContext(context_id);
13	- #endif
14
15	fprintf(stderr, "done.\n");
16	}
17	@@ -200,7 +195,7 @@
18	ALCdevice *dev;
19	dev = alcOpenDevice( NULL );
20	context_id = alcCreateContext(dev, NULL);
21	- alcMakeContextCurrent(context_id);
22	+ alcMakeContextCurrent((ALCcontext*)context_id);
23	#endif
24	#endif
25
26	@@ -310,7 +305,7 @@
27
28	//-- check AttenuationScale extension
29	alAttenuationScale = (void (*)(ALfloat param))
30	- alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
31	+ alGetProcAddress((ALchar *)"alAttenuationScale_LOKI");
32	if(alAttenuationScale == NULL)
33	fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
34	else
35	@@ -318,9 +313,9 @@
36
37	//-- check Audio Channel extension
38	alcGetAudioChannel = (float (*)(ALuint channel))
39	- alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
40	+ alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI");
41	alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
42	- alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
43	+ alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI");
44	#ifdef CD_VOLUME
45	if(alcGetAudioChannel)
46	origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
47	@@ -328,10 +323,10 @@
48
49	//-- check MP3 extension
50	alutLoadMP3 = (ALboolean ()(ALuint, ALvoid , ALint))
51	- alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
52	+ alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI");
53	//-- check Ogg/Vorbis extension
54	alutLoadVorbis = (ALboolean ()(ALuint, ALvoid , ALint))
55	- alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
56	+ alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI");
57
58	#endif //_WIN32
59	}
60	@@ -471,6 +466,7 @@
61	ALsizei size, freq, bits;
62	ALenum format;
63	ALvoid *data;
64	+ ALboolean loop;
65
66	for(i = 0; i < NumSoundTypes; i++)
67	{
68	@@ -481,7 +477,7 @@
69	else
70	{
71	#ifndef _WIN32
72	- alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq);
73	+ alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop);
74	alBufferData (buffer[i], format, data, size, freq);
75	free(data);
76	#else //_WIN32

Lines 1-13 Link Here

(-)games/chromium/scripts/configure (-2 / +2 lines)
1		1
2	SDL_CONFIG=sdl11-config	2	SDL_CONFIG=sdl11-config
3	SMPEG_CONFIG=smpeg-config	3	SMPEG_CONFIG=smpeg-config
4	OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg--enable-vorbis"	4	OPENAL_CONFIG_OPTS="./configure --enable-sdl --enable-smpeg --enable-vorbis"
5	SDL_LIBS="\`\$(SDL_CONFIG) --libs\`"	5	SDL_LIBS="\`\$(SDL_CONFIG) --libs\`"
6	SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL"	6	SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL"
7	SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`"	7	SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`"
8	SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`"	8	SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`"
9	GL_LIBS="-lglpng -lGL -lGLU -lm"	9	GL_LIBS="-lglpng -lGL -lGLU -lm"
10	AL_LIBS="-L${LOCALBASE}/lib -lopenal"	10	AL_LIBS="-L${LOCALBASE}/lib -lopenal -lalut"
11	AL_CFLAGS="-I${LOCALBASE}/include"	11	AL_CFLAGS="-I${LOCALBASE}/include"
12	PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\""	12	PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\""
13		13

Lines 47-54 Link Here

(-)games/el/files/patch-Makefile.bsd (-3 / +4 lines)
47	+CXXFLAGS=${CFLAGS} -fno-exceptions	47	+CXXFLAGS=${CFLAGS} -fno-exceptions
48	.else	48	.else
49	-CFLAGS=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe	49	-CFLAGS=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe
50	+CFLAGS+=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe	50	+CFLAGS+=-Wdeclaration-after-statement -ggdb -pipe
51	+CXXFLAGS=-Wall -Wno-deprecated -Werror -ggdb -pipe -fno-exceptions	51	+CXXFLAGS=-ggdb -pipe -fno-exceptions
52	.endif	52	.endif
53	-CFLAGS+=-march=i686 -DBSD -DELC	53	-CFLAGS+=-march=i686 -DBSD -DELC
54	-CFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags`	54	-CFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags`
Lines 59-65 Link Here
59	+CFLAGS+=${CPPFLAGS}	59	+CFLAGS+=${CPPFLAGS}
60	+CXXFLAGS+=${CPPFLAGS}	60	+CXXFLAGS+=${CPPFLAGS}
61	LDFLAGS+=-L${X11BASE}/lib -lGL `${SDL_CONFIG} --libs` `${LIBXML2_CONFIG} --libs`	61	LDFLAGS+=-L${X11BASE}/lib -lGL `${SDL_CONFIG} --libs` `${LIBXML2_CONFIG} --libs`
62	LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lGLU -lvorbis -lvorbisfile -lm	62	-LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lGLU -lvorbis -lvorbisfile -lm
		63	+LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lalut -lGLU -lvorbis -lvorbisfile -lm
63	.if CAL3D	64	.if CAL3D
64	-SRCS+=cal3dwrap.c	65	-SRCS+=cal3dwrap.c
65	+SRCS+=cal3d_wrapper.cpp	66	+SRCS+=cal3d_wrapper.cpp

Lines 1-6 Link Here

(-)games/scorched3d/files/patch-configure.ac (-3 / +26 lines)
1	--- configure.ac.orig Fri Oct 14 10:18:06 2005	1	--- configure.ac.orig Mon Jul 25 19:06:13 2005
2	+++ configure.ac Fri Oct 14 10:19:33 2005	2	+++ configure.ac Wed Mar 29 14:07:50 2006
3	@@ -248,13 +248,13 @@	3	@@ -103,6 +103,7 @@
		4	, enable_openaltest=yes)
		5	AC_MSG_CHECKING(for OpenAL)
		6	AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
		7	+AC_PATH_PROG(ALUT_CONFIG, freealut-config, no)
		8	have_openal=yes
		9	if test x$OPENAL_CONFIG = xno; then
		10	echo "*** The openal-config script installed by OpenAL could not be found"
		11	@@ -114,11 +115,11 @@
		12	if test x"$use_static_openal" = x"yes"; then
		13	LIBS="$LIBS /usr/local/lib/libopenal.a"
		14	else
		15	- LIBS="$LIBS `$OPENAL_CONFIG --libs`"
		16	+ LIBS="$LIBS `$OPENAL_CONFIG --libs` `$ALUT_CONFIG --libs`"
		17	fi
		18
		19	- CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"
		20	- CXXFLAGS="$CXXFLAGS `$OPENAL_CONFIG --cflags`"
		21	+ CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags` `$ALUT_CONFIG --cflags`"
		22	+ CXXFLAGS="$CXXFLAGS `$OPENAL_CONFIG --cflags` `$ALUT_CONFIG --cflags`"
		23	fi
		24
		25	AC_MSG_CHECKING(for OpenAL compilation)
		26	@@ -248,13 +249,13 @@
4	])	27	])
5	fi	28	fi
6		29

Lines 18-24 Link Here

(-)games/trigger/Makefile (-2 / +4 lines)
18		18
19	BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam	19	BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
20	LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \	20	LIB_DEPENDS= openal:${PORTSDIR}/audio/openal \
21	physfs:${PORTSDIR}/devel/physfs	21	physfs:${PORTSDIR}/devel/physfs \
		22	alut.0:${PORTSDIR}/audio/freealut
22		23
23	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
24	USE_SDL= sdl image	25	USE_SDL= sdl image
Lines 42-48 Link Here
42	@${REINPLACE_CMD} -e 's\|SDL/\|\|' \	43	@${REINPLACE_CMD} -e 's\|SDL/\|\|' \
43	${WRKSRC}/src/trigger/main.cpp \	44	${WRKSRC}/src/trigger/main.cpp \
44	${WRKSRC}/src/pengine/texture.cpp	45	${WRKSRC}/src/pengine/texture.cpp
45	@${REINPLACE_CMD} -e 's\|\$${prefix}/share\|${DATADIR}\|' \	46	@${REINPLACE_CMD} -e 's\|\$${prefix}/share\|${DATADIR}\|; \
		47	s\|-lopenal\|& -lalut\|g' \
46	${WRKSRC}/configure	48	${WRKSRC}/configure
47	@${REINPLACE_CMD} -e 's\|-O3\|\|' ${WRKSRC}/Jamrules	49	@${REINPLACE_CMD} -e 's\|-O3\|\|' ${WRKSRC}/Jamrules
48		50

Lines 6-13 Link Here

(-)games/ember/Makefile (-4 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= ember	8	PORTNAME= ember
9	PORTVERSION= 0.3.4	9	PORTVERSION= 0.4.0
10	PORTREVISION= 2	10	PORTREVISION= 0
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
13	http://amber.worldforge.org/ember/releases/stable/	13	http://amber.worldforge.org/ember/releases/stable/
Lines 16-28 Link Here
16	MAINTAINER= oliver@FreeBSD.org	16	MAINTAINER= oliver@FreeBSD.org
17	COMMENT= Ember is a WorldForge 3d client using the OGRE 3d library	17	COMMENT= Ember is a WorldForge 3d client using the OGRE 3d library
18		18
19	RUN_DEPENDS= ${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut	19	RUN_DEPENDS= ${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
20	LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \	20	LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
21	OgreMain.9:${PORTSDIR}/graphics/ogre3d \	21	OgreMain.10:${PORTSDIR}/graphics/ogre3d \
22	eris-1.3:${PORTSDIR}/devel/eris \	22	eris-1.3:${PORTSDIR}/devel/eris \
23	varconf-1.0.6:${PORTSDIR}/devel/varconf \	23	varconf-1.0.6:${PORTSDIR}/devel/varconf \
24	mercator-0.2.4:${PORTSDIR}/devel/mercator \	24	mercator-0.2.4:${PORTSDIR}/devel/mercator \
25	openal.0:${PORTSDIR}/audio/openal	25	openal.0:${PORTSDIR}/audio/openal \
		26	alut.0:${PORTSDIR}/audio/freealut
26		27
27	CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit	28	CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
28	USE_SDL= sdl image	29	USE_SDL= sdl image
Lines 32-37 Link Here
32	USE_GCC= 3.4	33	USE_GCC= 3.4
33	USE_X_PREFIX= YES	34	USE_X_PREFIX= YES
34	USE_GNOME= gnomehack	35	USE_GNOME= gnomehack
		36	USE_BZIP2= YES
35	CPPFLAGS= -DBR_NO_MACROS	37	CPPFLAGS= -DBR_NO_MACROS
36		38
37	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
Lines 59-64 Link Here
59	/Plugin=Plugin_CgProgramManager.so/d; \	61	/Plugin=Plugin_CgProgramManager.so/d; \
60	s\|/usr/lib/OGRE\|${X11BASE}/lib/OGRE\|' \	62	s\|/usr/lib/OGRE\|${X11BASE}/lib/OGRE\|' \
61	${WRKSRC}/src/components/ogre/plugins.cfg	63	${WRKSRC}/src/components/ogre/plugins.cfg
		64	@${REINPLACE_CMD} -e 's\|/altypes\.h\|/al\.h\|' \
		65	${WRKSRC}/src/services/sound/SoundService.h
		66	@${REINPLACE_CMD} -e 's\|@LDFLAGS@\|& -lopenal -lalut\|' \
		67	${WRKSRC}/src/components/ogre/Makefile.in
62	.if ${OSVERSION} < 500000	68	.if ${OSVERSION} < 500000
63	@${REINPLACE_CMD} -e 's\|lrintf\|(long int)rintf\|g' \	69	@${REINPLACE_CMD} -e 's\|lrintf\|(long int)rintf\|g' \
64	${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \	70	${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \

Lines 20-44 Link Here

(-)games/ember/pkg-plist (-20 / +38 lines)
20	share/games/ember/jesus/modelmappings/general.modelmapping.xml	20	share/games/ember/jesus/modelmappings/general.modelmapping.xml
21	share/games/ember/media/gui/CEGUIConfig.xsd	21	share/games/ember/media/gui/CEGUIConfig.xsd
22	share/games/ember/media/gui/Font.xsd	22	share/games/ember/media/gui/Font.xsd
		23	share/games/ember/media/gui/Falagard.xsd
23	share/games/ember/media/gui/GUILayout.xsd	24	share/games/ember/media/gui/GUILayout.xsd
24	share/games/ember/media/gui/GUIScheme.xsd	25	share/games/ember/media/gui/GUIScheme.xsd
25	share/games/ember/media/gui/Imageset.xsd	26	share/games/ember/media/gui/Imageset.xsd
26	share/games/ember/media/gui/cegui/datafiles/configs/cegui.config	27	share/games/ember/media/gui/cegui/datafiles/configs/cegui.config
27	share/games/ember/media/gui/cegui/datafiles/fonts/Font.xsd	28	share/games/ember/media/gui/cegui/datafiles/fonts/Font.xsd
		29	share/games/ember/media/gui/cegui/datafiles/fonts/Vera.ttf
28	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml	30	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml
29	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml	31	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml
30	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml	32	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml
31	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf	33	share/games/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf
		34	share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-14.xml
		35	share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-10.xml
		36	share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-8.xml
		37	share/games/ember/media/gui/cegui/datafiles/fonts/
32	share/games/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd	38	share/games/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd
33	share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.imageset	39	share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.imageset
34	share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLookMouse.imageset
35	share/games/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset	40	share/games/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset
36	share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset	41	share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset
37	share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset	42	share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset
38	share/games/ember/media/gui/cegui/datafiles/layouts/ChatWidget.xml	43	share/games/ember/media/gui/cegui/datafiles/layouts/Chat.layout
39	share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml	44	share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml
40	share/games/ember/media/gui/cegui/datafiles/layouts/DebugWidget.xml	45	share/games/ember/media/gui/cegui/datafiles/layouts/Debug.layout
41	share/games/ember/media/gui/cegui/datafiles/layouts/GiveWidget.xml	46	share/games/ember/media/gui/cegui/datafiles/layouts/Demo8.layout
		47	share/games/ember/media/gui/cegui/datafiles/layouts/EntityEditWidget.xml
		48	share/games/ember/media/gui/cegui/datafiles/layouts/EntityPicker.layout
		49	share/games/ember/media/gui/cegui/datafiles/layouts/Give.layout
42	share/games/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd	50	share/games/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd
43	share/games/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml	51	share/games/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml
44	share/games/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml	52	share/games/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml
Lines 49-72 Link Here
49	share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget	57	share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget
50	share/games/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml	58	share/games/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml
51	share/games/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget	59	share/games/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget
52	share/games/ember/media/gui/cegui/datafiles/layouts/Performance.widget	60	share/games/ember/media/gui/cegui/datafiles/layouts/ModelEdit.layout
		61	share/games/ember/media/gui/cegui/datafiles/layouts/Performance.layout
53	share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget	62	share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget
54	share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowserWidget.xml	63	share/games/ember/media/gui/cegui/datafiles/layouts/ScriptEdit.layout
		64	share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowser.layout
55	share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml	65	share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml
		66	share/games/ember/media/gui/cegui/datafiles/lua_scripts/Bootstrap.lua
		67	share/games/ember/media/gui/cegui/datafiles/lua_scripts/Chat.lua
		68	share/games/ember/media/gui/cegui/datafiles/lua_scripts/Debug.lua
		69	share/games/ember/media/gui/cegui/datafiles/lua_scripts/demo8.lua
		70	share/games/ember/media/gui/cegui/datafiles/lua_scripts/EntityPicker.lua
		71	share/games/ember/media/gui/cegui/datafiles/lua_scripts/Give.lua
		72	share/games/ember/media/gui/cegui/datafiles/lua_scripts/ModelEdit.lua
		73	share/games/ember/media/gui/cegui/datafiles/lua_scripts/Performance.lua
		74	share/games/ember/media/gui/cegui/datafiles/lua_scripts/ServerBrowser.lua
		75	share/games/ember/media/gui/cegui/datafiles/lua_scripts/ScriptEdit.lua
		76	share/games/ember/media/gui/cegui/datafiles/imagesets/EmberLook.imageset
		77	share/games/ember/media/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel
		78	share/games/ember/media/gui/cegui/datafiles/looknfeel/Vanilla.looknfeel
		79	share/games/ember/media/gui/cegui/datafiles/looknfeel/WindowsLook.looknfeel
		80	share/games/ember/media/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel
		81	share/games/ember/media/gui/cegui/datafiles/schemes/EmberLookSkin.scheme
56	share/games/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd	82	share/games/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd
57	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme	83	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme
		84	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookSkin.scheme
58	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme	85	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
59	share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgets.scheme
60	share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme	86	share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme
61	share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookWidgets.scheme	87	share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookSkin.scheme
62	share/games/ember/media/modeldefinitions/buildingelements.modeldef.xml	88	share/games/ember/media/packs/EmberCore.zip
63	share/games/ember/media/modeldefinitions/characters.modeldef.xml	89	share/games/ember/media/packs/OgreCore.zip
64	share/games/ember/media/modeldefinitions/creatures.modeldef.xml
65	share/games/ember/media/modeldefinitions/environment.modeldef.xml
66	share/games/ember/media/modeldefinitions/items.modeldef.xml
67	share/games/ember/media/modeldefinitions/placeholder.modeldef.xml
68	share/games/ember/media/modeldefinitions/trees/dynamic/trees.modeldef.xml
69	share/games/ember/media/modeldefinitions/trees/pregenerated/trees.modeldef.xml
70	share/icons/worldforge/ember.png	90	share/icons/worldforge/ember.png
71	%%PORTDOCS%%%%DOCSDIR%%/README	91	%%PORTDOCS%%%%DOCSDIR%%/README
72	%%PORTDOCS%%%%DOCSDIR%%/COPYING	92	%%PORTDOCS%%%%DOCSDIR%%/COPYING
Lines 85-99 Link Here
85	@dirrm share/games/ember/media/gui/cegui/datafiles/fonts	105	@dirrm share/games/ember/media/gui/cegui/datafiles/fonts
86	@dirrm share/games/ember/media/gui/cegui/datafiles/imagesets	106	@dirrm share/games/ember/media/gui/cegui/datafiles/imagesets
87	@dirrm share/games/ember/media/gui/cegui/datafiles/layouts	107	@dirrm share/games/ember/media/gui/cegui/datafiles/layouts
		108	@dirrm share/games/ember/media/gui/cegui/datafiles/looknfeel
88	@dirrm share/games/ember/media/gui/cegui/datafiles/lua_scripts	109	@dirrm share/games/ember/media/gui/cegui/datafiles/lua_scripts
89	@dirrm share/games/ember/media/gui/cegui/datafiles/schemes	110	@dirrm share/games/ember/media/gui/cegui/datafiles/schemes
90	@dirrm share/games/ember/media/gui/cegui/datafiles	111	@dirrm share/games/ember/media/gui/cegui/datafiles
91	@dirrm share/games/ember/media/gui/cegui	112	@dirrm share/games/ember/media/gui/cegui
92	@dirrm share/games/ember/media/gui	113	@dirrm share/games/ember/media/gui
93	@dirrm share/games/ember/media/modeldefinitions/trees/dynamic	114	@dirrm share/games/ember/media/packs
94	@dirrm share/games/ember/media/modeldefinitions/trees/pregenerated
95	@dirrm share/games/ember/media/modeldefinitions/trees
96	@dirrm share/games/ember/media/modeldefinitions
97	@dirrm share/games/ember/media	115	@dirrm share/games/ember/media
98	@dirrm share/games/ember	116	@dirrm share/games/ember
99	@dirrm share/games	117	@dirrm share/games

Lines 1-5 Link Here

(-)games/ember/files/patch-ember (-18 / +12 lines)
1	--- ember.orig Tue Sep 27 22:04:31 2005	1	--- ember.orig Mon Feb 13 00:33:13 2006
2	+++ ember Wed Oct 12 17:32:30 2005	2	+++ ember Wed Mar 8 06:28:31 2006
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/bin/bash	4	-#!/bin/bash
5	+#!/bin/sh	5	+#!/bin/sh
Lines 18-39 Link Here
18	#if [ "$fullpath" = "" ]; then	18	#if [ "$fullpath" = "" ]; then
19	if [ "$test" = "." ]; then	19	if [ "$test" = "." ]; then
20	path=${PWD}	20	path=${PWD}
21	@@ -77,12 +78,12 @@	21	@@ -56,7 +57,7 @@
22	# See if Updater exists in home dir	22	etcdir=${prefix}/etc/ember
23	if [ ! -e $homedata/$WFUT_JAR ] ; then	23	homedata=$HOME/.ember
24	# Check to see if its in the install dir	24
25	- if [ -e $datadir/$WFUT_JAR ] ; then	25	-WFUT_JAR=$datadir/WFUT.jar
26	+ if [ -e $bindir/$WFUT_JAR ] ; then	26	+WFUT_JAR=$bindir/WFUT.jar
27	# Install into home dir	27
28	echo "Installing Updater"	28	# Create dir if required
29		29	if [ ! -d $homedata ] ; then
30	# Copy WFUT to home dir	30	@@ -96,5 +97,6 @@
31	- cp $datadir/$WFUT_JAR $homedata
32	+ cp $bindir/$WFUT_JAR $homedata
33
34	fi
35	fi
36	@@ -124,5 +125,6 @@
37	# Execute real ember binary	31	# Execute real ember binary
38	echo "Starting Ember...."	32	echo "Starting Ember...."
39	#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	33	#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

Lines 20-26 Link Here

(-)graphics/crystalspace/Makefile (-2 / +4 lines)
20	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	20	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
21	jpeg.9:${PORTSDIR}/graphics/jpeg \	21	jpeg.9:${PORTSDIR}/graphics/jpeg \
22	aa.1:${PORTSDIR}/graphics/aalib \	22	aa.1:${PORTSDIR}/graphics/aalib \
23	openal.0:${PORTSDIR}/audio/openal	23	openal.0:${PORTSDIR}/audio/openal \
		24	alut.0:${PORTSDIR}/audio/freealut
24		25
25	USE_X_PREFIX= yes	26	USE_X_PREFIX= yes
26	USE_BZIP2= yes	27	USE_BZIP2= yes
Lines 156-162 Link Here
156	.endif	157	.endif
157		158
158	pre-configure:	159	pre-configure:
159	@${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g' ${WRKSRC}/configure	160	@${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g; \
		161	s,86\),86\\|amd64\|ia64),' ${WRKSRC}/configure
160		162
161	post-configure:	163	post-configure:
162	.if defined(NOPORTDOCS)	164	.if defined(NOPORTDOCS)