From olivleh1@kartoffel.salatschuessel.net  Sat Apr  1 09:42:03 2006
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4BB4016A401;
	Sat,  1 Apr 2006 09:42:03 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (p5084D973.dip.t-dialin.net [80.132.217.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C945B43D46;
	Sat,  1 Apr 2006 09:41:59 +0000 (GMT)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.13.4/8.13.4) with ESMTP id k319fpqN038350;
	Sat, 1 Apr 2006 11:41:51 +0200 (CEST)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.13.4/8.13.3/Submit) id k319fo3G038349;
	Sat, 1 Apr 2006 11:41:50 +0200 (CEST)
	(envelope-from olivleh1)
Message-Id: <200604010941.k319fo3G038349@kartoffel.salatschuessel.net>
Date: Sat, 1 Apr 2006 11:41:50 +0200 (CEST)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: update audio/openal + dependant ports
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95192
>Category:       ports
>Synopsis:       update audio/openal + dependant ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    oliver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 01 09:50:15 GMT 2006
>Closed-Date:    Sun Apr 23 13:50:18 GMT 2006
>Last-Modified:  Sun Apr 23 13:50:18 GMT 2006
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Fri Feb 24 09:31:27 CET 2006 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.1/usr/src/sys/KARTOFFEL amd64


>Description:
	update audio/openal to 0.0.8
	See PR ports/95193 for the new port audio/freealut
	Involved maintainers:
		erik@smluc.org		OK	audio/openal			remove files/patch-src_arch_bsd_bsd__dsp.c after patch!
		acardenas@bsd.org.pe	OK	audio/py-openal
					OK	games/glest
					OK	games/excido
					OK	graphics/crystalspace
		guy@device.dyndns.org		games/scorched3d
		jylefort@FreeBSD.org		games/simgear
						games/trigger
		alejandro@varnet.biz	OK	games/warzone2100
		
>How-To-Repeat:
>Fix:


--- openal.diff begins here ---
Index: audio/openal/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/openal/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- audio/openal/Makefile	24 Nov 2005 06:49:56 -0000	1.31
+++ audio/openal/Makefile	1 Apr 2006 09:20:42 -0000
@@ -6,24 +6,17 @@
 #
 
 PORTNAME=	openal
-PORTVERSION=	20050401
-PORTREVISION=	1
+PORTVERSION=	0.0.8
 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/
 
 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
+CONFIGURE_ARGS=	--program-transform-name=''
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
+USE_GNOME=	pkgconfig gnomehack
 WANT_SDL=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
@@ -68,11 +62,12 @@
 
 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
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
+	@${REINPLACE_CMD} -e 's|"mixaudio16_mmx_prk.h"|"arch/i386/mixaudio16_mmx_prk.h"|' \
+		${WRKSRC}/src/mixaudio16.h
 
 .include <bsd.port.post.mk>
Index: audio/openal/distinfo
===================================================================
RCS file: /home/pcvs/ports/audio/openal/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- audio/openal/distinfo	22 Jan 2006 08:12:55 -0000	1.14
+++ audio/openal/distinfo	1 Apr 2006 09:20:42 -0000
@@ -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
--- /dev/null	Sat Apr  1 11:11:00 2006
+++ audio/openal/files/patch-src-backends-alc_backend_bsd.c	Tue Mar 28 20:02:19 2006
@@ -0,0 +1,10 @@
+--- src/backends/alc_backend_bsd.c.orig	Tue Mar 28 20:00:39 2006
++++ src/backends/alc_backend_bsd.c	Tue Mar 28 20:00:52 2006
+@@ -10,6 +10,7 @@
+ #include "al_siteconfig.h"
+ 
+ #include <AL/al.h>
++#include <AL/alext.h>
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <sys/soundcard.h>
Index: audio/openal/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/openal/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- audio/openal/pkg-plist	10 Feb 2005 00:26:14 -0000	1.6
+++ audio/openal/pkg-plist	1 Apr 2006 09:20:42 -0000
@@ -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
Index: audio/py-openal/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/py-openal/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- audio/py-openal/Makefile	18 Oct 2005 09:24:00 -0000	1.2
+++ audio/py-openal/Makefile	1 Apr 2006 09:20:43 -0000
@@ -15,7 +15,8 @@
 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
