cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to OpenAL 1.14, from Antti Harri with tweak from Brad

Browse Source
This commit is contained in:
sthen 2012-04-06 13:48:18 +00:00
parent 13b284f591
commit 37bb2d3b74
4 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
audio/openal/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.24 2011/07/02 07:34:31 jasper Exp $ # $OpenBSD: Makefile,v 1.25 2012/04/06 13:48:18 sthen Exp $
COMMENT = cross-platform 3D audio API COMMENT = cross-platform 3D audio API
V = 20110627 V = 1.14
EPOCH = 0
DISTNAME = openal-soft-$V DISTNAME = openal-soft-$V
PKGNAME = openal-$V PKGNAME = openal-$V
CATEGORIES = audio CATEGORIES = audio
SHARED_LIBS = openal 2.0 SHARED_LIBS = openal 2.1
HOMEPAGE = http://kcat.strangesoft.net/openal.html HOMEPAGE = http://kcat.strangesoft.net/openal.html
@ -20,20 +21,26 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c m pthread sndio WANTLIB = c m pthread sndio
MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} \ MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,}
http://openbsd.fi/dist/ EXTRACT_SUFX = .tar.bz2
CONFIGURE_ARGS =-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" \ CONFIGURE_ARGS =-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" \
-DCMAKE_BUILD_TYPE=OpenBSD \ -DCMAKE_BUILD_TYPE=OpenBSD \
-DDLOPEN=Off \ -DDLOPEN=Off \
-DREQUIRE_SNDIO=On \
-DPULSEAUDIO=Off \ -DPULSEAUDIO=Off \
-DPORTAUDIO=Off \ -DPORTAUDIO=Off \
-DSOLARIS=Off \ -DSOLARIS=Off \
-DALSA=Off \ -DALSA=Off \
-DOSS=Off -DOSS=Off \
-DCOREAUDIO=Off \
-DDSOUND=Off \
-DOPENSL=Off \
-DEXAMPLES=Off
MODULES = devel/cmake MODULES = devel/cmake
SEPARATE_BUILD =Yes
NO_REGRESS = Yes NO_REGRESS = Yes
pre-build: pre-build:

10
audio/openal/distinfo
View File

@ -1,5 +1,5 @@
MD5 (openal-soft-20110627.tar.gz) = dyIlarhDU4oZArAVhNi6Xw== MD5 (openal-soft-1.14.tar.bz2) = PYuGwhovh6Kl5g9487PwPQ==
RMD160 (openal-soft-20110627.tar.gz) = kWiXzE41A6/+Xvs8PKBCZKpb/Vs= RMD160 (openal-soft-1.14.tar.bz2) = NbTUbyF5+4R9IqvkwcuNSpdPilo=
SHA1 (openal-soft-20110627.tar.gz) = 22LbnwY5ForaALA6rXGj/QfB7LM= SHA1 (openal-soft-1.14.tar.bz2) = 5tadsT7BVGW4OkXviZeOig9Vvso=
SHA256 (openal-soft-20110627.tar.gz) = /xXT1ihUatrb/4JSCAYYrrTVYbjP6medJwHdInFpS/w= SHA256 (openal-soft-1.14.tar.bz2) = h72NYdWUM4eJjJK2oru7JhGOdF3sV1UMgXUmpw+tCRQ=
SIZE (openal-soft-20110627.tar.gz) = 231964 SIZE (openal-soft-1.14.tar.bz2) = 221579

36
audio/openal/patches/patch-Alc_sndio_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-Alc_sndio_c,v 1.2 2011/07/02 07:34:31 jasper Exp $
--- Alc/sndio.c.orig Mon Jun 27 01:40:15 2011
+++ Alc/sndio.c Thu Jun 30 23:37:31 2011
@@ -142,25 +142,15 @@ static ALuint sndio_proc(ALvoid *ptr)
while(!data->killNow && device->Connected)
{
- ALsizei len = data->data_size;
- ALubyte *WritePtr = data->mix_data;
-
- aluMixData(device, WritePtr, len/frameSize);
- while(len > 0 && !data->killNow)
+ aluMixData(device, data->mix_data, data->data_size / frameSize);
+ wrote = sio_write(data->sndHandle, data->mix_data, data->data_size);
+ if(wrote < data->data_size)
{
- wrote = sio_write(data->sndHandle, WritePtr, len);
- if(wrote == 0)
- {
- AL_PRINT("sio_write failed\n");
- aluHandleDisconnect(device);
- break;
- }
-
- len -= wrote;
- WritePtr += wrote;
- }
+ AL_PRINT("sio_write: short write\n");
+ aluHandleDisconnect(device);
+ break;
+ }
}
-
return 0;
}

4
audio/openal/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2011/06/25 18:42:02 jasper Exp $ @comment $OpenBSD: PLIST,v 1.5 2012/04/06 13:48:18 sthen Exp $
@bin bin/makehrtf
@bin bin/openal-info @bin bin/openal-info
include/AL/ include/AL/
include/AL/al.h include/AL/al.h
@ -6,6 +7,7 @@ include/AL/alc.h
include/AL/alext.h include/AL/alext.h
%%SHARED%% %%SHARED%%
include/AL/efx-creative.h include/AL/efx-creative.h
include/AL/efx-presets.h
include/AL/efx.h include/AL/efx.h
lib/pkgconfig/ lib/pkgconfig/
lib/pkgconfig/openal.pc lib/pkgconfig/openal.pc