Date: Tue, 19 Sep 2017 05:07:08 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450103 - in head/audio/openal-soft: . files Message-ID: <201709190507.v8J578CT052280@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Sep 19 05:07:08 2017 New Revision: 450103 URL: https://svnweb.freebsd.org/changeset/ports/450103 Log: audio/openal-soft: update to 1.18.1 - Add the EXAMPLES option - Add a patch to fix the Jack backend for Jack 1 Changes: http://kcat.strangesoft.net/openal.html#release ABI: https://abi-laboratory.pro/tracker/timeline/openal/ PR: 222437 Submitted by: kdrakehp@zoho.com MFH: 2017Q3 Added: head/audio/openal-soft/files/patch-Alc_backends_jack.c (contents, props changed) Deleted: head/audio/openal-soft/files/patch-examples_alffplay.cpp Modified: head/audio/openal-soft/Makefile (contents, props changed) head/audio/openal-soft/distinfo (contents, props changed) head/audio/openal-soft/files/patch-CMakeLists.txt (contents, props changed) head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c (contents, props changed) head/audio/openal-soft/pkg-plist (contents, props changed) Modified: head/audio/openal-soft/Makefile ============================================================================== --- head/audio/openal-soft/Makefile Tue Sep 19 05:06:03 2017 (r450102) +++ head/audio/openal-soft/Makefile Tue Sep 19 05:07:08 2017 (r450103) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.18.0 -PORTREVISION= 2 +PORTVERSION= 1.18.1 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ @@ -25,9 +24,11 @@ CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \ -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) @@ -61,5 +62,9 @@ post-patch: ${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 <bsd.port.mk> Modified: head/audio/openal-soft/distinfo ============================================================================== --- head/audio/openal-soft/distinfo Tue Sep 19 05:06:03 2017 (r450102) +++ head/audio/openal-soft/distinfo Tue Sep 19 05:07:08 2017 (r450103) @@ -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 Added: head/audio/openal-soft/files/patch-Alc_backends_jack.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/openal-soft/files/patch-Alc_backends_jack.c Tue Sep 19 05:07:08 2017 (r450103) @@ -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 <jack/ringbuffer.h> + + ++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); Modified: head/audio/openal-soft/files/patch-CMakeLists.txt ============================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt Tue Sep 19 05:06:03 2017 (r450102) +++ head/audio/openal-soft/files/patch-CMakeLists.txt Tue Sep 19 05:07:08 2017 (r450103) @@ -1,6 +1,6 @@ ---- 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) @@ -11,12 +11,12 @@ 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} Modified: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c ============================================================================== --- head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Tue Sep 19 05:06:03 2017 (r450102) +++ head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Tue Sep 19 05:07:08 2017 (r450103) @@ -1,8 +1,8 @@ ---- 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; Modified: head/audio/openal-soft/pkg-plist ============================================================================== --- head/audio/openal-soft/pkg-plist Tue Sep 19 05:06:03 2017 (r450102) +++ head/audio/openal-soft/pkg-plist Tue Sep 19 05:07:08 2017 (r450103) @@ -20,7 +20,17 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709190507.v8J578CT052280>