update to openal 20060211 [1]

fix dependant ports [2] PR: ports/96172 [1] ports/95192 [2] Submitted by: maintainer [1] oliver [2] Approved by: maintainer
author: oliver <oliver@FreeBSD.org> 2006-04-23 18:14:30 +0800
committer: oliver <oliver@FreeBSD.org> 2006-04-23 18:14:30 +0800
commit: a1afb15bc3ca23d864c38bb5aa46770398e443e0 (patch)
tree: 61d0b5cff39b644111399fd6d81cc02dadc4b0ed
parent: f85495f88f996a09638af8e00a215073a46b55ad (diff)
download: freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.tar.gz
freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.tar.zst
freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.zip
33 files changed, 359 insertions, 152 deletions
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index a2c4fb2706e5..586ea1a36da9 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 b8938570c471..5e0d016e5884 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 000000000000..8ee8e3c19c6b
--- /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 000000000000..ad1f5d1bb147
--- /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 ce94d0ee8101..000000000000
--- 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 8a64e49c5dfa..bb4ccc340fa8 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 2280f6db21fa..d226408b9ebe 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 7cef850a7d87..47a6f655ea73 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 851837b46b5c..934f53c31063 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 000000000000..22f8945687d3
--- /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 bb7585fe3dfb..2703dedbbeab 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 000000000000..5965504f08a7
--- /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 //_
author	oliver <oliver@FreeBSD.org>	2006-04-23 18:14:30 +0800
committer	oliver <oliver@FreeBSD.org>	2006-04-23 18:14:30 +0800
commit	a1afb15bc3ca23d864c38bb5aa46770398e443e0 (patch)
tree	61d0b5cff39b644111399fd6d81cc02dadc4b0ed
parent	f85495f88f996a09638af8e00a215073a46b55ad (diff)
download	freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.tar.gz freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.tar.zst freebsd-ports-gnome-a1afb15bc3ca23d864c38bb5aa46770398e443e0.zip