Re: [UPDATE] audio/openal 1.19.1
On Tue, Feb 12, 2019 at 04:07:53PM +, David CARLIER wrote: > Hi jca and were discussing about his question regarding the > OpenAL32_alBuffer.c patch ... > It might have been fixed with the 1.19.1 release what would be nice is > for you to test couple of consumers without this specific change and > see if it crashes then maybe we will be able to remove this for good > ;-) > Done testing, those consumers simply have no sound when no devices are available, I simple set in /etc/openal/alsoft.conf: drivers = -sndio > Thanks. Now, I report that all openal dependents are successfully built: mazocomp$ cd /usr/ports/ mazocomp$ cat openal.dependents audio/freealut emulators/fs-uae emulators/higan emulators/retroarch games/0ad/base games/arx-libertatis games/astromenace games/barony games/colobot/colobot games/dhewm3 games/dustrac games/endless-sky games/fifengine games/fnaify games/freeorion games/fs2open games/gemrb games/gzdoom games/ioquake3 games/irrlamb games/love games/lugaru games/lwjgl games/megaglest/base games/minetest games/openmw games/openomf games/scorched3d games/solarus/solarus games/spacezero games/speeddreams games/supertux games/supertuxkart games/taisei games/tome4 games/ufoai/base,-editor games/valyriatear games/vegastrike/engine games/warzone2100 games/yquake2 graphics/blender graphics/simgear multimedia/sfml net/utox x11/kde-applications/libkdegames x11/kde4/libkdegames x11/qt5/qtmultimedia mazocomp$ doas infrastructure/bin/dpb openal.dependents Started as: root Port user: root Build user: _pbuild Fetch user: _pfetch Log user: _pbuild Unpriv user: _dpb Reading build stats...zapping old stuff...Done Reading distinfo...zap duplicates...Done Waiting for hosts to finish STARTUP...ready on localhost 13 Feb 03:13:24 [82702] running for 14:30:52 Hosts: localhost(kde4) I=688 B=0 Q=0 T=0 F=0 !=4 Elapsed time=14:30:52 I=688 B=0 Q=0 T=0 F=0 !=4 mazocomp$ Commit time? :)
Re: [UPDATE] audio/openal 1.19.1
Hi I planned to update it much later but thanks for doing this. As said privately I m ok with the changes once approved by other folks. Cheers. On Sun, 10 Feb 2019 at 09:06, Leonid Bobrov wrote: > > Hi! > > Full changelog can be found here: > https://github.com/kcat/openal-soft/blob/master/ChangeLog > > The most notable one is this release brings sndio input support, > thanks to work done by Alexandre Ratchov. > > I raise minor number because my checks show that only new functions > were added. > > So far the dependent programs I use keep working. > > Index: Makefile > === > RCS file: /cvs/ports/audio/openal/Makefile,v > retrieving revision 1.51 > diff -u -p -u -p -r1.51 Makefile > --- Makefile9 Aug 2018 20:50:47 - 1.51 > +++ Makefile10 Feb 2019 08:51:28 - > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > COMMENT = cross-platform 3D audio API > > -V =1.17.2 > +V =1.19.1 > EPOCH =0 > DISTNAME = openal-soft-$V > PKGNAME = openal-$V > CATEGORIES = audio > -SHARED_LIBS = openal 3.0 > -REVISION = 1 > +SHARED_LIBS = openal 3.1 > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > @@ -19,7 +18,7 @@ MAINTAINER = David Carlier # LGPLv2+ > PERMIT_PACKAGE_CDROM = Yes > > -WANTLIB += c m pthread sndio ${COMPILER_LIBCXX} > +WANTLIB += c m pthread sndio > > MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} > EXTRACT_SUFX = .tar.bz2 > @@ -30,6 +29,7 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB > -DALSOFT_UTILS=On \ > -DALSOFT_EXAMPLES=Off \ > -DALSOFT_REQUIRE_SNDIO=On \ > + -DALSOFT_BACKEND_DSOUND=Off \ > -DALSOFT_BACKEND_WAVE=Off \ > -DALSOFT_CPUEXT_SSE=Off \ > -DALSOFT_CPUEXT_SSE2=Off \ > @@ -42,21 +42,16 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB > -DCMAKE_DISABLE_FIND_PACKAGE_PortAudio:Bool=Yes \ > -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:Bool=Yes \ > -DCMAKE_DISABLE_FIND_PACKAGE_QSA:Bool=Yes \ > + -DCMAKE_DISABLE_FIND_PACKAGE_SDL2:Bool=Yes \ > -DALSOFT_NO_CONFIG_UTIL=On > > MODULES = devel/cmake > > -COMPILER = base-clang ports-clang ports-gcc > +COMPILER = base-clang ports-clang ports-gcc > > -SEPARATE_BUILD =Yes > NO_TEST = Yes > > pre-build: > - @${SUBST_CMD} ${WRKSRC}/Alc/alcConfig.c ${WRKSRC}/alsoftrc.sample > - > -post-install: > - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openal > - ${INSTALL_DATA} ${WRKSRC}/alsoftrc.sample \ > - ${PREFIX}/share/examples/openal > + @${SUBST_CMD} ${WRKSRC}/Alc/alconfig.c ${WRKSRC}/alsoftrc.sample > > .include > Index: distinfo > === > RCS file: /cvs/ports/audio/openal/distinfo,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 distinfo > --- distinfo15 Nov 2017 13:02:42 - 1.10 > +++ distinfo10 Feb 2019 08:51:28 - > @@ -1,2 +1,2 @@ > -SHA256 (openal-soft-1.17.2.tar.bz2) = > o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ= > -SIZE (openal-soft-1.17.2.tar.bz2) = 486934 > +SHA256 (openal-soft-1.19.1.tar.bz2) = > XC+H/1GIuV4NxHaXGanYnOQ1uDIrRHi5XdS0J/6Esuk= > +SIZE (openal-soft-1.19.1.tar.bz2) = 577310 > Index: patches/patch-Alc_ALc_c > === > RCS file: patches/patch-Alc_ALc_c > diff -N patches/patch-Alc_ALc_c > --- patches/patch-Alc_ALc_c 31 Dec 2017 18:46:26 - 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,35 +0,0 @@ > -$OpenBSD: patch-Alc_ALc_c,v 1.1 2017/12/31 18:46:26 jca Exp $ > - > -commit d1e98c36d375433cb11a7a74ce20c968491773aa > -Author: Chris Robinson > -Date: Sat Apr 30 17:14:55 2016 -0700 > - > -Don't crash when there's no backend to probe > - > -Index: Alc/ALc.c > Alc/ALc.c.orig > -+++ Alc/ALc.c > -@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) > - V0(factory,init)(); > - } > - > -+if(!PlaybackBackend.name) > -+WARN("No playback backend available!\n"); > -+if(!CaptureBackend.name) > -+WARN("No capture backend available!\n"); > -+ > - if(ConfigValueStr(NULL, NULL, "excludefx", &str)) > - { > - size_t len; > -@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe > - LockLists(); > - al_string_clear(list); > - > --if(!backendinfo->getFactory) > -+if(backendinfo->Probe) > - backendinfo->Probe(type); > --else > -+else if(backendinfo->getFactory) > - { > - ALCbackendFactory *factory = backendinfo->getFactory(); > - V(factory,probe)(type); > Index: patches/patch-Alc_alcConfig_c > === > RCS file: patches/patch-Alc_alcConfig_c > diff -N patches/patch-Alc_a
Re: [UPDATE] audio/openal 1.19.1
Hi, Brian! On Mon, Feb 11, 2019 at 08:18:23AM -0500, Brian Callahan wrote: > Could you at least build test all the ports that depend on openal? That will > help ensure the minor bump is correct and there's less chance of having to > clean up breakage post-commit. > Sure, I'll do it.
Re: [UPDATE] audio/openal 1.19.1
On 2/10/19 4:06 AM, Leonid Bobrov wrote: Hi! Full changelog can be found here: https://github.com/kcat/openal-soft/blob/master/ChangeLog The most notable one is this release brings sndio input support, thanks to work done by Alexandre Ratchov. I raise minor number because my checks show that only new functions were added. So far the dependent programs I use keep working. Yes, I think the time is right to update openal. Could you at least build test all the ports that depend on openal? That will help ensure the minor bump is correct and there's less chance of having to clean up breakage post-commit. ~Brian Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.51 diff -u -p -u -p -r1.51 Makefile --- Makefile9 Aug 2018 20:50:47 - 1.51 +++ Makefile10 Feb 2019 08:51:28 - @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s COMMENT = cross-platform 3D audio API -V = 1.17.2 +V =1.19.1 EPOCH = 0 DISTNAME =openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 3.0 -REVISION = 1 +SHARED_LIBS = openal 3.1 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -19,7 +18,7 @@ MAINTAINER = David Carlier # LGPLv2+ PERMIT_PACKAGE_CDROM =Yes -WANTLIB += c m pthread sndio ${COMPILER_LIBCXX} +WANTLIB += c m pthread sndio MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} EXTRACT_SUFX =.tar.bz2 @@ -30,6 +29,7 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB -DALSOFT_UTILS=On \ -DALSOFT_EXAMPLES=Off \ -DALSOFT_REQUIRE_SNDIO=On \ + -DALSOFT_BACKEND_DSOUND=Off \ -DALSOFT_BACKEND_WAVE=Off \ -DALSOFT_CPUEXT_SSE=Off \ -DALSOFT_CPUEXT_SSE2=Off \ @@ -42,21 +42,16 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB -DCMAKE_DISABLE_FIND_PACKAGE_PortAudio:Bool=Yes \ -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:Bool=Yes \ -DCMAKE_DISABLE_FIND_PACKAGE_QSA:Bool=Yes \ + -DCMAKE_DISABLE_FIND_PACKAGE_SDL2:Bool=Yes \ -DALSOFT_NO_CONFIG_UTIL=On MODULES = devel/cmake -COMPILER = base-clang ports-clang ports-gcc +COMPILER = base-clang ports-clang ports-gcc -SEPARATE_BUILD =Yes NO_TEST = Yes pre-build: - @${SUBST_CMD} ${WRKSRC}/Alc/alcConfig.c ${WRKSRC}/alsoftrc.sample - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openal - ${INSTALL_DATA} ${WRKSRC}/alsoftrc.sample \ - ${PREFIX}/share/examples/openal + @${SUBST_CMD} ${WRKSRC}/Alc/alconfig.c ${WRKSRC}/alsoftrc.sample .include Index: distinfo === RCS file: /cvs/ports/audio/openal/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo15 Nov 2017 13:02:42 - 1.10 +++ distinfo10 Feb 2019 08:51:28 - @@ -1,2 +1,2 @@ -SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ= -SIZE (openal-soft-1.17.2.tar.bz2) = 486934 +SHA256 (openal-soft-1.19.1.tar.bz2) = XC+H/1GIuV4NxHaXGanYnOQ1uDIrRHi5XdS0J/6Esuk= +SIZE (openal-soft-1.19.1.tar.bz2) = 577310 Index: patches/patch-Alc_ALc_c === RCS file: patches/patch-Alc_ALc_c diff -N patches/patch-Alc_ALc_c --- patches/patch-Alc_ALc_c 31 Dec 2017 18:46:26 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,35 +0,0 @@ -$OpenBSD: patch-Alc_ALc_c,v 1.1 2017/12/31 18:46:26 jca Exp $ - -commit d1e98c36d375433cb11a7a74ce20c968491773aa -Author: Chris Robinson -Date: Sat Apr 30 17:14:55 2016 -0700 - -Don't crash when there's no backend to probe - -Index: Alc/ALc.c Alc/ALc.c.orig -+++ Alc/ALc.c -@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) - V0(factory,init)(); - } - -+if(!PlaybackBackend.name) -+WARN("No playback backend available!\n"); -+if(!CaptureBackend.name) -+WARN("No capture backend available!\n"); -+ - if(ConfigValueStr(NULL, NULL, "excludefx", &str)) - { - size_t len; -@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe - LockLists(); - al_string_clear(list); - --if(!backendinfo->getFactory) -+if(backendinfo->Probe) - backendinfo->Probe(type); --else -+else if(backendinfo->getFactory) - { - ALCbackendFactory *factory = backendinfo->getFactory(); - V(factory,probe)(type); Index: patches/patch-Alc_alcConfig_c === RCS file: patches/patch-Alc_alcConfig_c diff -N patches/patch-Alc_alcConfig_c --- patches/patch-Alc_alcConfig_c 15 Nov 2017 13:02:42 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBS
Re: [UPDATE] audio/openal 1.19.0 with sndio capture support
Hm, MIME is broken, so here's plain-text patch: Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.51 diff -u -p -u -p -r1.51 Makefile --- Makefile9 Aug 2018 20:50:47 - 1.51 +++ Makefile8 Sep 2018 13:42:50 - @@ -1,16 +1,13 @@ # $OpenBSD: Makefile,v 1.51 2018/08/09 20:50:47 ratchov Exp $ -BROKEN-hppa = undefined reference to __sync atomic ops - COMMENT = cross-platform 3D audio API -V =1.17.2 +V =1.19.0 EPOCH =0 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 3.0 -REVISION = 1 +SHARED_LIBS = openal 3.1 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -19,7 +16,7 @@ MAINTAINER = David Carlier Index: distinfo === RCS file: /cvs/ports/audio/openal/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo15 Nov 2017 13:02:42 - 1.10 +++ distinfo8 Sep 2018 13:42:50 - @@ -1,2 +1,2 @@ -SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ= -SIZE (openal-soft-1.17.2.tar.bz2) = 486934 +SHA256 (openal-soft-1.19.0.tar.bz2) = 8a3zpuc+L5JwoP0AiH6iN5OWj6eH9g3N7EGjsvQqDtY= +SIZE (openal-soft-1.19.0.tar.bz2) = 575163 Index: patches/patch-Alc_ALc_c === RCS file: /cvs/ports/audio/openal/patches/patch-Alc_ALc_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-Alc_ALc_c --- patches/patch-Alc_ALc_c 31 Dec 2017 18:46:26 - 1.1 +++ patches/patch-Alc_ALc_c 8 Sep 2018 13:42:50 - @@ -1,35 +1,54 @@ -$OpenBSD: patch-Alc_ALc_c,v 1.1 2017/12/31 18:46:26 jca Exp $ - -commit d1e98c36d375433cb11a7a74ce20c968491773aa -Author: Chris Robinson -Date: Sat Apr 30 17:14:55 2016 -0700 - -Don't crash when there's no backend to probe +$OpenBSD$ Index: Alc/ALc.c --- Alc/ALc.c.orig +++ Alc/ALc.c -@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) - V0(factory,init)(); - } +@@ -79,7 +79,7 @@ static struct BackendInfo BackendList[] = { + { "solaris", ALCsolarisBackendFactory_getFactory }, + #endif + #ifdef HAVE_SNDIO +-{ "sndio", ALCsndioBackendFactory_getFactory }, ++{ "sndio", SndioBackendFactory_getFactory }, + #endif + #ifdef HAVE_OSS + { "oss", ALCossBackendFactory_getFactory }, +@@ -656,9 +656,9 @@ static const struct { -+if(!PlaybackBackend.name) -+WARN("No playback backend available!\n"); -+if(!CaptureBackend.name) -+WARN("No capture backend available!\n"); -+ - if(ConfigValueStr(NULL, NULL, "excludefx", &str)) - { - size_t len; -@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe - LockLists(); - al_string_clear(list); - --if(!backendinfo->getFactory) -+if(backendinfo->Probe) - backendinfo->Probe(type); --else -+else if(backendinfo->getFactory) + DECL(AL_DEDICATED_GAIN), + +-DECL(AL_AUTOWAH_ATTACK_TIME), +-DECL(AL_AUTOWAH_RELEASE_TIME), +-DECL(AL_AUTOWAH_RESONANCE), ++DECL(AL_AUTOWAH_ATTACK_TIME), ++DECL(AL_AUTOWAH_RELEASE_TIME), ++DECL(AL_AUTOWAH_RESONANCE), + DECL(AL_AUTOWAH_PEAK_GAIN), + + DECL(AL_NUM_RESAMPLERS_SOFT), +@@ -1314,7 +1314,7 @@ static void ProbeDevices(al_string *list, struct Backe + if(backendinfo->getFactory) { ALCbackendFactory *factory = backendinfo->getFactory(); - V(factory,probe)(type); +-V(factory,probe)(type); ++V(factory,probe)(type, list); + } + + UnlockLists(); +@@ -1323,17 +1323,6 @@ static void ProbeAllDevicesList(void) + { ProbeDevices(&alcAllDevicesList, &PlaybackBackend, ALL_DEVICE_PROBE); } + static void ProbeCaptureDeviceList(void) + { ProbeDevices(&alcCaptureDeviceList, &CaptureBackend, CAPTURE_DEVICE_PROBE); } +- +-static void AppendDevice(const ALCchar *name, al_string *devnames) +-{ +-size_t len = strlen(name); +-if(len > 0) +-alstr_append_range(devnames, name, name+len+1); +-} +-void AppendAllDevicesList(const ALCchar *name) +-{ AppendDevice(name, &alcAllDevicesList); } +-void AppendCaptureDeviceList(const ALCchar *name) +-{ AppendDevice(name, &alcCaptureDeviceList); } + + + / Index: patches/patch-Alc_alcConfig_c === RCS file: patches/patch-Alc_alcConfig_c diff -N patches/patch-Alc_alcConfig_c --- patches/patch-Alc_alcConfig_c 15 Nov 2017 13:02:42 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-Alc_alcConfig_c,v 1.4 2017/11/15 13:02:42 sthen Exp $ -Index: Alc/alcConfig.c Alc/alcConfig.c.orig -+++ Alc/alcConfig.c -@@ -353,7 +353,7 @@ void ReadALConfig(void) - const char *str; - FILE *f; - --str = "/etc/open
Re: [UPDATE] audio/openal 1.19.0 with sndio capture support
On Sat, Sep 08, 2018 at 06:27:52PM +0100, David CARLIER wrote: > Hi, > > When I tried to apply your patch, it fails for PLIST ... makefile and so > on > What? That's impossible, I assume that your local repo copy is up to date and you're running patch(1) in ports/audio/openal directory, not anywhere else: $ cd somewhere $ cvs -d anoncvs@your.favourite.mirror:/cvs co ports/audio/openal $ cd ports/audio/openal $ patch -i /path/to/openal.patch Please tell me the steps you have done when you applied my diff.
Re: [UPDATE] audio/openal
Committed, thanks. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] audio/openal
> I have only tested openal-info. Does the diff below work for you? Thanks, the diff works. The original problem with fs2open is solved and the sound is now actually working. Needs a little bit more polish, but port should be ready soon. Thanks jca@ and also David for bringing it up here! > > > Index: Makefile > === > RCS file: /cvs/ports/audio/openal/Makefile,v > retrieving revision 1.49 > diff -u -p -r1.49 Makefile > --- Makefile 15 Nov 2017 13:02:42 - 1.49 > +++ Makefile 28 Dec 2017 03:43:49 - > @@ -10,6 +10,7 @@ DISTNAME = openal-soft-$V > PKGNAME =openal-$V > CATEGORIES = audio > SHARED_LIBS =openal 3.0 > +REVISION = 0 > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > Index: patches/patch-Alc_ALc_c > === > RCS file: patches/patch-Alc_ALc_c > diff -N patches/patch-Alc_ALc_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-Alc_ALc_c 28 Dec 2017 03:43:49 - > @@ -0,0 +1,35 @@ > +$OpenBSD$ > + > +commit d1e98c36d375433cb11a7a74ce20c968491773aa > +Author: Chris Robinson > +Date: Sat Apr 30 17:14:55 2016 -0700 > + > +Don't crash when there's no backend to probe > + > +Index: Alc/ALc.c > +--- Alc/ALc.c.orig > Alc/ALc.c > +@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) > + V0(factory,init)(); > + } > + > ++if(!PlaybackBackend.name) > ++WARN("No playback backend available!\n"); > ++if(!CaptureBackend.name) > ++WARN("No capture backend available!\n"); > ++ > + if(ConfigValueStr(NULL, NULL, "excludefx", &str)) > + { > + size_t len; > +@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe > + LockLists(); > + al_string_clear(list); > + > +-if(!backendinfo->getFactory) > ++if(backendinfo->Probe) > + backendinfo->Probe(type); > +-else > ++else if(backendinfo->getFactory) > + { > + ALCbackendFactory *factory = backendinfo->getFactory(); > + V(factory,probe)(type); > > > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE >
Re: [UPDATE] audio/openal
Works for me thanks. On 28 December 2017 at 03:54, Jeremie Courreges-Anglas wrote: > > On Sun, Dec 24 2017, David CARLIER wrote: > > On 24 December 2017 at 00:25, Jeremie Courreges-Anglas > > wrote: > > > >> On Sat, Dec 23 2017, David CARLIER wrote: > >> > Hi, > >> > > >> > Due to lot of gaming porting efforts these days :-), > >> > here a little diff for openal just a fix to avoid probing non existent > >> > capture handling (in the sndio backend). > >> > >> Could you please describe in more details the problem and why you chose > >> to fix it this way? I don't know much about OpenAL, but it's not > >> obvious to me why you're modifying what looks like backend-agnostic code > >> to fix a problem in sndio support. > > > Sure. In fact our sndio backend does not have capture handling thus > > trying to probe it in this case would cause a segfault in case a software > > would require it. > > Noted by thrfw while porting fs2open recently. > > OK so it turns out this is easily reachable from openal-info. egdb > backtrace with DEBUG='-g -O0': > > --8<-- > Reading symbols from openal-info...done. > (gdb) r > Starting program: /usr/local/bin/openal-info > Available playback devices: > SndIO Default > Available capture devices: > > Program received signal SIGSEGV, Segmentation fault. > 0x in ?? () > (gdb) bt > #0 0x in ?? () > #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0 > , backendinfo=0x1f9f91b0338 , > type=CAPTURE_DEVICE_PROBE) > at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234 > #2 0x01f9f8f4948c in ProbeCaptureDeviceList () at > /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1246 > #3 0x01f9f8f491e5 in alcGetString (Device=0x0, param=784) at > /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:2617 > #4 0x01f6fae0078b in main (argc=1, argv=0x7f7e1a08) at > /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/utils/openal-info.c:299 > (gdb) frame 1 > #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0 > , backendinfo=0x1f9f91b0338 , > type=CAPTURE_DEVICE_PROBE) > at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234 > 1234backendinfo->Probe(type); > (gdb) p backendinfo > $2 = (struct BackendInfo *) 0x1f9f91b0338 > (gdb) p *backendinfo > $3 = {name = 0x0, getFactory = 0x0, Init = 0x0, Deinit = 0x0, Probe = 0x0, > Funcs = {OpenPlayback = 0x0, ClosePlayback = 0x0, ResetPlayback = 0x0, > StartPlayback = 0x0, StopPlayback = 0x0, OpenCapture = 0x0, > CloseCapture = 0x0, StartCapture = 0x0, StopCapture = 0x0, > CaptureSamples = 0x0, AvailableSamples = 0x0}} > (gdb) > -->8-- > > Indeed the CaptureBackend is not initialized and obviously shouldn't be > used, but your diff disables all probing: > > ritchie /usr/ports/audio/openal$ openal-info > Available playback devices: > !!! none !!! > Available capture devices: > !!! none !!! > Default playback device: > Default capture device: > ALC version: 1.1 > [...] > > Upstream has already fixed this issue: > > https://github.com/kcat/openal-soft/commit/ > d1e98c36d375433cb11a7a74ce20c968491773aa > > ritchie /usr/ports/audio/openal$ openal-info > Available playback devices: > SndIO Default > Available capture devices: > !!! none !!! > Default playback device: SndIO Default > Default capture device: > ALC version: 1.1 > [...] > > I have only tested openal-info. Does the diff below work for you? > > > Index: Makefile > === > RCS file: /cvs/ports/audio/openal/Makefile,v > retrieving revision 1.49 > diff -u -p -r1.49 Makefile > --- Makefile15 Nov 2017 13:02:42 - 1.49 > +++ Makefile28 Dec 2017 03:43:49 - > @@ -10,6 +10,7 @@ DISTNAME =openal-soft-$V > PKGNAME = openal-$V > CATEGORIES = audio > SHARED_LIBS = openal 3.0 > +REVISION = 0 > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > Index: patches/patch-Alc_ALc_c > === > RCS file: patches/patch-Alc_ALc_c > diff -N patches/patch-Alc_ALc_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-Alc_ALc_c 28 Dec 2017 03:43:49 - > @@ -0,0 +1,35 @@ > +$OpenBSD$ > + > +commit d1e98c36d375433cb11a7a74ce20c968491773aa > +Author: Chris Robinson > +Date: Sat Apr 30 17:14:55 2016 -0700 > + > +Don't crash when there's no backend to probe > + > +Index: Alc/ALc.c > +--- Alc/ALc.c.orig > Alc/ALc.c > +@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) > + V0(factory,init)(); > + } > + > ++if(!PlaybackBackend.name) > ++WARN("No playback backend available!\n"); > ++if(!CaptureBackend.name) > ++WARN("No capture backend available!\n"); > ++ > + if(ConfigValueStr(NULL, NULL, "excludefx", &str)) > + { > + size_t len; > +@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct > Backe >
Re: [UPDATE] audio/openal
On Sun, Dec 24 2017, David CARLIER wrote: > On 24 December 2017 at 00:25, Jeremie Courreges-Anglas > wrote: > >> On Sat, Dec 23 2017, David CARLIER wrote: >> > Hi, >> > >> > Due to lot of gaming porting efforts these days :-), >> > here a little diff for openal just a fix to avoid probing non existent >> > capture handling (in the sndio backend). >> >> Could you please describe in more details the problem and why you chose >> to fix it this way? I don't know much about OpenAL, but it's not >> obvious to me why you're modifying what looks like backend-agnostic code >> to fix a problem in sndio support. > Sure. In fact our sndio backend does not have capture handling thus > trying to probe it in this case would cause a segfault in case a software > would require it. > Noted by thrfw while porting fs2open recently. OK so it turns out this is easily reachable from openal-info. egdb backtrace with DEBUG='-g -O0': --8<-- Reading symbols from openal-info...done. (gdb) r Starting program: /usr/local/bin/openal-info Available playback devices: SndIO Default Available capture devices: Program received signal SIGSEGV, Segmentation fault. 0x in ?? () (gdb) bt #0 0x in ?? () #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0 , backendinfo=0x1f9f91b0338 , type=CAPTURE_DEVICE_PROBE) at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234 #2 0x01f9f8f4948c in ProbeCaptureDeviceList () at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1246 #3 0x01f9f8f491e5 in alcGetString (Device=0x0, param=784) at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:2617 #4 0x01f6fae0078b in main (argc=1, argv=0x7f7e1a08) at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/utils/openal-info.c:299 (gdb) frame 1 #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0 , backendinfo=0x1f9f91b0338 , type=CAPTURE_DEVICE_PROBE) at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234 1234backendinfo->Probe(type); (gdb) p backendinfo $2 = (struct BackendInfo *) 0x1f9f91b0338 (gdb) p *backendinfo $3 = {name = 0x0, getFactory = 0x0, Init = 0x0, Deinit = 0x0, Probe = 0x0, Funcs = {OpenPlayback = 0x0, ClosePlayback = 0x0, ResetPlayback = 0x0, StartPlayback = 0x0, StopPlayback = 0x0, OpenCapture = 0x0, CloseCapture = 0x0, StartCapture = 0x0, StopCapture = 0x0, CaptureSamples = 0x0, AvailableSamples = 0x0}} (gdb) -->8-- Indeed the CaptureBackend is not initialized and obviously shouldn't be used, but your diff disables all probing: ritchie /usr/ports/audio/openal$ openal-info Available playback devices: !!! none !!! Available capture devices: !!! none !!! Default playback device: Default capture device: ALC version: 1.1 [...] Upstream has already fixed this issue: https://github.com/kcat/openal-soft/commit/d1e98c36d375433cb11a7a74ce20c968491773aa ritchie /usr/ports/audio/openal$ openal-info Available playback devices: SndIO Default Available capture devices: !!! none !!! Default playback device: SndIO Default Default capture device: ALC version: 1.1 [...] I have only tested openal-info. Does the diff below work for you? Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.49 diff -u -p -r1.49 Makefile --- Makefile15 Nov 2017 13:02:42 - 1.49 +++ Makefile28 Dec 2017 03:43:49 - @@ -10,6 +10,7 @@ DISTNAME =openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio SHARED_LIBS = openal 3.0 +REVISION = 0 HOMEPAGE = http://kcat.strangesoft.net/openal.html Index: patches/patch-Alc_ALc_c === RCS file: patches/patch-Alc_ALc_c diff -N patches/patch-Alc_ALc_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-Alc_ALc_c 28 Dec 2017 03:43:49 - @@ -0,0 +1,35 @@ +$OpenBSD$ + +commit d1e98c36d375433cb11a7a74ce20c968491773aa +Author: Chris Robinson +Date: Sat Apr 30 17:14:55 2016 -0700 + +Don't crash when there's no backend to probe + +Index: Alc/ALc.c +--- Alc/ALc.c.orig Alc/ALc.c +@@ -1117,6 +1117,11 @@ static void alc_initconfig(void) + V0(factory,init)(); + } + ++if(!PlaybackBackend.name) ++WARN("No playback backend available!\n"); ++if(!CaptureBackend.name) ++WARN("No capture backend available!\n"); ++ + if(ConfigValueStr(NULL, NULL, "excludefx", &str)) + { + size_t len; +@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe + LockLists(); + al_string_clear(list); + +-if(!backendinfo->getFactory) ++if(backendinfo->Probe) + backendinfo->Probe(type); +-else ++else if(backendinfo->getFactory) + { + ALCbackendFactory *factory = backendinfo->getFactory(); + V(factory,probe)(type); -- jca | PGP : 0x1524E7EE / 513
Re: [UPDATE] audio/openal
I tried couple of softwares before sending but would be kind if anyone tried a bit as well with this patch. Kind Regards. On 24 December 2017 at 09:03, David CARLIER wrote: > Sure. In fact our sndio backend does not have capture handling thus > trying to probe it in this case would cause a segfault in case a software > would require it. > Noted by thrfw while porting fs2open recently. > > > > On 24 December 2017 at 00:25, Jeremie Courreges-Anglas > wrote: > >> On Sat, Dec 23 2017, David CARLIER wrote: >> > Hi, >> > >> > Due to lot of gaming porting efforts these days :-), >> > here a little diff for openal just a fix to avoid probing non existent >> > capture handling (in the sndio backend). >> >> Could you please describe in more details the problem and why you chose >> to fix it this way? I don't know much about OpenAL, but it's not >> obvious to me why you're modifying what looks like backend-agnostic code >> to fix a problem in sndio support. >> >> -- >> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 >> E7EE >> > >
Re: [UPDATE] audio/openal
Sure. In fact our sndio backend does not have capture handling thus trying to probe it in this case would cause a segfault in case a software would require it. Noted by thrfw while porting fs2open recently. On 24 December 2017 at 00:25, Jeremie Courreges-Anglas wrote: > On Sat, Dec 23 2017, David CARLIER wrote: > > Hi, > > > > Due to lot of gaming porting efforts these days :-), > > here a little diff for openal just a fix to avoid probing non existent > > capture handling (in the sndio backend). > > Could you please describe in more details the problem and why you chose > to fix it this way? I don't know much about OpenAL, but it's not > obvious to me why you're modifying what looks like backend-agnostic code > to fix a problem in sndio support. > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE >
Re: [UPDATE] audio/openal
On Sat, Dec 23 2017, David CARLIER wrote: > Hi, > > Due to lot of gaming porting efforts these days :-), > here a little diff for openal just a fix to avoid probing non existent > capture handling (in the sndio backend). Could you please describe in more details the problem and why you chose to fix it this way? I don't know much about OpenAL, but it's not obvious to me why you're modifying what looks like backend-agnostic code to fix a problem in sndio support. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update: audio/openal
ping. On 30 October 2017 at 14:43, David CARLIER wrote: > Another diff updated. Thanks for feedback. > > On 30 October 2017 at 08:12, Rafael Sadowski > wrote: > >> On Mon Oct 30, 2017 at 08:07:07AM +, David CARLIER wrote: >> > Here an an updated version. >> > >> > Kind regards. >> > >> > On 30 October 2017 at 07:27, Rafael Sadowski >> wrote: >> > >> > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: >> > > > Hi, >> > > > >> > > > there is a small update of this port. >> > > > >> > > > Hope it s good. >> > > > >> > > > Regards. >> > > >> > > Some comments below. >> > > >> > > make configure: >> > > >> > > CMake Warning: >> > > Manually-specified variables were not used by the project: >> > > >> > > ALSOFT_BACKEND_ALSA >> > > ALSOFT_BACKEND_COREAUDIO >> > > ALSOFT_BACKEND_DSOUND >> > > ALSOFT_BACKEND_MMDEVAPI >> > > ALSOFT_BACKEND_OPENSL >> > > ALSOFT_BACKEND_OSS >> > > ALSOFT_BACKEND_PORTAUDIO >> > > ALSOFT_BACKEND_QSA >> > > ALSOFT_BACKEND_WINMM >> > > ALSOFT_CONFIG_DESTINATION >> > > ALSOFT_SYSCONFDIR >> > > >> > > and CMake fetch Qt4, what we should try to avoid. >> > > >> > > COMPILER = clang gcc >> > > # clang fails on those architectures >> > > MODGCC4_ARCHS = sparc64 powerpc >> > > MODCLANG_ARCHS =aarch64 amd64 arm i386 mips64 mips64el >> > > >> > > can be replaced with: >> > > >> > > COMPILER = base-clang ports-clang ports-gcc >> > > >> > > >> >> > Index: Makefile >> > === >> > RCS file: /cvs/ports/audio/openal/Makefile,v >> > retrieving revision 1.48 >> > diff -u -p -r1.48 Makefile >> > --- Makefile 18 Aug 2017 12:47:58 - 1.48 >> > +++ Makefile 30 Oct 2017 08:06:00 - >> > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s >> > >> > COMMENT =cross-platform 3D audio API >> > >> > -V = 1.16.0 >> > +V = 1.17.2 >> > EPOCH = 0 >> > DISTNAME = openal-soft-$V >> > PKGNAME =openal-$V >> > CATEGORIES = audio >> > -SHARED_LIBS =openal 2.2 >> > -REVISION = 1 >> > +SHARED_LIBS =openal 3.0 >> > >> > HOMEPAGE = http://kcat.strangesoft.net/openal.html >> > >> > @@ -25,33 +24,18 @@ MASTER_SITES =${HOMEPAGE:S,.html,-relea >> > EXTRACT_SUFX = .tar.bz2 >> > >> > CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ >> > - -DALSOFT_SYSCONFDIR=${SYSCONFDIR} \ >> > - -DALSOFT_CONFIG_DESTINATION=share/examples/openal \ >> > + -DALSOFT_CONFIG=share/examples/openal \ >> > -DALSOFT_DLOPEN=Off \ >> > -DALSOFT_UTILS=On \ >> > -DALSOFT_EXAMPLES=Off \ >> > -DALSOFT_REQUIRE_SNDIO=On \ >> > - -DALSOFT_BACKEND_ALSA=Off \ >> > - -DALSOFT_BACKEND_COREAUDIO=Off \ >> > - -DALSOFT_BACKEND_DSOUND=Off \ >> > - -DALSOFT_BACKEND_JACK=Off \ >> > - -DALSOFT_BACKEND_MMDEVAPI=Off \ >> > - -DALSOFT_BACKEND_OPENSL=Off \ >> > - -DALSOFT_BACKEND_OSS=Off \ >> > - -DALSOFT_BACKEND_PORTAUDIO=Off \ >> > - -DALSOFT_BACKEND_PULSEAUDIO=Off \ >> > - -DALSOFT_BACKEND_QSA=Off \ >> > -DALSOFT_BACKEND_SOLARIS=Off \ >> > - -DALSOFT_BACKEND_WAVE=Off \ >> > - -DALSOFT_BACKEND_WINMM=Off \ >> > + -DALSOFT_BACKEND_PULSEAUDIO=Off \ >> > -DALSOFT_NO_CONFIG_UTIL=On >> > >> This is too easy! We want to avoid using these libs. CMake searches for >> them during the configuration and that's to be prevented. >> >> >
Re: update: audio/openal
Another diff updated. Thanks for feedback. On 30 October 2017 at 08:12, Rafael Sadowski wrote: > On Mon Oct 30, 2017 at 08:07:07AM +, David CARLIER wrote: > > Here an an updated version. > > > > Kind regards. > > > > On 30 October 2017 at 07:27, Rafael Sadowski > wrote: > > > > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > > > Hi, > > > > > > > > there is a small update of this port. > > > > > > > > Hope it s good. > > > > > > > > Regards. > > > > > > Some comments below. > > > > > > make configure: > > > > > > CMake Warning: > > > Manually-specified variables were not used by the project: > > > > > > ALSOFT_BACKEND_ALSA > > > ALSOFT_BACKEND_COREAUDIO > > > ALSOFT_BACKEND_DSOUND > > > ALSOFT_BACKEND_MMDEVAPI > > > ALSOFT_BACKEND_OPENSL > > > ALSOFT_BACKEND_OSS > > > ALSOFT_BACKEND_PORTAUDIO > > > ALSOFT_BACKEND_QSA > > > ALSOFT_BACKEND_WINMM > > > ALSOFT_CONFIG_DESTINATION > > > ALSOFT_SYSCONFDIR > > > > > > and CMake fetch Qt4, what we should try to avoid. > > > > > > COMPILER = clang gcc > > > # clang fails on those architectures > > > MODGCC4_ARCHS = sparc64 powerpc > > > MODCLANG_ARCHS =aarch64 amd64 arm i386 mips64 mips64el > > > > > > can be replaced with: > > > > > > COMPILER = base-clang ports-clang ports-gcc > > > > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/audio/openal/Makefile,v > > retrieving revision 1.48 > > diff -u -p -r1.48 Makefile > > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > > +++ Makefile 30 Oct 2017 08:06:00 - > > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > > > COMMENT =cross-platform 3D audio API > > > > -V = 1.16.0 > > +V = 1.17.2 > > EPOCH = 0 > > DISTNAME = openal-soft-$V > > PKGNAME =openal-$V > > CATEGORIES = audio > > -SHARED_LIBS =openal 2.2 > > -REVISION = 1 > > +SHARED_LIBS =openal 3.0 > > > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > > > @@ -25,33 +24,18 @@ MASTER_SITES =${HOMEPAGE:S,.html,-relea > > EXTRACT_SUFX = .tar.bz2 > > > > CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ > > - -DALSOFT_SYSCONFDIR=${SYSCONFDIR} \ > > - -DALSOFT_CONFIG_DESTINATION=share/examples/openal \ > > + -DALSOFT_CONFIG=share/examples/openal \ > > -DALSOFT_DLOPEN=Off \ > > -DALSOFT_UTILS=On \ > > -DALSOFT_EXAMPLES=Off \ > > -DALSOFT_REQUIRE_SNDIO=On \ > > - -DALSOFT_BACKEND_ALSA=Off \ > > - -DALSOFT_BACKEND_COREAUDIO=Off \ > > - -DALSOFT_BACKEND_DSOUND=Off \ > > - -DALSOFT_BACKEND_JACK=Off \ > > - -DALSOFT_BACKEND_MMDEVAPI=Off \ > > - -DALSOFT_BACKEND_OPENSL=Off \ > > - -DALSOFT_BACKEND_OSS=Off \ > > - -DALSOFT_BACKEND_PORTAUDIO=Off \ > > - -DALSOFT_BACKEND_PULSEAUDIO=Off \ > > - -DALSOFT_BACKEND_QSA=Off \ > > -DALSOFT_BACKEND_SOLARIS=Off \ > > - -DALSOFT_BACKEND_WAVE=Off \ > > - -DALSOFT_BACKEND_WINMM=Off \ > > + -DALSOFT_BACKEND_PULSEAUDIO=Off \ > > -DALSOFT_NO_CONFIG_UTIL=On > > > This is too easy! We want to avoid using these libs. CMake searches for > them during the configuration and that's to be prevented. > > Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- Makefile18 Aug 2017 12:47:58 - 1.48 +++ Makefile30 Oct 2017 09:21:23 - @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s COMMENT = cross-platform 3D audio API -V =1.16.0 +V =1.17.2 EPOCH =0 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 2.2 -REVISION = 1 +SHARED_LIBS = openal 3.0 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -25,33 +24,28 @@ MASTER_SITES = ${HOMEPAGE:S,.html,-relea EXTRACT_SUFX = .tar.bz2 CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ - -DALSOFT_SYSCONFDIR=${SYSCONFDIR} \ - -DALSOFT_CONFIG_DESTINATION=share/examples/openal \ + -DALSOFT_CONFIG=share/examples/openal \ -DALSOFT_DLOPEN=Off \ -DALSOFT_UTILS=On \ -DALSOFT_EXAMPLES=Off \ -DALSOFT_REQUIRE_SNDIO=On \ - -DALSOFT_BACKEND_ALSA=Off \ - -DALSOFT_BACKEND_COREAUDIO=Off \ - -DALSOFT_BACKEND_DSOUND=Off \ - -DALSOFT_BACKEND_JACK=Off \ - -DALSOFT_BACKEND_MMDEVAPI=Off \ - -DALSOFT_BACKEND_OPENSL=Off \ - -DALSOFT_BACKEND_OSS=Off \ - -DALSOFT_BACKEND_PORTAUDIO=Off \ -
Re: update: audio/openal
On Mon Oct 30, 2017 at 08:07:07AM +, David CARLIER wrote: > Here an an updated version. > > Kind regards. > > On 30 October 2017 at 07:27, Rafael Sadowski wrote: > > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > > Hi, > > > > > > there is a small update of this port. > > > > > > Hope it s good. > > > > > > Regards. > > > > Some comments below. > > > > make configure: > > > > CMake Warning: > > Manually-specified variables were not used by the project: > > > > ALSOFT_BACKEND_ALSA > > ALSOFT_BACKEND_COREAUDIO > > ALSOFT_BACKEND_DSOUND > > ALSOFT_BACKEND_MMDEVAPI > > ALSOFT_BACKEND_OPENSL > > ALSOFT_BACKEND_OSS > > ALSOFT_BACKEND_PORTAUDIO > > ALSOFT_BACKEND_QSA > > ALSOFT_BACKEND_WINMM > > ALSOFT_CONFIG_DESTINATION > > ALSOFT_SYSCONFDIR > > > > and CMake fetch Qt4, what we should try to avoid. > > > > COMPILER = clang gcc > > # clang fails on those architectures > > MODGCC4_ARCHS = sparc64 powerpc > > MODCLANG_ARCHS =aarch64 amd64 arm i386 mips64 mips64el > > > > can be replaced with: > > > > COMPILER = base-clang ports-clang ports-gcc > > > > > Index: Makefile > === > RCS file: /cvs/ports/audio/openal/Makefile,v > retrieving revision 1.48 > diff -u -p -r1.48 Makefile > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > +++ Makefile 30 Oct 2017 08:06:00 - > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > COMMENT =cross-platform 3D audio API > > -V = 1.16.0 > +V = 1.17.2 > EPOCH = 0 > DISTNAME = openal-soft-$V > PKGNAME =openal-$V > CATEGORIES = audio > -SHARED_LIBS =openal 2.2 > -REVISION = 1 > +SHARED_LIBS =openal 3.0 > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > @@ -25,33 +24,18 @@ MASTER_SITES =${HOMEPAGE:S,.html,-relea > EXTRACT_SUFX = .tar.bz2 > > CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ > - -DALSOFT_SYSCONFDIR=${SYSCONFDIR} \ > - -DALSOFT_CONFIG_DESTINATION=share/examples/openal \ > + -DALSOFT_CONFIG=share/examples/openal \ > -DALSOFT_DLOPEN=Off \ > -DALSOFT_UTILS=On \ > -DALSOFT_EXAMPLES=Off \ > -DALSOFT_REQUIRE_SNDIO=On \ > - -DALSOFT_BACKEND_ALSA=Off \ > - -DALSOFT_BACKEND_COREAUDIO=Off \ > - -DALSOFT_BACKEND_DSOUND=Off \ > - -DALSOFT_BACKEND_JACK=Off \ > - -DALSOFT_BACKEND_MMDEVAPI=Off \ > - -DALSOFT_BACKEND_OPENSL=Off \ > - -DALSOFT_BACKEND_OSS=Off \ > - -DALSOFT_BACKEND_PORTAUDIO=Off \ > - -DALSOFT_BACKEND_PULSEAUDIO=Off \ > - -DALSOFT_BACKEND_QSA=Off \ > -DALSOFT_BACKEND_SOLARIS=Off \ > - -DALSOFT_BACKEND_WAVE=Off \ > - -DALSOFT_BACKEND_WINMM=Off \ > + -DALSOFT_BACKEND_PULSEAUDIO=Off \ > -DALSOFT_NO_CONFIG_UTIL=On > This is too easy! We want to avoid using these libs. CMake searches for them during the configuration and that's to be prevented.
Re: update: audio/openal
Here an an updated version. Kind regards. On 30 October 2017 at 07:27, Rafael Sadowski wrote: > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > Hi, > > > > there is a small update of this port. > > > > Hope it s good. > > > > Regards. > > Some comments below. > > make configure: > > CMake Warning: > Manually-specified variables were not used by the project: > > ALSOFT_BACKEND_ALSA > ALSOFT_BACKEND_COREAUDIO > ALSOFT_BACKEND_DSOUND > ALSOFT_BACKEND_MMDEVAPI > ALSOFT_BACKEND_OPENSL > ALSOFT_BACKEND_OSS > ALSOFT_BACKEND_PORTAUDIO > ALSOFT_BACKEND_QSA > ALSOFT_BACKEND_WINMM > ALSOFT_CONFIG_DESTINATION > ALSOFT_SYSCONFDIR > > and CMake fetch Qt4, what we should try to avoid. > > COMPILER = clang gcc > # clang fails on those architectures > MODGCC4_ARCHS = sparc64 powerpc > MODCLANG_ARCHS =aarch64 amd64 arm i386 mips64 mips64el > > can be replaced with: > > COMPILER = base-clang ports-clang ports-gcc > > Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- Makefile18 Aug 2017 12:47:58 - 1.48 +++ Makefile30 Oct 2017 08:06:00 - @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s COMMENT = cross-platform 3D audio API -V =1.16.0 +V =1.17.2 EPOCH =0 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 2.2 -REVISION = 1 +SHARED_LIBS = openal 3.0 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -25,33 +24,18 @@ MASTER_SITES = ${HOMEPAGE:S,.html,-relea EXTRACT_SUFX = .tar.bz2 CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ - -DALSOFT_SYSCONFDIR=${SYSCONFDIR} \ - -DALSOFT_CONFIG_DESTINATION=share/examples/openal \ + -DALSOFT_CONFIG=share/examples/openal \ -DALSOFT_DLOPEN=Off \ -DALSOFT_UTILS=On \ -DALSOFT_EXAMPLES=Off \ -DALSOFT_REQUIRE_SNDIO=On \ - -DALSOFT_BACKEND_ALSA=Off \ - -DALSOFT_BACKEND_COREAUDIO=Off \ - -DALSOFT_BACKEND_DSOUND=Off \ - -DALSOFT_BACKEND_JACK=Off \ - -DALSOFT_BACKEND_MMDEVAPI=Off \ - -DALSOFT_BACKEND_OPENSL=Off \ - -DALSOFT_BACKEND_OSS=Off \ - -DALSOFT_BACKEND_PORTAUDIO=Off \ - -DALSOFT_BACKEND_PULSEAUDIO=Off \ - -DALSOFT_BACKEND_QSA=Off \ -DALSOFT_BACKEND_SOLARIS=Off \ - -DALSOFT_BACKEND_WAVE=Off \ - -DALSOFT_BACKEND_WINMM=Off \ + -DALSOFT_BACKEND_PULSEAUDIO=Off \ -DALSOFT_NO_CONFIG_UTIL=On MODULES = devel/cmake -COMPILER = clang gcc -# clang fails on those architectures -MODGCC4_ARCHS =sparc64 powerpc -MODCLANG_ARCHS = aarch64 amd64 arm i386 mips64 mips64el +COMPILER = base-clang ports-clang ports-gcc SEPARATE_BUILD =Yes NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/audio/openal/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo3 Nov 2016 10:27:15 - 1.9 +++ distinfo30 Oct 2017 08:06:00 - @@ -1,2 +1,2 @@ -SHA256 (openal-soft-1.16.0.tar.bz2) = Lz3NMT/iY5EoT7+FloY3I/mcZdbGhG3MtI55ytr0DV8= -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 +SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ= +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 Index: patches/patch-Alc_alcConfig_c === RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-Alc_alcConfig_c --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - 1.3 +++ patches/patch-Alc_alcConfig_c 30 Oct 2017 08:06:00 - @@ -1,7 +1,8 @@ $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper Exp $ Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 -+++ Alc/alcConfig.cSun Sep 4 22:48:18 2016 -@@ -326,7 +326,7 @@ void ReadALConfig(void) +Index: Alc/alcConfig.c +--- Alc/alcConfig.c.orig Alc/alcConfig.c +@@ -353,7 +353,7 @@ void ReadALConfig(void) const char *str; FILE *f; Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v retrieving revision 1.6 diff -u -p -r1.6 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt3 Nov 2016 10:27:15 - 1.6 +++ patches/patch-CMakeLists_txt30 Oct 2017 08:06:00 - @@ -1,21 +1,34 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper Exp $ CMakeLists.txt.origFri Aug 15 08:06:59 2014 -
Re: update: audio/openal
On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > Hi, > > there is a small update of this port. > > Hope it s good. > > Regards. Some comments below. make configure: CMake Warning: Manually-specified variables were not used by the project: ALSOFT_BACKEND_ALSA ALSOFT_BACKEND_COREAUDIO ALSOFT_BACKEND_DSOUND ALSOFT_BACKEND_MMDEVAPI ALSOFT_BACKEND_OPENSL ALSOFT_BACKEND_OSS ALSOFT_BACKEND_PORTAUDIO ALSOFT_BACKEND_QSA ALSOFT_BACKEND_WINMM ALSOFT_CONFIG_DESTINATION ALSOFT_SYSCONFDIR and CMake fetch Qt4, what we should try to avoid. COMPILER = clang gcc # clang fails on those architectures MODGCC4_ARCHS = sparc64 powerpc MODCLANG_ARCHS =aarch64 amd64 arm i386 mips64 mips64el can be replaced with: COMPILER = base-clang ports-clang ports-gcc
Re: update: audio/openal
ports build tested. Seems ok. Regards. On 26 October 2017 at 09:34, David CARLIER wrote: > Fair point. I ll try whenever I get the chance this week. Cheers. > > On 26 October 2017 at 09:30, Rafael Sadowski > wrote: > >> On Thu Oct 26, 2017 at 09:26:18AM +0100, David CARLIER wrote: >> > Not all but couple of video games :-) >> > >> >> That's okay but you have to make sure all consumers are bulding with the >> new version. >> >> > On 26 October 2017 at 08:33, Rafael Sadowski >> wrote: >> > >> > > Did you test your diff with all consumers? >> > > >> > > audio/freealut >> > > emulators/fs-uae >> > > emulators/retroarch >> > > games/0ad/base >> > > games/astromenace >> > > games/dhewm3 >> > > games/dustrac >> > > games/gemrb >> > > games/ioquake3 >> > > games/irrlamb >> > > games/love >> > > games/lugaru >> > > games/lwjgl >> > > games/megaglest/base >> > > games/minetest >> > > games/openmw >> > > games/scorched3d >> > > games/solarus >> > > games/spacezero >> > > games/speeddreams >> > > games/supertux >> > > games/supertuxkart >> > > games/taisei >> > > games/tome4 >> > > games/ufoai/base >> > > games/valyriatear >> > > games/vegastrike/engine >> > > games/warzone2100 >> > > games/yquake2 >> > > graphics/blender >> > > graphics/simgear >> > > multimedia/sfml >> > > x11/kde4/libkdegames >> > > x11/qt5/qtmultimedia >> > > >> > > Your diff itself looks good to me. >> > > >> > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: >> > > > Hi, >> > > > >> > > > there is a small update of this port. >> > > > >> > > > Hope it s good. >> > > > >> > > > Regards. >> > > >> > > > Index: Makefile >> > > > === >> > > > RCS file: /cvs/ports/audio/openal/Makefile,v >> > > > retrieving revision 1.48 >> > > > diff -u -p -r1.48 Makefile >> > > > --- Makefile 18 Aug 2017 12:47:58 - 1.48 >> > > > +++ Makefile 13 Oct 2017 21:54:17 - >> > > > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s >> > > > >> > > > COMMENT =cross-platform 3D audio API >> > > > >> > > > -V = 1.16.0 >> > > > +V = 1.17.2 >> > > > EPOCH = 0 >> > > > DISTNAME = openal-soft-$V >> > > > PKGNAME =openal-$V >> > > > CATEGORIES = audio >> > > > -SHARED_LIBS =openal 2.2 >> > > > -REVISION = 1 >> > > > +SHARED_LIBS =openal 3.0 >> > > > >> > > > HOMEPAGE = http://kcat.strangesoft.net/openal.html >> > > > >> > > > Index: distinfo >> > > > === >> > > > RCS file: /cvs/ports/audio/openal/distinfo,v >> > > > retrieving revision 1.9 >> > > > diff -u -p -r1.9 distinfo >> > > > --- distinfo 3 Nov 2016 10:27:15 - 1.9 >> > > > +++ distinfo 13 Oct 2017 21:54:17 - >> > > > @@ -1,2 +1,2 @@ >> > > > -SHA256 (openal-soft-1.16.0.tar.bz2) = Lz3NMT/iY5EoT7+FloY3I/ >> > > mcZdbGhG3MtI55ytr0DV8= >> > > > -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 >> > > > +SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/ >> > > GOwGZY4aFgao7Mi7wrMxQ= >> > > > +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 >> > > > Index: patches/patch-Alc_alcConfig_c >> > > > === >> > > > RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v >> > > > retrieving revision 1.3 >> > > > diff -u -p -r1.3 patch-Alc_alcConfig_c >> > > > --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - >>1.3 >> > > > +++ patches/patch-Alc_alcConfig_c 13 Oct 2017 21:54:17 - >> > > > @@ -1,7 +1,8 @@ >> > > > $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper >> Exp $ >> > > > Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 >> > > > -+++ Alc/alcConfig.c Sun Sep 4 22:48:18 2016 >> > > > -@@ -326,7 +326,7 @@ void ReadALConfig(void) >> > > > +Index: Alc/alcConfig.c >> > > > +--- Alc/alcConfig.c.orig >> > > > Alc/alcConfig.c >> > > > +@@ -353,7 +353,7 @@ void ReadALConfig(void) >> > > > const char *str; >> > > > FILE *f; >> > > > >> > > > Index: patches/patch-CMakeLists_txt >> > > > === >> > > > RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v >> > > > retrieving revision 1.6 >> > > > diff -u -p -r1.6 patch-CMakeLists_txt >> > > > --- patches/patch-CMakeLists_txt 3 Nov 2016 10:27:15 - >>1.6 >> > > > +++ patches/patch-CMakeLists_txt 13 Oct 2017 21:54:17 - >> > > > @@ -1,21 +1,13 @@ >> > > > $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper >> Exp $ >> > > > CMakeLists.txt.orig Fri Aug 15 08:06:59 2014 >> > > > -+++ CMakeLists.txt Sun Sep 4 22:58:36 2016 >> > > > -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) >> > > > - # Check if we have C11 _Atomic >> > > > - CHECK_C_SOURCE_COMPILES( >> > > > - "#include >> > > > -- int _Atomic foo; >> > > > -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); >> > > > - int main() >> > > > -
Re: update: audio/openal
Fair point. I ll try whenever I get the chance this week. Cheers. On 26 October 2017 at 09:30, Rafael Sadowski wrote: > On Thu Oct 26, 2017 at 09:26:18AM +0100, David CARLIER wrote: > > Not all but couple of video games :-) > > > > That's okay but you have to make sure all consumers are bulding with the > new version. > > > On 26 October 2017 at 08:33, Rafael Sadowski > wrote: > > > > > Did you test your diff with all consumers? > > > > > > audio/freealut > > > emulators/fs-uae > > > emulators/retroarch > > > games/0ad/base > > > games/astromenace > > > games/dhewm3 > > > games/dustrac > > > games/gemrb > > > games/ioquake3 > > > games/irrlamb > > > games/love > > > games/lugaru > > > games/lwjgl > > > games/megaglest/base > > > games/minetest > > > games/openmw > > > games/scorched3d > > > games/solarus > > > games/spacezero > > > games/speeddreams > > > games/supertux > > > games/supertuxkart > > > games/taisei > > > games/tome4 > > > games/ufoai/base > > > games/valyriatear > > > games/vegastrike/engine > > > games/warzone2100 > > > games/yquake2 > > > graphics/blender > > > graphics/simgear > > > multimedia/sfml > > > x11/kde4/libkdegames > > > x11/qt5/qtmultimedia > > > > > > Your diff itself looks good to me. > > > > > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > > > Hi, > > > > > > > > there is a small update of this port. > > > > > > > > Hope it s good. > > > > > > > > Regards. > > > > > > > Index: Makefile > > > > === > > > > RCS file: /cvs/ports/audio/openal/Makefile,v > > > > retrieving revision 1.48 > > > > diff -u -p -r1.48 Makefile > > > > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > > > > +++ Makefile 13 Oct 2017 21:54:17 - > > > > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > > > > > > > COMMENT =cross-platform 3D audio API > > > > > > > > -V = 1.16.0 > > > > +V = 1.17.2 > > > > EPOCH = 0 > > > > DISTNAME = openal-soft-$V > > > > PKGNAME =openal-$V > > > > CATEGORIES = audio > > > > -SHARED_LIBS =openal 2.2 > > > > -REVISION = 1 > > > > +SHARED_LIBS =openal 3.0 > > > > > > > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > > > > > > > Index: distinfo > > > > === > > > > RCS file: /cvs/ports/audio/openal/distinfo,v > > > > retrieving revision 1.9 > > > > diff -u -p -r1.9 distinfo > > > > --- distinfo 3 Nov 2016 10:27:15 - 1.9 > > > > +++ distinfo 13 Oct 2017 21:54:17 - > > > > @@ -1,2 +1,2 @@ > > > > -SHA256 (openal-soft-1.16.0.tar.bz2) = Lz3NMT/iY5EoT7+FloY3I/ > > > mcZdbGhG3MtI55ytr0DV8= > > > > -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 > > > > +SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/ > > > GOwGZY4aFgao7Mi7wrMxQ= > > > > +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 > > > > Index: patches/patch-Alc_alcConfig_c > > > > === > > > > RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v > > > > retrieving revision 1.3 > > > > diff -u -p -r1.3 patch-Alc_alcConfig_c > > > > --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - > 1.3 > > > > +++ patches/patch-Alc_alcConfig_c 13 Oct 2017 21:54:17 - > > > > @@ -1,7 +1,8 @@ > > > > $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper > Exp $ > > > > Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 > > > > -+++ Alc/alcConfig.c Sun Sep 4 22:48:18 2016 > > > > -@@ -326,7 +326,7 @@ void ReadALConfig(void) > > > > +Index: Alc/alcConfig.c > > > > +--- Alc/alcConfig.c.orig > > > > Alc/alcConfig.c > > > > +@@ -353,7 +353,7 @@ void ReadALConfig(void) > > > > const char *str; > > > > FILE *f; > > > > > > > > Index: patches/patch-CMakeLists_txt > > > > === > > > > RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v > > > > retrieving revision 1.6 > > > > diff -u -p -r1.6 patch-CMakeLists_txt > > > > --- patches/patch-CMakeLists_txt 3 Nov 2016 10:27:15 - > 1.6 > > > > +++ patches/patch-CMakeLists_txt 13 Oct 2017 21:54:17 - > > > > @@ -1,21 +1,13 @@ > > > > $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper Exp > $ > > > > CMakeLists.txt.orig Fri Aug 15 08:06:59 2014 > > > > -+++ CMakeLists.txt Sun Sep 4 22:58:36 2016 > > > > -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) > > > > - # Check if we have C11 _Atomic > > > > - CHECK_C_SOURCE_COMPILES( > > > > - "#include > > > > -- int _Atomic foo; > > > > -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); > > > > - int main() > > > > - { > > > > - return atomic_load(&foo); > > > > -@@ -1134,7 +1134,7 @@ ENDIF() > > > > +Index: CMakeLists.txt > > > > +--- CMakeLists.txt.orig > > > > CMakeLists.txt > > > > +@@ -1207,7 +1207,7 @@ ENDIF() > > > > # Install alsoft.co
Re: update: audio/openal
On Thu Oct 26, 2017 at 09:26:18AM +0100, David CARLIER wrote: > Not all but couple of video games :-) > That's okay but you have to make sure all consumers are bulding with the new version. > On 26 October 2017 at 08:33, Rafael Sadowski wrote: > > > Did you test your diff with all consumers? > > > > audio/freealut > > emulators/fs-uae > > emulators/retroarch > > games/0ad/base > > games/astromenace > > games/dhewm3 > > games/dustrac > > games/gemrb > > games/ioquake3 > > games/irrlamb > > games/love > > games/lugaru > > games/lwjgl > > games/megaglest/base > > games/minetest > > games/openmw > > games/scorched3d > > games/solarus > > games/spacezero > > games/speeddreams > > games/supertux > > games/supertuxkart > > games/taisei > > games/tome4 > > games/ufoai/base > > games/valyriatear > > games/vegastrike/engine > > games/warzone2100 > > games/yquake2 > > graphics/blender > > graphics/simgear > > multimedia/sfml > > x11/kde4/libkdegames > > x11/qt5/qtmultimedia > > > > Your diff itself looks good to me. > > > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > > Hi, > > > > > > there is a small update of this port. > > > > > > Hope it s good. > > > > > > Regards. > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/audio/openal/Makefile,v > > > retrieving revision 1.48 > > > diff -u -p -r1.48 Makefile > > > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > > > +++ Makefile 13 Oct 2017 21:54:17 - > > > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > > > > > COMMENT =cross-platform 3D audio API > > > > > > -V = 1.16.0 > > > +V = 1.17.2 > > > EPOCH = 0 > > > DISTNAME = openal-soft-$V > > > PKGNAME =openal-$V > > > CATEGORIES = audio > > > -SHARED_LIBS =openal 2.2 > > > -REVISION = 1 > > > +SHARED_LIBS =openal 3.0 > > > > > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > > > > > Index: distinfo > > > === > > > RCS file: /cvs/ports/audio/openal/distinfo,v > > > retrieving revision 1.9 > > > diff -u -p -r1.9 distinfo > > > --- distinfo 3 Nov 2016 10:27:15 - 1.9 > > > +++ distinfo 13 Oct 2017 21:54:17 - > > > @@ -1,2 +1,2 @@ > > > -SHA256 (openal-soft-1.16.0.tar.bz2) = Lz3NMT/iY5EoT7+FloY3I/ > > mcZdbGhG3MtI55ytr0DV8= > > > -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 > > > +SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/ > > GOwGZY4aFgao7Mi7wrMxQ= > > > +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 > > > Index: patches/patch-Alc_alcConfig_c > > > === > > > RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v > > > retrieving revision 1.3 > > > diff -u -p -r1.3 patch-Alc_alcConfig_c > > > --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - 1.3 > > > +++ patches/patch-Alc_alcConfig_c 13 Oct 2017 21:54:17 - > > > @@ -1,7 +1,8 @@ > > > $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper Exp $ > > > Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 > > > -+++ Alc/alcConfig.c Sun Sep 4 22:48:18 2016 > > > -@@ -326,7 +326,7 @@ void ReadALConfig(void) > > > +Index: Alc/alcConfig.c > > > +--- Alc/alcConfig.c.orig > > > Alc/alcConfig.c > > > +@@ -353,7 +353,7 @@ void ReadALConfig(void) > > > const char *str; > > > FILE *f; > > > > > > Index: patches/patch-CMakeLists_txt > > > === > > > RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v > > > retrieving revision 1.6 > > > diff -u -p -r1.6 patch-CMakeLists_txt > > > --- patches/patch-CMakeLists_txt 3 Nov 2016 10:27:15 - 1.6 > > > +++ patches/patch-CMakeLists_txt 13 Oct 2017 21:54:17 - > > > @@ -1,21 +1,13 @@ > > > $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper Exp $ > > > CMakeLists.txt.orig Fri Aug 15 08:06:59 2014 > > > -+++ CMakeLists.txt Sun Sep 4 22:58:36 2016 > > > -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) > > > - # Check if we have C11 _Atomic > > > - CHECK_C_SOURCE_COMPILES( > > > - "#include > > > -- int _Atomic foo; > > > -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); > > > - int main() > > > - { > > > - return atomic_load(&foo); > > > -@@ -1134,7 +1134,7 @@ ENDIF() > > > +Index: CMakeLists.txt > > > +--- CMakeLists.txt.orig > > > CMakeLists.txt > > > +@@ -1207,7 +1207,7 @@ ENDIF() > > > # Install alsoft.conf configuration file > > > IF(ALSOFT_CONFIG) > > > INSTALL(FILES alsoftrc.sample > > > --DESTINATION share/openal > > > -+DESTINATION share/examples/openal > > > +-DESTINATION ${SHARE_INSTALL_DIR}/openal > > > ++DESTINATION ${SHARE_INSTALL_DIR}/examples/openal > > > ) > > > MESSAGE(STATUS "Installing sample configuration") >
Re: update: audio/openal
Not all but couple of video games :-) On 26 October 2017 at 08:33, Rafael Sadowski wrote: > Did you test your diff with all consumers? > > audio/freealut > emulators/fs-uae > emulators/retroarch > games/0ad/base > games/astromenace > games/dhewm3 > games/dustrac > games/gemrb > games/ioquake3 > games/irrlamb > games/love > games/lugaru > games/lwjgl > games/megaglest/base > games/minetest > games/openmw > games/scorched3d > games/solarus > games/spacezero > games/speeddreams > games/supertux > games/supertuxkart > games/taisei > games/tome4 > games/ufoai/base > games/valyriatear > games/vegastrike/engine > games/warzone2100 > games/yquake2 > graphics/blender > graphics/simgear > multimedia/sfml > x11/kde4/libkdegames > x11/qt5/qtmultimedia > > Your diff itself looks good to me. > > On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > > Hi, > > > > there is a small update of this port. > > > > Hope it s good. > > > > Regards. > > > Index: Makefile > > === > > RCS file: /cvs/ports/audio/openal/Makefile,v > > retrieving revision 1.48 > > diff -u -p -r1.48 Makefile > > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > > +++ Makefile 13 Oct 2017 21:54:17 - > > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > > > COMMENT =cross-platform 3D audio API > > > > -V = 1.16.0 > > +V = 1.17.2 > > EPOCH = 0 > > DISTNAME = openal-soft-$V > > PKGNAME =openal-$V > > CATEGORIES = audio > > -SHARED_LIBS =openal 2.2 > > -REVISION = 1 > > +SHARED_LIBS =openal 3.0 > > > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > > > Index: distinfo > > === > > RCS file: /cvs/ports/audio/openal/distinfo,v > > retrieving revision 1.9 > > diff -u -p -r1.9 distinfo > > --- distinfo 3 Nov 2016 10:27:15 - 1.9 > > +++ distinfo 13 Oct 2017 21:54:17 - > > @@ -1,2 +1,2 @@ > > -SHA256 (openal-soft-1.16.0.tar.bz2) = Lz3NMT/iY5EoT7+FloY3I/ > mcZdbGhG3MtI55ytr0DV8= > > -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 > > +SHA256 (openal-soft-1.17.2.tar.bz2) = o0H4VC8fC4xlJBoX2hPQc/ > GOwGZY4aFgao7Mi7wrMxQ= > > +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 > > Index: patches/patch-Alc_alcConfig_c > > === > > RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v > > retrieving revision 1.3 > > diff -u -p -r1.3 patch-Alc_alcConfig_c > > --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - 1.3 > > +++ patches/patch-Alc_alcConfig_c 13 Oct 2017 21:54:17 - > > @@ -1,7 +1,8 @@ > > $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper Exp $ > > Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 > > -+++ Alc/alcConfig.c Sun Sep 4 22:48:18 2016 > > -@@ -326,7 +326,7 @@ void ReadALConfig(void) > > +Index: Alc/alcConfig.c > > +--- Alc/alcConfig.c.orig > > Alc/alcConfig.c > > +@@ -353,7 +353,7 @@ void ReadALConfig(void) > > const char *str; > > FILE *f; > > > > Index: patches/patch-CMakeLists_txt > > === > > RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v > > retrieving revision 1.6 > > diff -u -p -r1.6 patch-CMakeLists_txt > > --- patches/patch-CMakeLists_txt 3 Nov 2016 10:27:15 - 1.6 > > +++ patches/patch-CMakeLists_txt 13 Oct 2017 21:54:17 - > > @@ -1,21 +1,13 @@ > > $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper Exp $ > > CMakeLists.txt.orig Fri Aug 15 08:06:59 2014 > > -+++ CMakeLists.txt Sun Sep 4 22:58:36 2016 > > -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) > > - # Check if we have C11 _Atomic > > - CHECK_C_SOURCE_COMPILES( > > - "#include > > -- int _Atomic foo; > > -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); > > - int main() > > - { > > - return atomic_load(&foo); > > -@@ -1134,7 +1134,7 @@ ENDIF() > > +Index: CMakeLists.txt > > +--- CMakeLists.txt.orig > > CMakeLists.txt > > +@@ -1207,7 +1207,7 @@ ENDIF() > > # Install alsoft.conf configuration file > > IF(ALSOFT_CONFIG) > > INSTALL(FILES alsoftrc.sample > > --DESTINATION share/openal > > -+DESTINATION share/examples/openal > > +-DESTINATION ${SHARE_INSTALL_DIR}/openal > > ++DESTINATION ${SHARE_INSTALL_DIR}/examples/openal > > ) > > MESSAGE(STATUS "Installing sample configuration") > > MESSAGE(STATUS "") > > Index: patches/patch-OpenAL32_alBuffer_c > > === > > RCS file: /cvs/ports/audio/openal/patches/patch-OpenAL32_alBuffer_c,v > > retrieving revision 1.1 > > diff -u -p -r1.1 patch-OpenAL32_alBuffer_c > > --- patches/patch-OpenAL32_alBuffer_c 3 Nov 2016 10:27:38 - > 1.1 > > +++ patches/patch-OpenAL32_alBuffer_c 13 Oct 2017 21:54:17 -0
Re: update: audio/openal
Did you test your diff with all consumers? audio/freealut emulators/fs-uae emulators/retroarch games/0ad/base games/astromenace games/dhewm3 games/dustrac games/gemrb games/ioquake3 games/irrlamb games/love games/lugaru games/lwjgl games/megaglest/base games/minetest games/openmw games/scorched3d games/solarus games/spacezero games/speeddreams games/supertux games/supertuxkart games/taisei games/tome4 games/ufoai/base games/valyriatear games/vegastrike/engine games/warzone2100 games/yquake2 graphics/blender graphics/simgear multimedia/sfml x11/kde4/libkdegames x11/qt5/qtmultimedia Your diff itself looks good to me. On Fri Oct 13, 2017 at 10:57:09PM +0100, David CARLIER wrote: > Hi, > > there is a small update of this port. > > Hope it s good. > > Regards. > Index: Makefile > === > RCS file: /cvs/ports/audio/openal/Makefile,v > retrieving revision 1.48 > diff -u -p -r1.48 Makefile > --- Makefile 18 Aug 2017 12:47:58 - 1.48 > +++ Makefile 13 Oct 2017 21:54:17 - > @@ -4,13 +4,12 @@ BROKEN-hppa = undefined reference to __s > > COMMENT =cross-platform 3D audio API > > -V = 1.16.0 > +V = 1.17.2 > EPOCH = 0 > DISTNAME = openal-soft-$V > PKGNAME =openal-$V > CATEGORIES = audio > -SHARED_LIBS =openal 2.2 > -REVISION = 1 > +SHARED_LIBS =openal 3.0 > > HOMEPAGE = http://kcat.strangesoft.net/openal.html > > Index: distinfo > === > RCS file: /cvs/ports/audio/openal/distinfo,v > retrieving revision 1.9 > diff -u -p -r1.9 distinfo > --- distinfo 3 Nov 2016 10:27:15 - 1.9 > +++ distinfo 13 Oct 2017 21:54:17 - > @@ -1,2 +1,2 @@ > -SHA256 (openal-soft-1.16.0.tar.bz2) = > Lz3NMT/iY5EoT7+FloY3I/mcZdbGhG3MtI55ytr0DV8= > -SIZE (openal-soft-1.16.0.tar.bz2) = 393280 > +SHA256 (openal-soft-1.17.2.tar.bz2) = > o0H4VC8fC4xlJBoX2hPQc/GOwGZY4aFgao7Mi7wrMxQ= > +SIZE (openal-soft-1.17.2.tar.bz2) = 486934 > Index: patches/patch-Alc_alcConfig_c > === > RCS file: /cvs/ports/audio/openal/patches/patch-Alc_alcConfig_c,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Alc_alcConfig_c > --- patches/patch-Alc_alcConfig_c 3 Nov 2016 10:27:15 - 1.3 > +++ patches/patch-Alc_alcConfig_c 13 Oct 2017 21:54:17 - > @@ -1,7 +1,8 @@ > $OpenBSD: patch-Alc_alcConfig_c,v 1.3 2016/11/03 10:27:15 jasper Exp $ > Alc/alcConfig.c.orig Fri Aug 15 08:06:59 2014 > -+++ Alc/alcConfig.c Sun Sep 4 22:48:18 2016 > -@@ -326,7 +326,7 @@ void ReadALConfig(void) > +Index: Alc/alcConfig.c > +--- Alc/alcConfig.c.orig > Alc/alcConfig.c > +@@ -353,7 +353,7 @@ void ReadALConfig(void) > const char *str; > FILE *f; > > Index: patches/patch-CMakeLists_txt > === > RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v > retrieving revision 1.6 > diff -u -p -r1.6 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 3 Nov 2016 10:27:15 - 1.6 > +++ patches/patch-CMakeLists_txt 13 Oct 2017 21:54:17 - > @@ -1,21 +1,13 @@ > $OpenBSD: patch-CMakeLists_txt,v 1.6 2016/11/03 10:27:15 jasper Exp $ > CMakeLists.txt.orig Fri Aug 15 08:06:59 2014 > -+++ CMakeLists.txt Sun Sep 4 22:58:36 2016 > -@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) > - # Check if we have C11 _Atomic > - CHECK_C_SOURCE_COMPILES( > - "#include > -- int _Atomic foo; > -+ const int _Atomic foo = ATOMIC_VAR_INIT(~0); > - int main() > - { > - return atomic_load(&foo); > -@@ -1134,7 +1134,7 @@ ENDIF() > +Index: CMakeLists.txt > +--- CMakeLists.txt.orig > CMakeLists.txt > +@@ -1207,7 +1207,7 @@ ENDIF() > # Install alsoft.conf configuration file > IF(ALSOFT_CONFIG) > INSTALL(FILES alsoftrc.sample > --DESTINATION share/openal > -+DESTINATION share/examples/openal > +-DESTINATION ${SHARE_INSTALL_DIR}/openal > ++DESTINATION ${SHARE_INSTALL_DIR}/examples/openal > ) > MESSAGE(STATUS "Installing sample configuration") > MESSAGE(STATUS "") > Index: patches/patch-OpenAL32_alBuffer_c > === > RCS file: /cvs/ports/audio/openal/patches/patch-OpenAL32_alBuffer_c,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-OpenAL32_alBuffer_c > --- patches/patch-OpenAL32_alBuffer_c 3 Nov 2016 10:27:38 - 1.1 > +++ patches/patch-OpenAL32_alBuffer_c 13 Oct 2017 21:54:17 - > @@ -1,9 +1,10 @@ > $OpenBSD: patch-OpenAL32_alBuffer_c,v 1.1 2016/11/03 10:27:38 jasper Exp $ > OpenAL32/alBuffer.c.orig Fri Aug 15 08:06:59 2014 > -+++ OpenAL32/alBuffer.c Sun Sep 4 22:48:18 2016 > -@@ -1179,7 +1179,7 @@ static ALboolean DecomposeFormat(ALenum format, enum F > - { AL_7POINT1_16_SOFT, FmtX71, FmtShort }, > -
Re: update: audio/openal
ping :-) On 13 October 2017 at 22:57, David CARLIER wrote: > Hi, > > there is a small update of this port. > > Hope it s good. > > Regards. >
Re: [update] audio/openal
David CARLIER writes: > Fair enough, here a new version based on the last suggestion. I left out the REVISION bump, it's not needed since the change doesn't affect what ends up in the resulting package. Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] audio/openal
Fair enough, here a new version based on the last suggestion. Cheers. On 5 January 2017 at 19:03, Jeremie Courreges-Anglas wrote: > David CARLIER writes: > >> ping ? >> >> :-) >> >> On 15 December 2016 at 16:30, David CARLIER wrote: >>> Hi, >>> >>> naddy@ reported an hidden dependency for one binary, alsoft-config, >>> thus this small diff for who does not want to bear the qt4 compilation :-) > > I don't think that a FLAVOR is the right way to deal with this. If you > really want to make this optional, put alsoft-config in a -gui > SUBPACKAGE and add a no_gui pseudo-flavor ("gui" or any other name you > think makes sense). > > Or just unconditionally disable alsoft-config... which should probably > be done as a first step, see patch below. > > Regarding your diff, REVISION starts at 0. > > > Index: Makefile > === > RCS file: /d/cvs/ports/audio/openal/Makefile,v > retrieving revision 1.39 > diff -u -p -p -u -r1.39 Makefile > --- Makefile3 Nov 2016 10:27:15 - 1.39 > +++ Makefile5 Jan 2017 18:59:51 - > @@ -44,7 +44,8 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB > -DALSOFT_BACKEND_QSA=Off \ > -DALSOFT_BACKEND_SOLARIS=Off \ > -DALSOFT_BACKEND_WAVE=Off \ > - -DALSOFT_BACKEND_WINMM=Off > + -DALSOFT_BACKEND_WINMM=Off \ > + -DALSOFT_NO_CONFIG_UTIL=On > > MODULES = devel/cmake lang/clang > MODCLANG_ARCHS = * > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- Makefile3 Nov 2016 10:27:15 - 1.39 +++ Makefile5 Jan 2017 22:36:21 - @@ -12,6 +12,7 @@ DISTNAME =openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio SHARED_LIBS = openal 2.2 +REVISION = 0 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -44,7 +45,8 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB -DALSOFT_BACKEND_QSA=Off \ -DALSOFT_BACKEND_SOLARIS=Off \ -DALSOFT_BACKEND_WAVE=Off \ - -DALSOFT_BACKEND_WINMM=Off + -DALSOFT_BACKEND_WINMM=Off \ + -DALSOFT_NO_CONFIG_UTIL=On MODULES = devel/cmake lang/clang MODCLANG_ARCHS = *
Re: [update] audio/openal
David CARLIER writes: > ping ? > > :-) > > On 15 December 2016 at 16:30, David CARLIER wrote: >> Hi, >> >> naddy@ reported an hidden dependency for one binary, alsoft-config, >> thus this small diff for who does not want to bear the qt4 compilation :-) I don't think that a FLAVOR is the right way to deal with this. If you really want to make this optional, put alsoft-config in a -gui SUBPACKAGE and add a no_gui pseudo-flavor ("gui" or any other name you think makes sense). Or just unconditionally disable alsoft-config... which should probably be done as a first step, see patch below. Regarding your diff, REVISION starts at 0. Index: Makefile === RCS file: /d/cvs/ports/audio/openal/Makefile,v retrieving revision 1.39 diff -u -p -p -u -r1.39 Makefile --- Makefile3 Nov 2016 10:27:15 - 1.39 +++ Makefile5 Jan 2017 18:59:51 - @@ -44,7 +44,8 @@ CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenB -DALSOFT_BACKEND_QSA=Off \ -DALSOFT_BACKEND_SOLARIS=Off \ -DALSOFT_BACKEND_WAVE=Off \ - -DALSOFT_BACKEND_WINMM=Off + -DALSOFT_BACKEND_WINMM=Off \ + -DALSOFT_NO_CONFIG_UTIL=On MODULES = devel/cmake lang/clang MODCLANG_ARCHS = * -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] audio/openal
ping ? :-) On 15 December 2016 at 16:30, David CARLIER wrote: > Hi, > > naddy@ reported an hidden dependency for one binary, alsoft-config, > thus this small diff for who does not want to bear the qt4 compilation :-) > > Hope it s ok. > > Cheers.
Re: UPDATE audio/openal 1.6.0
ping ? seems patrick@ has little interest for this update for ARM. Regards. On 19 September 2016 at 11:20, David CARLIER wrote: > Hi any comment/interest ? :) > > On 4 September 2016 at 23:29, David CARLIER wrote: >> last time, sorry ... forgot the fix from FreeBSD's version. >> >> On 4 September 2016 at 23:14, David CARLIER wrote: >>> ... >>> with an unneeded patch it is better >>> ... >>> >>> On 4 September 2016 at 23:08, David CARLIER wrote: Hi, this is a little update of openal using clang + backport of the C11 atomic fix. tested with astromenace and supertuxkart. Hope it finds its way.
Re: UPDATE audio/openal 1.6.0
Hi any comment/interest ? :) On 4 September 2016 at 23:29, David CARLIER wrote: > last time, sorry ... forgot the fix from FreeBSD's version. > > On 4 September 2016 at 23:14, David CARLIER wrote: >> ... >> with an unneeded patch it is better >> ... >> >> On 4 September 2016 at 23:08, David CARLIER wrote: >>> Hi, >>> >>> this is a little update of openal using clang + backport of the C11 >>> atomic fix. tested with astromenace and supertuxkart. >>> >>> Hope it finds its way.
Re: UPDATE audio/openal 1.6.0
last time, sorry ... forgot the fix from FreeBSD's version. On 4 September 2016 at 23:14, David CARLIER wrote: > ... > with an unneeded patch it is better > ... > > On 4 September 2016 at 23:08, David CARLIER wrote: >> Hi, >> >> this is a little update of openal using clang + backport of the C11 >> atomic fix. tested with astromenace and supertuxkart. >> >> Hope it finds its way. Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- Makefile1 Sep 2016 10:53:26 - 1.38 +++ Makefile4 Sep 2016 22:26:47 - @@ -1,13 +1,13 @@ # $OpenBSD: Makefile,v 1.38 2016/09/01 10:53:26 jasper Exp $ -BROKEN-arm = undefined reference to __sync atomic ops BROKEN-hppa = undefined reference to __sync atomic ops +BROKEN-mips64 =undefined reference to __sync atomic ops +BROKEN-mips64el = undefined reference to __sync atomic ops COMMENT = cross-platform 3D audio API -V =1.15.1 +V =1.16.0 EPOCH =0 -REVISION = 4 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio @@ -20,32 +20,41 @@ MAINTAINER =David Carlier 3;pos += 4) - { - const __m128 val4 = _mm_load_ps(&data[pos]); - __m128 dry4 = _mm_load_ps(&DryBuffer[c][OutPos+pos]); -@@ -189,7 +189,7 @@ void MixSend_SSE(const SendParams *params, const ALflo - WetClickRemoval[0] -= data[0] * WetGain; - - gain = _mm_set1_ps(WetGain); --for(pos = 0;pos < BufferSize-3;pos+=4) -+for(pos = 0;BufferSize-pos > 3;pos += 4) - { - const __m128 val4 = _mm_load_ps(&data[pos]); - __m128 wet4 = _mm_load_ps(&WetBuffer[0][OutPos+pos]); Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v retrieving revision 1.5 diff -u -p -r1.5 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt11 Mar 2013 15:26:15 - 1.5 +++ patches/patch-CMakeLists_txt4 Sep 2016 22:26:47 - @@ -1,7 +1,16 @@ $OpenBSD: patch-CMakeLists_txt,v 1.5 2013/03/11 15:26:15 bcallah Exp $ CMakeLists.txt.origThu Mar 7 10:11:07 2013 -+++ CMakeLists.txt Thu Mar 7 10:11:45 2013 -@@ -797,7 +797,7 @@ ENDIF() +--- CMakeLists.txt.origFri Aug 15 08:06:59 2014 CMakeLists.txt Sun Sep 4 22:58:36 2016 +@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) + # Check if we have C11 _Atomic + CHECK_C_SOURCE_COMPILES( + "#include +- int _Atomic foo; ++ const int _Atomic foo = ATOMIC_VAR_INIT(~0); + int main() + { + return atomic_load(&foo); +@@ -1134,7 +1134,7 @@ ENDIF() # Install alsoft.conf configuration file IF(ALSOFT_CONFIG) INSTALL(FILES alsoftrc.sample Index: patches/patch-OpenAL32_alBuffer_c === RCS file: patches/patch-OpenAL32_alBuffer_c diff -N patches/patch-OpenAL32_alBuffer_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-OpenAL32_alBuffer_c 4 Sep 2016 22:26:47 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- OpenAL32/alBuffer.c.orig Fri Aug 15 08:06:59 2014 OpenAL32/alBuffer.cSun Sep 4 22:48:18 2016 +@@ -1179,7 +1179,7 @@ static ALboolean DecomposeFormat(ALenum format, enum F + { AL_7POINT1_16_SOFT, FmtX71, FmtShort }, + { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat }, + }; +-ALuint i; ++volatile ALuint i; + + for(i = 0;i < COUNTOF(list);i++) + { Index: patches/patch-utils_makehrtf_c === RCS file: /cvs/ports/audio/openal/patches/patch-utils_makehrtf_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-utils_makehrtf_c --- patches/patch-utils_makehrtf_c 9 Dec 2014 20:46:00 - 1.1 +++ patches/patch-utils_makehrtf_c 4 Sep 2016 22:26:47 - @@ -1,7 +1,7 @@ $OpenBSD: patch-utils_makehrtf_c,v 1.1 2014/12/09 20:46:00 sthen Exp $ utils/makehrtf.c.orig Tue Dec 9 20:40:59 2014 -+++ utils/makehrtf.c Tue Dec 9 20:41:24 2014 -@@ -2017,7 +2017,7 @@ static int StoreMhr (const HrirDataT * hData, const ch +--- utils/makehrtf.c.orig Fri Aug 15 08:06:59 2014 utils/makehrtf.c Sun Sep 4 22:48:18 2016 +@@ -2071,7 +2071,7 @@ static int StoreMhr (const HrirDataT * hData, const ch step = hData -> mIrSize; end = hData -> mIrCount * step; n = hData -> mIrPoints; @@ -10,12 +10,3 @@ $OpenBSD: patch-utils_makehrtf_c,v 1.1 2 for (j = 0; j < end; j += step) { hpHist = 0; for (i = 0; i < n; i ++) { -@@ -2072,7 +2072,7 @@ static int StoreTable (const HrirDataT * hData, const -"static const ALshort defaultCoeffs[%u] =\n{\n", hData -> mIrCount * n); - if (! WriteAscii (text, fp, filename)) - return (0); -- srand (0x31DF840C); -+ srand_deterministic (0x31DF840C); - for (j = 0; j < end; j +
Re: UPDATE audio/openal 1.6.0
... with an unneeded patch it is better ... On 4 September 2016 at 23:08, David CARLIER wrote: > Hi, > > this is a little update of openal using clang + backport of the C11 > atomic fix. tested with astromenace and supertuxkart. > > Hope it finds its way. ? patches/patch-OpenAL32_alBuffer_c Index: Makefile === RCS file: /cvs/ports/audio/openal/Makefile,v retrieving revision 1.38 diff -u -p -r1.38 Makefile --- Makefile1 Sep 2016 10:53:26 - 1.38 +++ Makefile4 Sep 2016 22:13:36 - @@ -1,13 +1,13 @@ # $OpenBSD: Makefile,v 1.38 2016/09/01 10:53:26 jasper Exp $ -BROKEN-arm = undefined reference to __sync atomic ops BROKEN-hppa = undefined reference to __sync atomic ops +BROKEN-mips64 =undefined reference to __sync atomic ops +BROKEN-mips64el = undefined reference to __sync atomic ops COMMENT = cross-platform 3D audio API -V =1.15.1 +V =1.16.0 EPOCH =0 -REVISION = 4 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio @@ -20,32 +20,41 @@ MAINTAINER =David Carlier 3;pos += 4) - { - const __m128 val4 = _mm_load_ps(&data[pos]); - __m128 dry4 = _mm_load_ps(&DryBuffer[c][OutPos+pos]); -@@ -189,7 +189,7 @@ void MixSend_SSE(const SendParams *params, const ALflo - WetClickRemoval[0] -= data[0] * WetGain; - - gain = _mm_set1_ps(WetGain); --for(pos = 0;pos < BufferSize-3;pos+=4) -+for(pos = 0;BufferSize-pos > 3;pos += 4) - { - const __m128 val4 = _mm_load_ps(&data[pos]); - __m128 wet4 = _mm_load_ps(&WetBuffer[0][OutPos+pos]); Index: patches/patch-CMakeLists_txt === RCS file: /cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v retrieving revision 1.5 diff -u -p -r1.5 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt11 Mar 2013 15:26:15 - 1.5 +++ patches/patch-CMakeLists_txt4 Sep 2016 22:13:36 - @@ -1,7 +1,16 @@ $OpenBSD: patch-CMakeLists_txt,v 1.5 2013/03/11 15:26:15 bcallah Exp $ CMakeLists.txt.origThu Mar 7 10:11:07 2013 -+++ CMakeLists.txt Thu Mar 7 10:11:45 2013 -@@ -797,7 +797,7 @@ ENDIF() +--- CMakeLists.txt.origFri Aug 15 08:06:59 2014 CMakeLists.txt Sun Sep 4 22:58:36 2016 +@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS) + # Check if we have C11 _Atomic + CHECK_C_SOURCE_COMPILES( + "#include +- int _Atomic foo; ++ const int _Atomic foo = ATOMIC_VAR_INIT(~0); + int main() + { + return atomic_load(&foo); +@@ -1134,7 +1134,7 @@ ENDIF() # Install alsoft.conf configuration file IF(ALSOFT_CONFIG) INSTALL(FILES alsoftrc.sample Index: patches/patch-utils_makehrtf_c === RCS file: /cvs/ports/audio/openal/patches/patch-utils_makehrtf_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-utils_makehrtf_c --- patches/patch-utils_makehrtf_c 9 Dec 2014 20:46:00 - 1.1 +++ patches/patch-utils_makehrtf_c 4 Sep 2016 22:13:36 - @@ -1,7 +1,7 @@ $OpenBSD: patch-utils_makehrtf_c,v 1.1 2014/12/09 20:46:00 sthen Exp $ utils/makehrtf.c.orig Tue Dec 9 20:40:59 2014 -+++ utils/makehrtf.c Tue Dec 9 20:41:24 2014 -@@ -2017,7 +2017,7 @@ static int StoreMhr (const HrirDataT * hData, const ch +--- utils/makehrtf.c.orig Fri Aug 15 08:06:59 2014 utils/makehrtf.c Sun Sep 4 22:48:18 2016 +@@ -2071,7 +2071,7 @@ static int StoreMhr (const HrirDataT * hData, const ch step = hData -> mIrSize; end = hData -> mIrCount * step; n = hData -> mIrPoints; @@ -10,12 +10,3 @@ $OpenBSD: patch-utils_makehrtf_c,v 1.1 2 for (j = 0; j < end; j += step) { hpHist = 0; for (i = 0; i < n; i ++) { -@@ -2072,7 +2072,7 @@ static int StoreTable (const HrirDataT * hData, const -"static const ALshort defaultCoeffs[%u] =\n{\n", hData -> mIrCount * n); - if (! WriteAscii (text, fp, filename)) - return (0); -- srand (0x31DF840C); -+ srand_deterministic (0x31DF840C); - for (j = 0; j < end; j += step) { - if (! WriteAscii (" ", fp, filename)) - return (0); Index: pkg/PLIST === RCS file: /cvs/ports/audio/openal/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 22 May 2015 11:31:11 - 1.7 +++ pkg/PLIST 4 Sep 2016 22:13:36 - @@ -14,3 +14,7 @@ share/examples/openal/ @sample ${SYSCONFDIR}/openal/ share/examples/openal/alsoftrc.sample @sample ${SYSCONFDIR}/openal/alsoft.conf +share/openal/ +share/openal/hrtf/ +share/openal/hrtf/default-44100.mhr +share/openal/hrtf/default-48000.mhr
Re: UPDATE: audio/openal
On Thu, Mar 29, 2012 at 02:03:32PM +0300, Antti Harri wrote: > This updates OpenAL to 1.14 that was released yesterday. Release notes at > http://kcat.strangesoft.net/openal.html Tested with scorched3d/supertuxkart/warzone2100 on amd64. There were API additions so I bumped the minor rev. Index: Makefile === RCS file: /home/cvs/ports/audio/openal/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile2 Jul 2011 07:34:31 - 1.24 +++ Makefile31 Mar 2012 01:34:51 - @@ -2,11 +2,12 @@ COMMENT = cross-platform 3D audio API -V =20110627 +V =1.14 +EPOCH =0 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 2.0 +SHARED_LIBS = openal 2.1 HOMEPAGE = http://kcat.strangesoft.net/openal.html @@ -20,20 +21,26 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c m pthread sndio -MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} \ - http://openbsd.fi/dist/ +MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} +EXTRACT_SUFX = .tar.bz2 CONFIGURE_ARGS =-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" \ -DCMAKE_BUILD_TYPE=OpenBSD \ -DDLOPEN=Off\ + -DREQUIRE_SNDIO=On \ -DPULSEAUDIO=Off\ -DPORTAUDIO=Off \ -DSOLARIS=Off \ -DALSA=Off \ - -DOSS=Off + -DOSS=Off \ + -DCOREAUDIO=Off \ + -DDSOUND=Off\ + -DOPENSL=Off\ + -DEXAMPLES=Off MODULES = devel/cmake +SEPARATE_BUILD =Yes NO_REGRESS = Yes pre-build: Index: distinfo === RCS file: /home/cvs/ports/audio/openal/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo2 Jul 2011 07:34:31 - 1.6 +++ distinfo31 Mar 2012 01:30:32 - @@ -1,5 +1,5 @@ -MD5 (openal-soft-20110627.tar.gz) = dyIlarhDU4oZArAVhNi6Xw== -RMD160 (openal-soft-20110627.tar.gz) = kWiXzE41A6/+Xvs8PKBCZKpb/Vs= -SHA1 (openal-soft-20110627.tar.gz) = 22LbnwY5ForaALA6rXGj/QfB7LM= -SHA256 (openal-soft-20110627.tar.gz) = /xXT1ihUatrb/4JSCAYYrrTVYbjP6medJwHdInFpS/w= -SIZE (openal-soft-20110627.tar.gz) = 231964 +MD5 (openal-soft-1.14.tar.bz2) = PYuGwhovh6Kl5g9487PwPQ== +RMD160 (openal-soft-1.14.tar.bz2) = NbTUbyF5+4R9IqvkwcuNSpdPilo= +SHA1 (openal-soft-1.14.tar.bz2) = 5tadsT7BVGW4OkXviZeOig9Vvso= +SHA256 (openal-soft-1.14.tar.bz2) = h72NYdWUM4eJjJK2oru7JhGOdF3sV1UMgXUmpw+tCRQ= +SIZE (openal-soft-1.14.tar.bz2) = 221579 Index: patches/patch-Alc_sndio_c === RCS file: patches/patch-Alc_sndio_c diff -N patches/patch-Alc_sndio_c --- patches/patch-Alc_sndio_c 2 Jul 2011 07:34:31 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -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.cThu 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; - } - Index: pkg/PLIST === RCS file: /home/cvs/ports/audio/openal/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 25 Jun 2011 18:42:02 - 1.4 +++ pkg/PLIST 31 Mar 2012 01:30:32 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PLIST,v 1.4 2011/06/25 18:42:02 jasper Exp $ +@bin bin/makehrtf @bin bin/openal-info include/AL/ include/AL/al.h @@ -6,6 +7,7 @@ include/AL/alc.h include/AL/alext.h %%SHARED%% include/AL/efx-creative.h +include/AL/efx-presets.h include/AL/efx.h lib/pkgconfig/ lib/pkgconfig/openal
Re: UPDATE: audio/openal
On 2012/03/29 14:03, Antti Harri wrote: > This updates OpenAL to 1.14 that was released yesterday. Release notes at > http://kcat.strangesoft.net/openal.html Looks good but two questions - - what's this been tested with so far? - have you checked for ABI/API changes? > diff --git audio/openal/Makefile audio/openal/Makefile Whatever your opinion of version control systems, the OpenBSD trees are kept in CVS, so we really want CVS diffs rather than diffs against a 3rd-party CVS<>git conversion - the one you're using messes up keyword expansion btw.