Index: head/audio/openal-soft/Makefile =================================================================== --- head/audio/openal-soft/Makefile (revision 518675) +++ head/audio/openal-soft/Makefile (revision 518676) @@ -1,64 +1,70 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.19.1 -PORTREVISION= 3 +PORTVERSION= 1.20.0 CATEGORIES= audio MASTER_SITES= https://openal-soft.org/openal-releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Software implementation of the OpenAL specification LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c11 tar:bzip2 +LIB_DEPENDS= libmysofa.so:audio/libmysofa + +USES= cmake compiler:c++11-lang tar:bzip2 USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc" CMAKE_OFF= ALSOFT_BACKEND_ALSA ALSOFT_DLOPEN ALSOFT_EXAMPLES \ ALSOFT_REQUIRE_QSA ALSOFT_REQUIRE_SOLARIS CMAKE_ON= ALSOFT_BACKEND_WAVE ALSOFT_UTILS # do not link with librt and libdl. LDFLAGS+= -Wl,--as-needed +# fails to link with lld 6, remove after FreeBSD 12.0 EOL +.if exists(/usr/lib/clang/6.0.1) LLD_UNSAFE= yes +.endif +PLIST_SUB= SOVERSION=${PORTVERSION} + OPTIONS_DEFINE= CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO OPTIONS_DEFAULT= OSS OPTIONS_SUB= yes CONFIG_DESC= Install configuration utility (needs Qt 5) CONFIG_USES= qt:5 CONFIG_USE= QT=core,gui,widgets,buildtools_build,qmake_build CONFIG_CMAKE_BOOL_OFF= ALSOFT_NO_CONFIG_UTIL CONFIG_CMAKE_ON= -DALSOFT_NO_QT5:BOOL=OFF JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= ALSOFT_BACKEND_JACK ALSOFT_REQUIRE_JACK OSS_CMAKE_BOOL= ALSOFT_BACKEND_OSS ALSOFT_REQUIRE_OSS PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= ALSOFT_BACKEND_PORTAUDIO ALSOFT_REQUIRE_PORTAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= ALSOFT_BACKEND_PULSEAUDIO ALSOFT_REQUIRE_PULSEAUDIO SDL_USES= localbase sdl SDL_USE= SDL=sdl2 SDL_CMAKE_BOOL= ALSOFT_BACKEND_SDL2 ALSOFT_REQUIRE_SDL2 SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ - ${WRKSRC}/Alc/alconfig.c + ${WRKSRC}/alc/alconfig.cpp post-install-EXAMPLES-on: (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/audio/openal-soft/distinfo =================================================================== --- head/audio/openal-soft/distinfo (revision 518675) +++ head/audio/openal-soft/distinfo (revision 518676) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539442332 -SHA256 (openal-soft-1.19.1.tar.bz2) = 5c2f87ff5188b95e0dc4769719a9d89ce435b8322b4478b95dd4b427fe84b2e9 -SIZE (openal-soft-1.19.1.tar.bz2) = 577310 +TIMESTAMP = 1575041266 +SHA256 (openal-soft-1.20.0.tar.bz2) = c089497922b454baf96d5e4bbc1a114cf75c56b44801edc48b9b82ab5ed1e60e +SIZE (openal-soft-1.20.0.tar.bz2) = 587550 Index: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c =================================================================== --- head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (revision 518675) +++ head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (nonexistent) @@ -1,11 +0,0 @@ ---- OpenAL32/alBuffer.c.orig 2017-07-30 05:09:21 UTC -+++ OpenAL32/alBuffer.c -@@ -1171,7 +1171,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++) - { Property changes on: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/openal-soft/files/patch-CMakeLists.txt =================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt (revision 518675) +++ head/audio/openal-soft/files/patch-CMakeLists.txt (revision 518676) @@ -1,29 +1,29 @@ ---- CMakeLists.txt.orig 2017-09-24 13:41:50 UTC +--- CMakeLists.txt.orig 2019-11-28 08:45:08 UTC +++ CMakeLists.txt -@@ -1381,7 +1381,7 @@ endif() +@@ -1353,7 +1353,7 @@ endif() # Install alsoft.conf configuration file IF(ALSOFT_CONFIG) INSTALL(FILES alsoftrc.sample -- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft - ) +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft) MESSAGE(STATUS "Installing sample configuration") MESSAGE(STATUS "") -@@ -1391,7 +1391,7 @@ ENDIF() + ENDIF() +@@ -1361,7 +1361,7 @@ ENDIF() + # Install HRTF definitions IF(ALSOFT_HRTF_DEFS) - INSTALL(FILES hrtf/default-44100.mhr - hrtf/default-48000.mhr -- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf - ) + INSTALL(FILES hrtf/default-44100.mhr hrtf/default-48000.mhr +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf) MESSAGE(STATUS "Installing HRTF definitions") MESSAGE(STATUS "") -@@ -1405,7 +1405,7 @@ IF(ALSOFT_AMBDEC_PRESETS) - presets/rectangle.ambdec - presets/square.ambdec - presets/presets.txt -- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/presets -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets - ) + ENDIF() +@@ -1376,7 +1376,7 @@ IF(ALSOFT_AMBDEC_PRESETS) + presets/rectangle.ambdec + presets/square.ambdec + presets/presets.txt +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/presets) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets) MESSAGE(STATUS "Installing AmbDec presets") MESSAGE(STATUS "") + ENDIF() Index: head/audio/openal-soft/pkg-plist =================================================================== --- head/audio/openal-soft/pkg-plist (revision 518675) +++ head/audio/openal-soft/pkg-plist (revision 518676) @@ -1,38 +1,38 @@ %%CONFIG%%bin/alsoft-config bin/altonegen -bin/makehrtf +bin/makemhr bin/openal-info %%ETCDIR%%/alsoftrc.sample %%ETCDIR%%/hrtf/default-44100.mhr %%ETCDIR%%/hrtf/default-48000.mhr %%ETCDIR%%/presets/3D7.1.ambdec %%ETCDIR%%/presets/hexagon.ambdec %%ETCDIR%%/presets/itu5.1-nocenter.ambdec %%ETCDIR%%/presets/itu5.1.ambdec %%ETCDIR%%/presets/presets.txt %%ETCDIR%%/presets/rectangle.ambdec %%ETCDIR%%/presets/square.ambdec include/AL/al.h include/AL/alc.h include/AL/alext.h include/AL/efx-creative.h include/AL/efx-presets.h include/AL/efx.h lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenAL/OpenALConfig.cmake lib/libopenal.so lib/libopenal.so.1 -lib/libopenal.so.1.19.1 +lib/libopenal.so.%%SOVERSION%% libdata/pkgconfig/openal.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/almultireverb.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alplay.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alrecord.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alreverb.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstream.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/altonegen.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.h