MFH: r448257 r448269 r450103

audio/openal-soft: update to 1.18.1

- Add EXAMPLES and OSS options
- 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:		220931 222437
Submitted by:	Yuri Victorovich <yuri@rawbw.com>
Submitted by:	kdrakehp@zoho.com
Approved by:	ports-secteam (delphij)

6 files changed, 82 insertions, 23 deletions

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 1a8d2a3e..6841223 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openal-soft
-PORTVERSION=	1.17.2
-PORTREVISION=	2
+PORTVERSION=	1.18.1
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -17,17 +16,19 @@ 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_EXAMPLES:BOOL=OFF \
+		-DALSOFT_UTILS:BOOL=ON
 
-OPTIONS_DEFINE=		FLUIDSYNTH CONFIG 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)
 
@@ -40,6 +41,8 @@ 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
@@ -56,7 +59,11 @@ SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 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
 
+post-install-EXAMPLES-on:
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
+
 .include <bsd.port.mk>
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
index fd4bd11..faec72e 100644
--- a/audio/openal-soft/distinfo
+++ b/audio/openal-soft/distinfo
@@ -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 = 1501391361
+SHA256 (openal-soft-1.18.1.tar.bz2) = 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd
+SIZE (openal-soft-1.18.1.tar.bz2) = 638913
diff --git a/audio/openal-soft/files/patch-Alc_backends_jack.c b/audio/openal-soft/files/patch-Alc_backends_jack.c
new file mode 100644
index 0000000..0bcdde9
--- /dev/null
+++ b/audio/openal-soft/files/patch-Alc_backends_jack.c
@@ -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);
diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt
index d111cfb..4f330d5 100644
--- a/audio/openal-soft/files/patch-CMakeLists.txt
+++ b/audio/openal-soft/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-01-25 03:12:39 UTC
+--- CMakeLists.txt.orig	2017-07-30 05:09:21 UTC
 +++ CMakeLists.txt
-@@ -582,10 +582,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
-@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL)
-             DESTINATION include/AL
+@@ -1322,7 +1318,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()
- 
- 
+     IF(TARGET soft_oal)
+         INSTALL(TARGETS soft_oal
+                 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/audio/openal-soft/files/patch-OpenAL32_alBuffer.c b/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
index 3587b3e..974f84e 100644
--- a/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
+++ b/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
@@ -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;
diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
index f7f64e4..535d0dd 100644
--- a/audio/openal-soft/pkg-plist
+++ b/audio/openal-soft/pkg-plist
@@ -6,13 +6,31 @@ 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.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