Hi David, Here is an update to OpenAL 1.20.1
One minor build issue, with a diff pending, with net/utox. The rest are good. Index: Makefile =================================================================== RCS file: /home/cvs/ports/audio/openal/Makefile,v retrieving revision 1.53 diff -u -p -u -p -r1.53 Makefile --- Makefile 12 Jul 2019 20:43:37 -0000 1.53 +++ Makefile 30 Mar 2020 02:53:41 -0000 @@ -1,35 +1,35 @@ # $OpenBSD: Makefile,v 1.53 2019/07/12 20:43:37 sthen Exp $ -BROKEN-hppa = undefined reference to __sync atomic ops - COMMENT = cross-platform 3D audio API -V = 1.19.1 +V = 1.20.1 EPOCH = 0 DISTNAME = openal-soft-$V PKGNAME = openal-$V CATEGORIES = audio -SHARED_LIBS = openal 3.1 -HOMEPAGE = http://kcat.strangesoft.net/openal.html +SHARED_LIBS = openal 4.0 + +HOMEPAGE = https://kcat.strangesoft.net/openal.html MAINTAINER = David Carlier <[email protected]> # LGPLv2+ -PERMIT_PACKAGE = Yes +PERMIT_PACKAGE =Yes -WANTLIB += c m pthread sndio +WANTLIB += c m mysofa pthread sndio z ${COMPILER_LIBCXX} MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} EXTRACT_SUFX = .tar.bz2 +LIB_DEPENDS += audio/libmysofa + CONFIGURE_ARGS =-DCMAKE_BUILD_TYPE=OpenBSD \ -DALSOFT_CONFIG=share/examples/openal \ -DALSOFT_DLOPEN=Off \ -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 \ @@ -52,6 +52,6 @@ COMPILER = base-clang ports-clang ports- NO_TEST = Yes pre-build: - @${SUBST_CMD} ${WRKSRC}/Alc/alconfig.c ${WRKSRC}/alsoftrc.sample + @${SUBST_CMD} ${WRKSRC}/alc/alconfig.cpp ${WRKSRC}/alsoftrc.sample .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/audio/openal/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo 13 Feb 2019 16:10:38 -0000 1.11 +++ distinfo 27 Mar 2020 03:45:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (openal-soft-1.19.1.tar.bz2) = XC+H/1GIuV4NxHaXGanYnOQ1uDIrRHi5XdS0J/6Esuk= -SIZE (openal-soft-1.19.1.tar.bz2) = 577310 +SHA256 (openal-soft-1.20.1.tar.bz2) = ts6wUTJXMsI/XIttN9vYlTRRfmQ5qH6XCIK0R8MCXW0= +SIZE (openal-soft-1.20.1.tar.bz2) = 512971 Index: patches/patch-Alc_alconfig_c =================================================================== RCS file: patches/patch-Alc_alconfig_c diff -N patches/patch-Alc_alconfig_c --- patches/patch-Alc_alconfig_c 13 Feb 2019 16:10:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-Alc_alconfig_c,v 1.1 2019/02/13 16:10:38 bcallah Exp $ - -Index: Alc/alconfig.c ---- Alc/alconfig.c.orig -+++ Alc/alconfig.c -@@ -428,7 +428,7 @@ void ReadALConfig(void) - const char *str; - FILE *f; - -- str = "/etc/openal/alsoft.conf"; -+ str = "${SYSCONFDIR}/openal/alsoft.conf"; - - TRACE("Loading config %s...\n", str); - f = al_fopen(str, "r"); Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /home/cvs/ports/audio/openal/patches/patch-CMakeLists_txt,v retrieving revision 1.8 diff -u -p -u -p -r1.8 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 13 Feb 2019 16:10:38 -0000 1.8 +++ patches/patch-CMakeLists_txt 27 Mar 2020 03:55:35 -0000 @@ -3,12 +3,12 @@ $OpenBSD: patch-CMakeLists_txt,v 1.8 201 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -1536,7 +1536,7 @@ endif() +@@ -1347,7 +1347,7 @@ endif() # Install alsoft.conf configuration file IF(ALSOFT_CONFIG) INSTALL(FILES alsoftrc.sample -- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/openal - ) +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/openal) MESSAGE(STATUS "Installing sample configuration") MESSAGE(STATUS "") + ENDIF() Index: patches/patch-OpenAL32_alBuffer_c =================================================================== RCS file: patches/patch-OpenAL32_alBuffer_c diff -N patches/patch-OpenAL32_alBuffer_c --- patches/patch-OpenAL32_alBuffer_c 13 Feb 2019 16:10:38 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-OpenAL32_alBuffer_c,v 1.3 2019/02/13 16:10:38 bcallah Exp $ - -Index: OpenAL32/alBuffer.c ---- OpenAL32/alBuffer.c.orig -+++ OpenAL32/alBuffer.c -@@ -1118,7 +1118,7 @@ static ALboolean DecomposeUserFormat(ALenum format, en - { AL_FORMAT_BFORMAT3D_FLOAT32, UserFmtBFormat3D, UserFmtFloat }, - { AL_FORMAT_BFORMAT3D_MULAW, UserFmtBFormat3D, UserFmtMulaw }, - }; -- ALuint i; -+ volatile ALuint i; - - for(i = 0;i < COUNTOF(list);i++) - { Index: patches/patch-alc_alconfig_cpp =================================================================== RCS file: patches/patch-alc_alconfig_cpp diff -N patches/patch-alc_alconfig_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-alc_alconfig_cpp 27 Mar 2020 03:55:39 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: alc/alconfig.cpp +--- alc/alconfig.cpp.orig ++++ alc/alconfig.cpp +@@ -326,7 +326,7 @@ void ReadALConfig() + + void ReadALConfig() + { +- const char *str{"/etc/openal/alsoft.conf"}; ++ const char *str{"${SYSCONFDIR}/openal/alsoft.conf"}; + + TRACE("Loading config %s...\n", str); + al::ifstream f{str}; Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/audio/openal/pkg/PLIST,v retrieving revision 1.10 diff -u -p -u -p -r1.10 PLIST --- pkg/PLIST 13 Feb 2019 16:10:38 -0000 1.10 +++ pkg/PLIST 27 Mar 2020 04:52:41 -0000 @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v 1.10 2019/02/13 16:10:38 bcallah Exp $ @bin bin/altonegen -@bin bin/makehrtf +@bin bin/makemhr @bin bin/openal-info include/AL/ include/AL/al.h @@ -21,8 +21,7 @@ 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 +share/openal/hrtf/Default HRTF.mhr share/openal/presets/ share/openal/presets/3D7.1.ambdec share/openal/presets/hexagon.ambdec