Index: devel/simgear/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/simgear/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/simgear/Makefile	7 Dec 2005 10:13:00 -0000	1.17
+++ devel/simgear/Makefile	1 Apr 2006 09:20:43 -0000
@@ -18,7 +18,8 @@
 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_REINPLACE=	yes
Index: games/atr3d/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/atr3d/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- games/atr3d/Makefile	12 Jan 2006 12:54:12 -0000	1.14
+++ games/atr3d/Makefile	1 Apr 2006 09:20:43 -0000
@@ -17,7 +17,8 @@
 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 @@
 	@${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
--- /dev/null	Sat Apr  1 11:11:00 2006
+++ games/atr3d/files/patch-sound.cpp	Wed Mar 29 15:11:31 2006
@@ -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
Index: games/glest/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/glest/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- games/glest/Makefile	2 Jan 2006 21:51:10 -0000	1.3
+++ games/glest/Makefile	1 Apr 2006 09:20:44 -0000
@@ -19,7 +19,8 @@
 
 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
Index: games/torcs/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/torcs/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- games/torcs/Makefile	16 Jan 2006 00:07:02 -0000	1.21
+++ games/torcs/Makefile	1 Apr 2006 09:20:44 -0000
@@ -17,7 +17,8 @@
 
 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
Index: games/chromium/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/chromium/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- games/chromium/Makefile	26 Dec 2004 18:27:43 -0000	1.8
+++ games/chromium/Makefile	1 Apr 2006 09:20:44 -0000
@@ -18,12 +18,16 @@
 
 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
--- /dev/null	Sat Apr  1 11:11:00 2006
+++ games/chromium/files/patch-src-AudioOpenAL.cpp	Thu Mar 30 16:32:13 2006
@@ -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
Index: games/chromium/scripts/configure
===================================================================
RCS file: /home/pcvs/ports/games/chromium/scripts/configure,v
retrieving revision 1.1
diff -u -r1.1 configure
--- games/chromium/scripts/configure	18 Dec 2003 08:55:25 -0000	1.1
+++ games/chromium/scripts/configure	1 Apr 2006 09:20:44 -0000
@@ -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\\\""
 
Index: games/el/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/el/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- games/el/Makefile	20 Jan 2006 00:08:22 -0000	1.5
+++ games/el/Makefile	1 Apr 2006 09:20:45 -0000
@@ -17,7 +17,8 @@
 
 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
Index: games/el/files/patch-Makefile.bsd
===================================================================
RCS file: /home/pcvs/ports/games/el/files/patch-Makefile.bsd,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.bsd
--- games/el/files/patch-Makefile.bsd	22 Dec 2005 13:09:29 -0000	1.2
+++ games/el/files/patch-Makefile.bsd	1 Apr 2006 09:20:45 -0000
@@ -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
Index: games/scorched3d/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scorched3d/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- games/scorched3d/Makefile	15 Nov 2005 06:49:20 -0000	1.26
+++ games/scorched3d/Makefile	1 Apr 2006 09:20:45 -0000
@@ -22,6 +22,7 @@
 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
 
Index: games/scorched3d/files/patch-configure.ac
===================================================================
RCS file: /home/pcvs/ports/games/scorched3d/files/patch-configure.ac,v
retrieving revision 1.6
diff -u -r1.6 patch-configure.ac
--- games/scorched3d/files/patch-configure.ac	14 Oct 2005 10:48:08 -0000	1.6
+++ games/scorched3d/files/patch-configure.ac	1 Apr 2006 09:20:45 -0000
@@ -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
       
Index: games/trigger/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/trigger/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- games/trigger/Makefile	24 Jul 2005 13:02:42 -0000	1.3
+++ games/trigger/Makefile	1 Apr 2006 09:20:45 -0000
@@ -18,7 +18,8 @@
 
 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 @@
 	@${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
 
Index: games/warzone2100/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/warzone2100/Makefile	23 Sep 2005 08:44:47 -0000	1.2
+++ games/warzone2100/Makefile	1 Apr 2006 09:20:45 -0000
@@ -19,7 +19,8 @@
 		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 @@
 .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:
Index: games/ember/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/ember/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- games/ember/Makefile	23 Feb 2006 10:36:35 -0000	1.10
+++ games/ember/Makefile	1 Apr 2006 09:20:46 -0000
@@ -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 @@
 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.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 @@
 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 @@
 		 /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 \
Index: games/ember/distinfo
===================================================================
RCS file: /home/pcvs/ports/games/ember/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- games/ember/distinfo	22 Jan 2006 11:18:07 -0000	1.5
+++ games/ember/distinfo	1 Apr 2006 09:20:46 -0000
@@ -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
Index: games/ember/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/games/ember/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- games/ember/pkg-plist	22 Jan 2006 02:11:00 -0000	1.4
+++ games/ember/pkg-plist	1 Apr 2006 09:20:46 -0000
@@ -20,25 +20,33 @@
 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/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 @@
 @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
Index: games/ember/files/patch-ember
===================================================================
RCS file: /home/pcvs/ports/games/ember/files/patch-ember,v
retrieving revision 1.4
diff -u -r1.4 patch-ember
--- games/ember/files/patch-ember	12 Oct 2005 15:38:31 -0000	1.4
+++ games/ember/files/patch-ember	1 Apr 2006 09:20:47 -0000
@@ -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"
- 
-       # Copy WFUT to home dir
--      cp $datadir/$WFUT_JAR $homedata
-+      cp $bindir/$WFUT_JAR $homedata
- 
-     fi
-   fi
-@@ -124,5 +125,6 @@
+@@ -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 @@
  # 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
Index: games/excido/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/excido/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- games/excido/Makefile	26 Oct 2005 20:04:20 -0000	1.2
+++ games/excido/Makefile	1 Apr 2006 09:20:47 -0000
@@ -15,7 +15,8 @@
 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}
 
Index: games/excido/files/patch-Makefile
===================================================================
RCS file: /home/pcvs/ports/games/excido/files/patch-Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile
--- games/excido/files/patch-Makefile	26 Oct 2005 20:04:20 -0000	1.2
+++ games/excido/files/patch-Makefile	1 Apr 2006 09:20:47 -0000
@@ -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/
Index: graphics/crystalspace/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/crystalspace/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- graphics/crystalspace/Makefile	9 Feb 2006 12:37:09 -0000	1.5
+++ graphics/crystalspace/Makefile	1 Apr 2006 09:20:47 -0000
@@ -20,7 +20,8 @@
 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 @@
 .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)
