Attachment #64756 for bug #96172

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




#

PORTNAME=	openal
PORTVERSION=	20060211
PORTREVISION=	1
CATEGORIES=	audio
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 gnomehack
WANT_SDL=	yes
INSTALLS_SHLIB=	yes
USE_REINPLACE=	yes

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

	@${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>

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




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




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

Added Link Here

(-)audio/openal/files/patch-src-backends-alc_backend_esd.c (+10 lines)
1	--- src/backends/alc_backend_esd.c.orig Sat Apr 22 21:06:15 2006
2	+++ src/backends/alc_backend_esd.c Sat Apr 22 21:05:33 2006
3	@@ -15,6 +15,7 @@
4	#include <string.h>
5	#include <sys/ioctl.h>
6	#include <sys/mman.h>
7	+#include <sys/select.h>
8	#include <sys/stat.h>
9	#include <sys/time.h>
10	#include <sys/types.h>




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

Return to bug 96172

Lines 6-29 Link Here

(-)audio/openal/Makefile (-11 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= openal	8	PORTNAME= openal
9	PORTVERSION= 20050401	9	PORTVERSION= 20060211
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/	12	DISTVERSION= 0.0.8
14		13
15	MAINTAINER= erik@smluc.org	14	MAINTAINER= erik@smluc.org
16	COMMENT= A 3D positional spatialized sound library	15	COMMENT= A 3D positional spatialized sound library
17		16
18	INFO= openal
19
20	WRKSRC= ${WRKDIR}/${DISTNAME}/linux
21	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
22	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	18	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	19	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
24	CONFIGURE_ARGS= --enable-capture	20	CONFIGURE_ARGS= --enable-capture
25	USE_GMAKE= yes	21	USE_GMAKE= yes
26	USE_GNOME= pkgconfig	22	USE_GNOME= pkgconfig gnomehack
27	WANT_SDL= yes	23	WANT_SDL= yes
28	INSTALLS_SHLIB= yes	24	INSTALLS_SHLIB= yes
29	USE_REINPLACE= yes	25	USE_REINPLACE= yes
Lines 43-69 Link Here
43	.if defined(WITH_ARTS)	39	.if defined(WITH_ARTS)
44	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts	40	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
45	CONFIGURE_ARGS+=--enable-arts	41	CONFIGURE_ARGS+=--enable-arts
		42	.else
		43	CONFIGURE_ARGS+=--disable-arts
46	.endif	44	.endif
47		45
48	.if defined(WITH_ESD)	46	.if defined(WITH_ESD)
49	USE_GNOME+= esound	47	USE_GNOME+= esound
50	CONFIGURE_ARGS+=--enable-esd	48	CONFIGURE_ARGS+=--enable-esd
		49	.else
		50	CONFIGURE_ARGS+=--disable-esd
51	.endif	51	.endif
52		52
53	.if defined(WITH_SDL)	53	.if defined(WITH_SDL)
54	USE_SDL+= sdl	54	USE_SDL+= sdl
55	CONFIGURE_ENV+= HAVESDL="${SDL_CONFIG}"	55	CONFIGURE_ENV+= HAVESDL="${SDL_CONFIG}"
56	CONFIGURE_ARGS+=--enable-sdl	56	CONFIGURE_ARGS+=--enable-sdl
		57	.else
		58	CONFIGURE_ARGS+=--disable-sdl
57	.endif	59	.endif
58		60
59	.if defined(WITH_VORBIS)	61	.if defined(WITH_VORBIS)
60	LIB_DEPENDS+= vorbisfile.4:${PORTSDIR}/audio/libvorbis	62	LIB_DEPENDS+= vorbisfile.4:${PORTSDIR}/audio/libvorbis
61	CONFIGURE_ARGS+=--enable-vorbis	63	CONFIGURE_ARGS+=--enable-vorbis
		64	.else
		65	CONFIGURE_ARGS+=--disable-vorbis
62	.endif	66	.endif
63		67
64	.if defined(WITH_SMPEG)	68	.if defined(WITH_SMPEG)
65	LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg	69	LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg
66	CONFIGURE_ARGS+=--enable-smpeg	70	CONFIGURE_ARGS+=--enable-smpeg
		71	.else
		72	CONFIGURE_ARGS+=--disable-smpeg
67	.endif	73	.endif
68		74
69	post-patch:	75	post-patch:
Lines 72-78 Link Here
72	@${REINPLACE_CMD} -e '/#include/ s\|SDL/\|\|' \	78	@${REINPLACE_CMD} -e '/#include/ s\|SDL/\|\|' \
73	${WRKSRC}/src/extensions/al_ext_mp3.c	79	${WRKSRC}/src/extensions/al_ext_mp3.c
74		80
75	post-install:
76	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
77
78	.include <bsd.port.post.mk>	81	.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

(-)audio/openal/files/patch-src-backends-alc_backend_bsd.c (+13 lines)
1	--- src/backends/alc_backend_bsd.c.orig Sat Apr 22 12:25:15 2006
2	+++ src/backends/alc_backend_bsd.c Sat Apr 22 12:26:15 2006
3	@@ -9,7 +9,10 @@
4	*/
5	#include "al_siteconfig.h"
6
7	+#define __BSD_VISIBLE 1
8	+
9	#include <AL/al.h>
10	+#include <AL/alext.h>
11	#include <assert.h>
12	#include <fcntl.h>
13	#include <sys/soundcard.h>

Removed Link Here

(-)audio/openal/files/patch-src_arch_bsd_bsd__dsp.c (-58 lines)
1	--- src/arch/bsd/bsd_dsp.c.orig Wed Nov 9 13:15:27 2005
2	+++ src/arch/bsd/bsd_dsp.c Wed Nov 9 14:09:12 2005
3	@@ -113,7 +113,6 @@
4	*/
5	void *grab_write_native(void) {
6	const char *dsppath = "/dev/dsp";
7	- int divisor = _alSpot(_AL_DEF_BUFSIZ) \| (2<<16);
8
9	dsp_fd = open(dsppath, O_WRONLY \| O_NONBLOCK);
10
11	@@ -126,10 +125,6 @@
12	perror("fcntl");
13	}
14
15	- if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
16	- perror("ioctl SETFRAGMENT");
17	- }
18	-
19	_alBlitBuffer = native_blitbuffer;
20
21	FD_ZERO(&dsp_fd_set);
22	@@ -320,10 +315,11 @@
23	}
24
25	ALboolean set_write_native(UNUSED(void *handle),
26	- UNUSED(unsigned int *bufsiz),
27	+ unsigned int *bufsiz,
28	ALenum *fmt,
29	unsigned int *speed) {
30	ALuint channels = _al_ALCHANNELS(*fmt);
31	+ int divisor;
32
33	if(dsp_fd < 0) {
34	return AL_FALSE;
35	@@ -365,6 +361,23 @@
36
37
38	fmt = BSD2ALFMT(fmt, channels);
39	+
40	+ if(ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, bufsiz) < 0) {
41	+#ifdef DEBUG_MAXIMUS
42	+ fprintf(stderr, "blksize %d\n", *bufsiz);
43	+ perror("get_devsp blksize ioctl");
44	+#endif
45	+ return AL_FALSE;
46	+ }
47	+
48	+ divisor = _alSpot(*bufsiz) \| (2<<16);
49	+ if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
50	+#ifdef DEBUG_MAXIMUS
51	+ fprintf(stderr, "divisor %d\n", divisor);
52	+ perror("set_devsp fragment ioctl");
53	+#endif
54	+ return AL_FALSE;
55	+ }
56
57	return AL_TRUE;
58	}