audio/openal-soft: Update to 1.18.0, Add EXAMPLES and OSS options

PR:		220931
Submitted by:	Yuri Victorovich <yuri@rawbw.com>

5 files changed, 45 insertions, 16 deletions

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 1a8d2a3eb1fe..81a5079bbb73 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.0
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -17,17 +16,17 @@ 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)
 
@@ -40,6 +39,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
@@ -52,11 +53,15 @@ 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 <bsd.port.mk>
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
index fd4bd1196dc9..0915ffd8beb6 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 = 1500783565
+SHA256 (openal-soft-1.18.0.tar.bz2) = 4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde
+SIZE (openal-soft-1.18.0.tar.bz2) = 627614
diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt
index d111cfbe7bd3..a481b198fee3 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-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)
  
@@ -11,11 +11,11 @@
  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()
  
diff --git a/audio/openal-soft/files/patch-examples_alffplay.cpp b/audio/openal-soft/files/patch-examples_alffplay.cpp
new file mode 100644
index 000000000000..4a3561ac5776
--- /dev/null
+++ b/audio/openal-soft/files/patch-examples_alffplay.cpp
@@ -0,0 +1,10 @@
+--- examples/alffplay.cpp.orig	2017-07-23 04:34:58 UTC
++++ examples/alffplay.cpp
+@@ -16,6 +16,7 @@
+ #include <atomic>
+ #include <mutex>
+ #include <deque>
++#include <array>
+ 
+ extern "C" {
+ #include "libavcodec/avcodec.h"
diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
index f7f64e4e06cc..3cd12d946bd7 100644
--- a/audio/openal-soft/pkg-plist
+++ b/audio/openal-soft/pkg-plist
@@ -6,13 +6,27 @@ 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