diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index 1a3213fdbd8e..e14ca836e126 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -1,66 +1,65 @@ PORTNAME= openal-soft -PORTVERSION= 1.20.1 -PORTREVISION= 2 +PORTVERSION= 1.21.0 CATEGORIES= audio MASTER_SITES= https://openal-soft.org/openal-releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Software implementation of the OpenAL specification LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmysofa.so:audio/libmysofa -USES= cmake compiler:c++11-lang tar:bzip2 +USES= cmake compiler:c++14-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 LDFLAGS_i386= -Wl,-z,notext 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.cpp post-install-EXAMPLES-on: (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo index 46821967b6c2..a65ad7df606d 100644 --- a/audio/openal-soft/distinfo +++ b/audio/openal-soft/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579899553 -SHA256 (openal-soft-1.20.1.tar.bz2) = b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d -SIZE (openal-soft-1.20.1.tar.bz2) = 512971 +TIMESTAMP = 1611467857 +SHA256 (openal-soft-1.21.0.tar.bz2) = 2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297 +SIZE (openal-soft-1.21.0.tar.bz2) = 525483 diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt index 538a685a4e13..59cc59de4b5b 100644 --- a/audio/openal-soft/files/patch-CMakeLists.txt +++ b/audio/openal-soft/files/patch-CMakeLists.txt @@ -1,29 +1,25 @@ ---- CMakeLists.txt.orig 2020-01-24 07:28:45 UTC +--- CMakeLists.txt.orig 2020-11-04 10:00:35 UTC +++ CMakeLists.txt -@@ -1347,7 +1347,7 @@ endif() - # Install alsoft.conf configuration file - IF(ALSOFT_CONFIG) - INSTALL(FILES alsoftrc.sample +@@ -1394,19 +1394,19 @@ endif() + + if(ALSOFT_INSTALL_CONFIG) + install(FILES alsoftrc.sample - DESTINATION ${CMAKE_INSTALL_DATADIR}/openal) + DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft) - MESSAGE(STATUS "Installing sample configuration") - MESSAGE(STATUS "") - ENDIF() -@@ -1355,7 +1355,7 @@ ENDIF() - # Install HRTF definitions - IF(ALSOFT_HRTF_DEFS) - INSTALL(FILES "hrtf/Default HRTF.mhr" -- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf) -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf) - MESSAGE(STATUS "Installing HRTF definitions") - MESSAGE(STATUS "") - ENDIF() -@@ -1370,7 +1370,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() + message(STATUS "Installing sample configuration") + endif() + + if(ALSOFT_INSTALL_HRTF_DATA) + install(DIRECTORY hrtf +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft) + message(STATUS "Installing HRTF data files") + endif() + + if(ALSOFT_INSTALL_AMBDEC_PRESETS) + install(DIRECTORY presets +- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft) + message(STATUS "Installing AmbDec presets") + endif() + message(STATUS "") diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist index ae0bfbb554a3..08321dfbc00a 100644 --- a/audio/openal-soft/pkg-plist +++ b/audio/openal-soft/pkg-plist @@ -1,37 +1,38 @@ %%CONFIG%%bin/alsoft-config -bin/altonegen bin/makemhr bin/openal-info %%ETCDIR%%/alsoftrc.sample %%ETCDIR%%/hrtf/Default HRTF.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.%%SOVERSION%% libdata/pkgconfig/openal.pc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alconvolve.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstreamcb.cpp %%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