Index: head/audio/openal-soft/Makefile =================================================================== --- head/audio/openal-soft/Makefile (revision 448256) +++ head/audio/openal-soft/Makefile (revision 448257) @@ -1,62 +1,67 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.17.2 -PORTREVISION= 2 +PORTVERSION= 1.18.0 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Software implementation of the OpenAL specification LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= openal-200[0-9]* USES= tar:bzip2 cmake compiler:c11 USE_LDCONFIG= yes CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \ + -DALSOFT_REQUIRE_OSS:BOOL=OFF \ -DALSOFT_REQUIRE_JACK:BOOL=OFF \ - -DALSOFT_REQUIRE_OSS:BOOL=ON \ -DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \ -DALSOFT_REQUIRE_SNDIO:BOOL=OFF \ -DALSOFT_REQUIRE_QSA:BOOL=OFF \ -DALSOFT_BACKEND_ALSA:BOOL=OFF \ -DALSOFT_BACKEND_WAVE:BOOL=ON \ - -DALSOFT_UTILS:BOOL=ON \ - -DALSOFT_EXAMPLES:BOOL=OFF + -DALSOFT_UTILS:BOOL=ON -OPTIONS_DEFINE= FLUIDSYNTH CONFIG JACK PORTAUDIO PULSEAUDIO SNDIO +OPTIONS_DEFINE= FLUIDSYNTH CONFIG OSS JACK PORTAUDIO PULSEAUDIO SNDIO EXAMPLES +OPTIONS_DEFAULT= OSS OPTIONS_SUB= yes CONFIG_DESC= Install configuration utility (needs Qt 4.x) #ALSA_CMAKE_ON= -DALSOFT_REQUIRE_ALSA:BOOL=ON #ALSA_CMAKE_OFF= -DALSOFT_BACKEND_ALSA:BOOL=OFF #ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib CONFIG_CMAKE_ON= -DALSOFT_NO_CONFIG_UTIL:BOOL=OFF CONFIG_CMAKE_OFF= -DALSOFT_NO_CONFIG_UTIL:BOOL=ON CONFIG_USE= QT4=corelib,gui,qmake_build,moc_build,rcc_build,uic_build FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +OSS_CMAKE_ON= -DALSOFT_REQUIRE_OSS:BOOL=ON +OSS_CMAKE_OFF= -DALSOFT_BACKEND_OSS:BOOL=OFF JACK_CMAKE_ON= -DALSOFT_REQUIRE_JACK:BOOL=ON JACK_CMAKE_OFF= -DALSOFT_BACKEND_JACK:BOOL=OFF JACK_LIB_DEPENDS= libjack.so:audio/jack PORTAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON PORTAUDIO_CMAKE_OFF= -DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PULSEAUDIO_CMAKE_ON= -DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON PULSEAUDIO_CMAKE_OFF= -DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio SNDIO_CMAKE_ON= -DALSOFT_REQUIRE_SNDIO:BOOL=ON SNDIO_CMAKE_OFF= -DALSOFT_BACKEND_SNDIO:BOOL=OFF SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +EXAMPLES_CMAKE_ON= -DALSOFT_EXAMPLES:BOOL=ON +EXAMPLES_CMAKE_OFF= -DALSOFT_EXAMPLES:BOOL=OFF +EXAMPLES_USE= SDL=sdl2,sound +EXAMPLES_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ ${WRKSRC}/Alc/alcConfig.c - @${REINPLACE_CMD} 's|$${SHARE_INSTALL_DIR}/openal|${ETCDIR}|' \ + @${REINPLACE_CMD} 's|$${CMAKE_INSTALL_DATADIR}/openal|${ETCDIR}|' \ ${WRKSRC}/CMakeLists.txt .include Index: head/audio/openal-soft/distinfo =================================================================== --- head/audio/openal-soft/distinfo (revision 448256) +++ head/audio/openal-soft/distinfo (revision 448257) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474007361 -SHA256 (openal-soft-1.17.2.tar.bz2) = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 -SIZE (openal-soft-1.17.2.tar.bz2) = 486934 +TIMESTAMP = 1500783565 +SHA256 (openal-soft-1.18.0.tar.bz2) = 4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde +SIZE (openal-soft-1.18.0.tar.bz2) = 627614 Index: head/audio/openal-soft/files/patch-CMakeLists.txt =================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt (revision 448256) +++ head/audio/openal-soft/files/patch-CMakeLists.txt (revision 448257) @@ -1,22 +1,22 @@ ---- CMakeLists.txt.orig 2016-01-25 03:12:39 UTC +--- CMakeLists.txt.orig 2017-06-04 14:31:22 UTC +++ CMakeLists.txt -@@ -582,10 +582,6 @@ int main() +@@ -643,10 +643,6 @@ int main() CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK) - CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT) - IF(HAVE_LIBRT) - SET(EXTRA_LIBS rt ${EXTRA_LIBS}) - ENDIF() ENDIF() # Check for a 64-bit type -@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL) - DESTINATION include/AL +@@ -1299,7 +1295,7 @@ IF(ALSOFT_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL ) INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc" -- DESTINATION "lib${LIB_SUFFIX}/pkgconfig") +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + DESTINATION "libdata/pkgconfig") ENDIF() Index: head/audio/openal-soft/files/patch-examples_alffplay.cpp =================================================================== --- head/audio/openal-soft/files/patch-examples_alffplay.cpp (nonexistent) +++ head/audio/openal-soft/files/patch-examples_alffplay.cpp (revision 448257) @@ -0,0 +1,10 @@ +--- examples/alffplay.cpp.orig 2017-07-23 04:34:58 UTC ++++ examples/alffplay.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + extern "C" { + #include "libavcodec/avcodec.h" Property changes on: head/audio/openal-soft/files/patch-examples_alffplay.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/openal-soft/pkg-plist =================================================================== --- head/audio/openal-soft/pkg-plist (revision 448256) +++ head/audio/openal-soft/pkg-plist (revision 448257) @@ -1,18 +1,32 @@ bin/altonegen bin/bsincgen bin/makehrtf %%CONFIG%%bin/alsoft-config 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.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.h include/AL/efx-creative.h include/AL/efx-presets.h -lib/libopenal.so.1.17.2 +lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/OpenAL/OpenALConfig.cmake +lib/libopenal.so.1.18.0 lib/libopenal.so.1 lib/libopenal.so libdata/pkgconfig/openal.pc +%%EXAMPLES%%bin/alffplay +%%EXAMPLES%%bin/alhrtf +%%EXAMPLES%%bin/allatency +%%EXAMPLES%%bin/alloopback +%%EXAMPLES%%bin/alreverb +%%EXAMPLES%%bin/alstream