Index: head/audio/openal-soft/Makefile =================================================================== --- head/audio/openal-soft/Makefile (revision 450102) +++ head/audio/openal-soft/Makefile (revision 450103) @@ -1,65 +1,70 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.18.0 -PORTREVISION= 2 +PORTVERSION= 1.18.1 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 LLD_UNSAFE= yes CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \ -DALSOFT_REQUIRE_OSS:BOOL=OFF \ -DALSOFT_REQUIRE_JACK:BOOL=OFF \ -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_EXAMPLES:BOOL=OFF \ -DALSOFT_UTILS:BOOL=ON -OPTIONS_DEFINE= FLUIDSYNTH CONFIG OSS JACK PORTAUDIO PULSEAUDIO SNDIO +OPTIONS_DEFINE= EXAMPLES FLUIDSYNTH CONFIG OSS JACK PORTAUDIO \ + PULSEAUDIO SNDIO 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 post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ ${WRKSRC}/Alc/alcConfig.c @${REINPLACE_CMD} 's|$${CMAKE_INSTALL_DATADIR}/openal|${ETCDIR}|' \ ${WRKSRC}/CMakeLists.txt + +post-install-EXAMPLES-on: + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/audio/openal-soft/distinfo =================================================================== --- head/audio/openal-soft/distinfo (revision 450102) +++ head/audio/openal-soft/distinfo (revision 450103) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500783565 -SHA256 (openal-soft-1.18.0.tar.bz2) = 4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde -SIZE (openal-soft-1.18.0.tar.bz2) = 627614 +TIMESTAMP = 1501391361 +SHA256 (openal-soft-1.18.1.tar.bz2) = 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd +SIZE (openal-soft-1.18.1.tar.bz2) = 638913 Index: head/audio/openal-soft/files/patch-examples_alffplay.cpp =================================================================== --- head/audio/openal-soft/files/patch-examples_alffplay.cpp (revision 450102) +++ head/audio/openal-soft/files/patch-examples_alffplay.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- 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 ___________________________________________________________________ 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-Alc_backends_jack.c =================================================================== --- head/audio/openal-soft/files/patch-Alc_backends_jack.c (nonexistent) +++ head/audio/openal-soft/files/patch-Alc_backends_jack.c (revision 450103) @@ -0,0 +1,34 @@ +--- Alc/backends/jack.c.orig 2017-07-30 05:09:21 UTC ++++ Alc/backends/jack.c +@@ -35,11 +35,13 @@ + #include + + ++extern void default_jack_error_callback(const char *msg) JACK_OPTIONAL_WEAK_EXPORT; ++ + static const ALCchar jackDevice[] = "JACK Default"; + +- + #ifdef HAVE_DYNLOAD + #define JACK_FUNCS(MAGIC) \ ++ MAGIC(default_jack_error_callback); \ + MAGIC(jack_client_open); \ + MAGIC(jack_client_close); \ + MAGIC(jack_client_name_size); \ +@@ -65,6 +67,7 @@ static void *jack_handle; + JACK_FUNCS(MAKE_FUNC); + #undef MAKE_FUNC + ++#define default_jack_error_callback (*pdefault_jack_error_callback) + #define jack_client_open pjack_client_open + #define jack_client_close pjack_client_close + #define jack_client_name_size pjack_client_name_size +@@ -567,7 +570,7 @@ static ALCboolean ALCjackBackendFactory_init(ALCjackBa + + jack_set_error_function(jack_msg_handler); + client = jack_client_open("alsoft", ClientOptions, &status, NULL); +- jack_set_error_function(NULL); ++ jack_set_error_function(default_jack_error_callback); + if(client == NULL) + { + WARN("jack_client_open() failed, 0x%02x\n", status); Property changes on: head/audio/openal-soft/files/patch-Alc_backends_jack.c ___________________________________________________________________ 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/files/patch-CMakeLists.txt =================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt (revision 450102) +++ head/audio/openal-soft/files/patch-CMakeLists.txt (revision 450103) @@ -1,22 +1,22 @@ ---- CMakeLists.txt.orig 2017-06-04 14:31:22 UTC +--- CMakeLists.txt.orig 2017-07-30 05:09:21 UTC +++ CMakeLists.txt -@@ -643,10 +643,6 @@ int main() +@@ -646,10 +646,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 -@@ -1299,7 +1295,7 @@ IF(ALSOFT_INSTALL) +@@ -1322,7 +1318,7 @@ IF(ALSOFT_INSTALL) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL ) INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + DESTINATION "libdata/pkgconfig") - ENDIF() - - + IF(TARGET soft_oal) + INSTALL(TARGETS soft_oal + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} Index: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c =================================================================== --- head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (revision 450102) +++ head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (revision 450103) @@ -1,11 +1,11 @@ ---- OpenAL32/alBuffer.c.orig 2016-01-25 03:12:39 UTC +--- OpenAL32/alBuffer.c.orig 2017-07-30 05:09:21 UTC +++ OpenAL32/alBuffer.c -@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum - { AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort }, - { AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat }, +@@ -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++) { Index: head/audio/openal-soft/pkg-plist =================================================================== --- head/audio/openal-soft/pkg-plist (revision 450102) +++ head/audio/openal-soft/pkg-plist (revision 450103) @@ -1,26 +1,36 @@ 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/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenAL/OpenALConfig.cmake -lib/libopenal.so.1.18.0 +lib/libopenal.so.1.18.1 lib/libopenal.so.1 lib/libopenal.so libdata/pkgconfig/openal.pc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.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