Index: branches/2017Q4/audio/openal-soft/Makefile =================================================================== --- branches/2017Q4/audio/openal-soft/Makefile (revision 454946) +++ branches/2017Q4/audio/openal-soft/Makefile (revision 454947) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.18.1 +PORTVERSION= 1.18.2 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= 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: branches/2017Q4/audio/openal-soft/distinfo =================================================================== --- branches/2017Q4/audio/openal-soft/distinfo (revision 454946) +++ branches/2017Q4/audio/openal-soft/distinfo (revision 454947) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501391361 -SHA256 (openal-soft-1.18.1.tar.bz2) = 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd -SIZE (openal-soft-1.18.1.tar.bz2) = 638913 +TIMESTAMP = 1506260510 +SHA256 (openal-soft-1.18.2.tar.bz2) = 9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82 +SIZE (openal-soft-1.18.2.tar.bz2) = 639420 Index: branches/2017Q4/audio/openal-soft/files/patch-Alc_backends_jack.c =================================================================== --- branches/2017Q4/audio/openal-soft/files/patch-Alc_backends_jack.c (revision 454946) +++ branches/2017Q4/audio/openal-soft/files/patch-Alc_backends_jack.c (nonexistent) @@ -1,34 +0,0 @@ ---- 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: branches/2017Q4/audio/openal-soft/files/patch-Alc_backends_jack.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: branches/2017Q4/audio/openal-soft/pkg-plist =================================================================== --- branches/2017Q4/audio/openal-soft/pkg-plist (revision 454946) +++ branches/2017Q4/audio/openal-soft/pkg-plist (revision 454947) @@ -1,36 +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.1 +lib/libopenal.so.1.18.2 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 Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 454946) +++ branches/2017Q4 (revision 454947) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r451176