Here an an updated version. Kind regards.
On 30 October 2017 at 07:27, Rafael Sadowski <raf...@sizeofvoid.org> 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 -0000 1.48 +++ Makefile 30 Oct 2017 08:06:00 -0000 @@ -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 --- distinfo 3 Nov 2016 10:27:15 -0000 1.9 +++ distinfo 30 Oct 2017 08:06:00 -0000 @@ -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 -0000 1.3 +++ patches/patch-Alc_alcConfig_c 30 Oct 2017 08:06:00 -0000 @@ -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 -0000 1.6 +++ patches/patch-CMakeLists_txt 30 Oct 2017 08:06:00 -0000 @@ -1,21 +1,34 @@ $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 <stdatomic.h> -- 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 +@@ -843,17 +843,14 @@ ENDIF() + + # Check SndIO backend + OPTION(ALSOFT_REQUIRE_SNDIO "Require SndIO backend" OFF) +-FIND_PACKAGE(SoundIO) +-IF(SOUNDIO_FOUND) ++FIND_LIBRARY(SNDIOLIB NAMES sndio) ++IF(NOT SNDIOLIB-NOTFOUND) + OPTION(ALSOFT_BACKEND_SNDIO "Enable SndIO backend" ON) + IF(ALSOFT_BACKEND_SNDIO) + SET(HAVE_SNDIO 1) + SET(BACKENDS "${BACKENDS} SndIO (linked),") + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/sndio.c) +- SET(EXTRA_LIBS ${SOUNDIO_LIBRARIES} ${EXTRA_LIBS}) +- IF(CMAKE_VERSION VERSION_LESS "2.8.8") +- INCLUDE_DIRECTORIES(${SOUNDIO_INCLUDE_DIRS}) +- ENDIF() ++ SET(EXTRA_LIBS ${SNDIOLIB} ${EXTRA_LIBS}) + ENDIF() + ENDIF() + IF(ALSOFT_REQUIRE_SNDIO AND NOT HAVE_SNDIO) +@@ -1207,7 +1204,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 -0000 1.1 +++ patches/patch-OpenAL32_alBuffer_c 30 Oct 2017 08:06:00 -0000 @@ -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 }, - { AL_7POINT1_32F_SOFT, FmtX71, FmtFloat }, +Index: OpenAL32/alBuffer.c +--- OpenAL32/alBuffer.c.orig ++++ OpenAL32/alBuffer.c +@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum format, enum F + { AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort }, + { AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat }, }; - ALuint i; + volatile ALuint i; Index: patches/patch-utils_makehrtf_c =================================================================== RCS file: /cvs/ports/audio/openal/patches/patch-utils_makehrtf_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-utils_makehrtf_c --- patches/patch-utils_makehrtf_c 3 Nov 2016 10:27:15 -0000 1.2 +++ patches/patch-utils_makehrtf_c 30 Oct 2017 08:06:00 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-utils_makehrtf_c,v 1.2 2016/11/03 10:27:15 jasper Exp $ ---- 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 +Index: utils/makehrtf.c +--- utils/makehrtf.c.orig ++++ utils/makehrtf.c +@@ -2070,7 +2070,7 @@ static int StoreMhr (const HrirDataT * hData, const ch step = hData -> mIrSize; end = hData -> mIrCount * step; n = hData -> mIrPoints; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/openal/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 3 Nov 2016 10:27:16 -0000 1.8 +++ pkg/PLIST 30 Oct 2017 08:06:00 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.8 2016/11/03 10:27:16 jasper Exp $ +@bin bin/altonegen +@bin bin/bsincgen @bin bin/makehrtf @bin bin/openal-info include/AL/