--- openal.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: oliver 
Responsible-Changed-When: Sat Apr 1 09:52:07 UTC 2006 
Responsible-Changed-Why:  
assign to me 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95192 

From: Oliver Lehmann <lehmann@ans-netz.de>
To: bug-followup@FreeBSD.org
Cc: erik@smluc.org, acardenas@bsd.org.pe, guy@device.dyndns.org,
 jylefort@FreeBSD.org, alejandro@varnet.biz
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sat, 1 Apr 2006 11:55:28 +0200

 Hi,
 
 could you please take a look at http://www.freebsd.org/cgi/query-pr.cgi?pr=95192
 and approve if the changes to your port(s) is/are OK for you?
 
 Thank you very much!
 
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/

From: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
To: Oliver Lehmann <lehmann@ans-netz.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sat, 1 Apr 2006 05:26:13 -0500

 On Sat, 1 Apr 2006 11:55:28 +0200
 Oliver Lehmann <lehmann@ans-netz.de> wrote:
 
 > Hi,
 > 
 > could you please take a look at http://www.freebsd.org/cgi/query-pr.cgi?pr=95192
 > and approve if the changes to your port(s) is/are OK for you?
 > 
 > Thank you very much!
 > 
 > -- 
 >  Oliver Lehmann
 >   http://www.pofo.de/
 >   http://wishlist.ans-netz.de/
 > 
 
 It's ok for me, thanks :), One question, Will affect to all openal dependant ports?, because I have other ports using openal.
 
 Greetings
 ACM
 -- 
 Grupo de Usuarios *BSD Peru - BSDPeru
 http://www.bsd.org.pe

