ports/96172: [Maintainer Update] audio/openal 20050401 -> 20060211

Erik Greenwald erik at smluc.org
Sun Apr 23 01:20:17 UTC 2006 

>Number:         96172
>Category:       ports
>Synopsis:       [Maintainer Update]  audio/openal  20050401 -> 20060211
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 23 01:20:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Erik Greenwald
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD fenris 6.0-STABLE FreeBSD 6.0-STABLE #2: Fri Nov 4 19:18:58 EST 2005 root at fenris:/usr/obj/usr/src/sys/FENRIS i386

>Description:

This one is for oliver at FreeBSD.org by his request...

tested on 6.0-stable and 7.0-current with all config options on and 
off. Added some stuff to the make conditionals so if a dependancy
for a config option is available but is NOT selected in the config,
it will not be built in the package.

the info page seems to have gone away, and the alut stuff has been
moved out.

files/patch-src_arch_bsd_bsd__dsp.c is no more, figuring out how
how the changes apply to the new layout is on my todo list, and I
will commit them to the openal cvs repo when I have that done.

thanks! (sorry it took so long)

>How-To-Repeat:
>Fix:

--- audio_openal.patch begins here ---
Index: audio/openal/Makefile
===================================================================
RCS file: /home/ncvs/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	23 Apr 2006 01:12:07 -0000
@@ -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 at 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 @@
 .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 @@
 	@${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>
Index: audio/openal/distinfo
===================================================================
RCS file: /home/ncvs/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	23 Apr 2006 01:12:07 -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
Index: audio/openal/pkg-plist
===================================================================
RCS file: /home/ncvs/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	23 Apr 2006 01:12:07 -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/openal/files/patch-src-backends-alc_backend_bsd.c
===================================================================
RCS file: audio/openal/files/patch-src-backends-alc_backend_bsd.c
diff -N audio/openal/files/patch-src-backends-alc_backend_bsd.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/openal/files/patch-src-backends-alc_backend_bsd.c	23 Apr 2006 01:12:07 -0000
@@ -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>
Index: audio/openal/files/patch-src-backends-alc_backend_esd.c
===================================================================
RCS file: audio/openal/files/patch-src-backends-alc_backend_esd.c
diff -N audio/openal/files/patch-src-backends-alc_backend_esd.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/openal/files/patch-src-backends-alc_backend_esd.c	23 Apr 2006 01:12:07 -0000
@@ -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>
Index: audio/openal/files/patch-src_arch_bsd_bsd__dsp.c
===================================================================
RCS file: audio/openal/files/patch-src_arch_bsd_bsd__dsp.c
diff -N audio/openal/files/patch-src_arch_bsd_bsd__dsp.c
--- audio/openal/files/patch-src_arch_bsd_bsd__dsp.c	24 Nov 2005 06:49:56 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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;
- }
--- audio_openal.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list