From: Alejandro Pulver <alejandro@varnet.biz>
To: Oliver Lehmann <lehmann@ans-netz.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sat, 1 Apr 2006 10:47:01 -0300

 --Sig_EjIF2.IsJEF9K1A+bRDch_c
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 On Sat, 1 Apr 2006 11:55:28 +0200
 Oliver Lehmann <lehmann@ans-netz.de> wrote:
 
 > Hi,
 >=20
 > could you please take a look at
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D95192 and approve if the
 > changes to your port(s) is/are OK for you?
 >=20
 > Thank you very much!
 >=20
 
 I agree with the changes. And I have some questions:
 
 I would like to know if it will affect all OpenAL ports. I made a
 "portsearch -D openal" and it returned 53 ports.
 
 If freealut depends on OpenAL, why are both dependencies needed (it is
 like ogg/vorbis)?
 
 Also if this freealut dependency is optional, a variable like
 USE_OPENAL could be put in bsd.port.mk, so freealut can be controled
 for all ports with something like WITHOUT_FREEALUT.
 
 Thanks and Best Regards,
 Ale
 
 --Sig_EjIF2.IsJEF9K1A+bRDch_c
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (FreeBSD)
 
 iD8DBQFELoRhiV05EpRcP2ERAowXAJsFIsqavAFRkmRfAnGjROAxivIg2wCgyT1a
 LIy+QH/lZO3/3FbW8EUZ3fU=
 =n1GW
 -----END PGP SIGNATURE-----
 
 --Sig_EjIF2.IsJEF9K1A+bRDch_c--

From: Jean-Yves Lefort <jylefort@FreeBSD.org>
To: Oliver Lehmann <lehmann@ans-netz.de>
Cc: bug-followup@FreeBSD.org, erik@smluc.org, acardenas@bsd.org.pe,
        guy@device.dyndns.org, alejandro@varnet.biz
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sat, 1 Apr 2006 21:20:01 +0200

 --Signature=_Sat__1_Apr_2006_21_20_01_+0200_33din+UaTqnEFUiT
 Content-Type: text/plain; charset=US-ASCII
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Sat, 1 Apr 2006 11:55:28 +0200
 Oliver Lehmann <lehmann@ans-netz.de> wrote:
 
 > could you please take a look at http://www.freebsd.org/cgi/query-pr.cgi?p=
 r=3D95192
 > and approve if the changes to your port(s) is/are OK for you?
 
 Are you sure that the bsd_dsp.c patch is no longer needed (commit log below=
 )?
 
 - Fix OSS support:
     OpenAL uses a buffer size of 1024 bytes, which is too small on
     some systems and/or with some applications, causing heavy drops in
     the audio output. I solve the problem by using the value returned
     by SNDCTL_DSP_GETBLKSIZE rather than 1024.
 
 --=20
 Jean-Yves Lefort
 
 jylefort@FreeBSD.org
 http://lefort.be.eu.org/
 
 --Signature=_Sat__1_Apr_2006_21_20_01_+0200_33din+UaTqnEFUiT
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (FreeBSD)
 
 iD8DBQFELtJiyzD7UaO4AGoRApT9AJ93gytFFULK4bsU8mRsTs5h67zP9QCfUI7X
 UFZsdRX+ZmM0Cnlh/a9tQlk=
 =JSEy
 -----END PGP SIGNATURE-----
 
 --Signature=_Sat__1_Apr_2006_21_20_01_+0200_33din+UaTqnEFUiT--
 

From: Oliver Lehmann <lehmann@ans-netz.de>
To: Alejandro Pulver <alejandro@varnet.biz>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sun, 2 Apr 2006 21:40:52 +0200

 Alejandro Pulver wrote:
 
 > If freealut depends on OpenAL, why are both dependencies needed (it is
 > like ogg/vorbis)?
 
 Because Freealut was seperated from OpenAL (splitted into two pieces of
 software) so most application who used both things are now needing both
 libs. The non-changed openal dependent ports are compiling without
 freealut
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/

From: Oliver Lehmann <lehmann@ans-netz.de>
To: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sun, 2 Apr 2006 21:41:38 +0200

 Jose Alonso Cardenas Marquez wrote:
 
 
 > It's ok for me, thanks :), One question, Will affect to all openal
 > dependant ports?, because I have other ports using openal.
 
 I tested all ports which are directly depending on openal. And only
 modified those who where not compiling "out of the box"
 
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/

From: Oliver Lehmann <lehmann@ans-netz.de>
To: Jean-Yves Lefort <jylefort@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, erik@smluc.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Sun, 2 Apr 2006 21:45:08 +0200

 Jean-Yves Lefort wrote:
 
 > Are you sure that the bsd_dsp.c patch is no longer needed (commit log below)?
 > 
 > - Fix OSS support:
 >     OpenAL uses a buffer size of 1024 bytes, which is too small on
 >     some systems and/or with some applications, causing heavy drops in
 >     the audio output. I solve the problem by using the value returned
 >     by SNDCTL_DSP_GETBLKSIZE rather than 1024.
 
 Thanks for noting this, I'll incorporate the old (dropped) patch with my
 new one.
 
 
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/

From: "Oliver Lehmann" <oliver@FreeBSD.org>
To: Jean-Yves Lefort <jylefort@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, erik@smluc.org
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Mon, 03 Apr 2006 09:18:09 +0200

 Hi Jean-Yves, 
 
 can we agree on that merged patch which replaces your 
 patch-src_arch_bsd_bsd__dsp.c and my patch-src-backends-alc_backend_bsd.c? 
 
  --- src/backends/alc_backend_bsd.c.orig	Thu Jan  5 16:11:20 2006
 +++ src/backends/alc_backend_bsd.c	Mon Apr  3 09:13:44 2006
 @@ -10,6 +10,7 @@
  #include "al_siteconfig.h"
 
  #include <AL/al.h>
 +#include <AL/alext.h>
  #include <assert.h>
  #include <fcntl.h>
  #include <sys/soundcard.h>
 @@ -113,7 +114,6 @@
   */
  static 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 +126,6 @@
  		perror("fcntl");
  	}
 
  -	if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
  -		perror("ioctl SETFRAGMENT");
  -	}
  -
  	FD_ZERO(&dsp_fd_set);
  	FD_SET(dsp_fd, &dsp_fd_set);
 
 @@ -318,10 +314,11 @@
  }
 
  static ALboolean set_write_native(UNUSED(void *handle),
  -				  UNUSED(unsigned int *bufsiz),
 +				  unsigned int *bufsiz,
  				  ALenum *fmt,
  				  unsigned int *speed) {
  	ALuint channels = _alGetChannelsFromFormat(*fmt);
 +	int divisor;
 
  	if(dsp_fd < 0) {
  		return AL_FALSE;
 @@ -363,6 +360,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;
  }

From: Erik Greenwald <erik@smluc.org>
To: bug-followup@FreeBSD.org, oliver@freebsd.org
Cc: erik@math.missouristate.edu
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Mon, 3 Apr 2006 09:07:28 -0500

 Looks good to me. If you want me to take maintainership of the freealut
 port at any time, just let me know. Also, if there is anything I can do
 to make the dependant ports go easier, I'm willing to help. (I'm not
 sure depending on their numbers is the best route... The 0.0.8 moniker
 was added in configure.ac revision 1.4 2005/03/20. configure.ac is
 currently at revision 1.79, and was at 1.76 on 2006/2/11. I don't 
 believe the number is being updated.)
 
 Thanks!
 
  -Erik

From: Oliver Lehmann <oliver@FreeBSD.org>
To: Erik Greenwald <erik@smluc.org>
Cc: bug-followup@FreeBSD.org, erik@math.missouristate.edu
Subject: Re: ports/95192: update audio/openal + dependant ports
Date: Mon, 3 Apr 2006 16:35:13 +0200

 Erik Greenwald wrote:
 
 > Looks good to me. If you want me to take maintainership of the freealut
 > port at any time, just let me know. Also, if there is anything I can do
 > to make the dependant ports go easier, I'm willing to help. (I'm not
 > sure depending on their numbers is the best route... The 0.0.8 moniker
 > was added in configure.ac revision 1.4 2005/03/20. configure.ac is
 > currently at revision 1.79, and was at 1.76 on 2006/2/11. I don't 
 > believe the number is being updated.)
 
 Ok, thanks so far for the response. I've worked on freealut for my
 games/ember since it really needs it. If it is OK for you I'll hand the
 maintainership of freealut up to you since I guess it might be easier for
 updating either openal or freealut in the future if the maintainership is
 in one hand.
 
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/
State-Changed-From-To: open->closed 
State-Changed-By: oliver 
State-Changed-When: Sun Apr 23 13:49:47 UTC 2006 
State-Changed-Why:  
committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95192 
>Unformatted:
