- Update to version 1.16.0

This version provides
  * additional and improved effects
  * high- and band-pass EFX filters
  * improved resampling support
  * improved audio back-end support
  * a GUI configuration utility (based on QT)
  * and lots of other features: http://kcat.strangesoft.net/openal.html

5 files changed, 65 insertions, 67 deletions

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 1a064afefa07..1c82f943e31d 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openal-soft
-PORTVERSION=	1.15.1
-PORTREVISION=	2
+PORTVERSION=	1.16.0
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -15,24 +14,37 @@ CONFLICTS=	openal-200[0-9]*
 
 USES=		tar:bzip2 cmake
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DALSA:BOOL=OFF -DPORTAUDIO:BOOL=OFF -DSOLARIS:BOOL=OFF \
-		-DDSOUND:BOOL=OFF -DSNDIO:BOOL=OFF -DEXAMPLES:BOOL=OFF \
-		-DMMDEVAPI:BOOL=OFF -DWINMM:BOOL=OFF -DCOREAUDIO:BOOL=OFF \
-		-DOPENSL:BOOL=OFF -DALSOFT_CONFIG:BOOL=ON
-
-OPTIONS_DEFINE=		PULSEAUDIO
-PULSEAUDIO_DESC=	Enable sound streaming using PulseAudio
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
-CFLAGS+=	-Iinclude -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=ON
-.else
-CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=OFF
-.endif
+CMAKE_ARGS+=	-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
+
+OPTIONS_DEFINE=		FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO
+OPTIONS_SUB=		yes
+CONFIG_DESC=		Install the configuration utility (needs QT)
+FLUIDSYNTH_DESC=	Enable FluidSynth MIDI support
+
+#ALSA_CMAKE_ON=		-DALSOFT_REQUIRE_ALSA:BOOL=ON
+#ALSA_CMAKE_OFF=		-DALSOFT_BACKEND_ALSA:BOOL=OFF
+#ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+CONFIG_CMAKE_ON=	-DALSOFT_NO_CONFIG_UTIL:BOOL=OFF
+CONFIG_CMAKE_OFF=	-DALSOFT_NO_CONFIG_UTIL:BOOL=ON
+CONFIG_USE=		QT4=gui
+FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
+FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+PORTAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON \
+			-DPORTAUDIO_LIBRARY=${LOCALBASE}/lib/portaudio2/libportaudio.so
+PORTAUDIO_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
+PORTAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PULSEAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON
+PULSEAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
@@ -40,5 +52,7 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \
 		${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} 's|portaudio.h|portaudio2/portaudio.h|' \
+		${WRKSRC}/Alc/backends/portaudio.c
 
 .include <bsd.port.mk>
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
index cef8647a881b..f7362edf87ab 100644
--- a/audio/openal-soft/distinfo
+++ b/audio/openal-soft/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openal-soft-1.15.1.tar.bz2) = 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056
-SIZE (openal-soft-1.15.1.tar.bz2) = 253006
+SHA256 (openal-soft-1.16.0.tar.bz2) = 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f
+SIZE (openal-soft-1.16.0.tar.bz2) = 393280
diff --git a/audio/openal-soft/files/patch-Alc-ALu.c b/audio/openal-soft/files/patch-Alc-ALu.c
deleted file mode 100644
index 75b767f31d96..000000000000
--- a/audio/openal-soft/files/patch-Alc-ALu.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- Alc/ALu.c.orig	2013-05-23 08:00:01.000000000 +0200
-+++ Alc/ALu.c	2013-05-23 08:01:20.000000000 +0200
-@@ -912,24 +912,27 @@
- }
- 
- 
--static __inline ALfloat aluF2F(ALfloat val)
--{ return val; }
--static __inline ALint aluF2I(ALfloat val)
-+static __inline ALint aluF2I25(ALfloat val)
- {
-     /* Clamp the value between -1 and +1. This handles that without branching. */
-     val = val+1.0f - fabsf(val-1.0f);
-     val = (val-2.0f + fabsf(val+2.0f)) * 0.25f;
--    /* Convert to a signed integer, between -2147483647 and +2147483647. */
--    return fastf2i((ALfloat)(val*2147483647.0));
-+    /* Convert to a signed integer, between -16777215 and +16777215. */
-+    return fastf2i(val*16777215.0f);
- }
-+
-+static __inline ALfloat aluF2F(ALfloat val)
-+{ return val; }
-+static __inline ALint aluF2I(ALfloat val)
-+{ return aluF2I25(val)<<7; }
- static __inline ALuint aluF2UI(ALfloat val)
- { return aluF2I(val)+2147483648u; }
- static __inline ALshort aluF2S(ALfloat val)
--{ return aluF2I(val)>>16; }
-+{ return aluF2I25(val)>>9; }
- static __inline ALushort aluF2US(ALfloat val)
- { return aluF2S(val)+32768; }
- static __inline ALbyte aluF2B(ALfloat val)
--{ return aluF2I(val)>>24; }
-+{ return aluF2I25(val)>>17; }
- static __inline ALubyte aluF2UB(ALfloat val)
- { return aluF2B(val)+128; }
- 
diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt
index 723a700b56c9..3d83e5817d4e 100644
--- a/audio/openal-soft/files/patch-CMakeLists.txt
+++ b/audio/openal-soft/files/patch-CMakeLists.txt
@@ -1,8 +1,28 @@
---- CMakeLists.txt.orig	2011-02-15 21:05:40.000000000 +0100
-+++ CMakeLists.txt	2011-02-17 21:52:49.000000000 +0100
-@@ -270,10 +270,6 @@
+--- CMakeLists.txt.orig	2014-08-15 07:06:59 UTC
++++ CMakeLists.txt
+@@ -62,8 +62,8 @@
+     SET(LIBNAME openal)
  
-     CHECK_LIBRARY_EXISTS(pthread pthread_setschedparam "" HAVE_PTHREAD_SETSCHEDPARAM)
+     # These are needed on non-Windows systems for extra features
+-    ADD_DEFINITIONS(-D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
+-    SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700")
++    ADD_DEFINITIONS(-D_GNU_SOURCE=1)
++    SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1")
+ ENDIF()
+ 
+ # Set defines for large file support
+@@ -186,7 +186,7 @@
+ # Check if we have C11 _Atomic
+ CHECK_C_SOURCE_COMPILES(
+ "#include <stdatomic.h>
+- int _Atomic foo;
++ const int _Atomic foo = ATOMIC_VAR_INIT(~0);
+  int main()
+  {
+      return atomic_load(&foo);
+@@ -523,10 +523,6 @@
+ 
+     CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
  
 -    CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT)
 -    IF(HAVE_LIBRT)
@@ -11,7 +31,7 @@
  ENDIF()
  
  # Check for a 64-bit type
-@@ -502,7 +498,7 @@
+@@ -1108,7 +1104,7 @@
          DESTINATION include/AL
  )
  INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
index 2965557d500f..b70e23291aee 100644
--- a/audio/openal-soft/pkg-plist
+++ b/audio/openal-soft/pkg-plist
@@ -1,15 +1,16 @@
 bin/makehrtf
+%%CONFIG%%bin/alsoft-config
 bin/openal-info
 %%ETCDIR%%/alsoftrc.sample
+%%ETCDIR%%/hrtf/default-44100.mhr
+%%ETCDIR%%/hrtf/default-48000.mhr
 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.15.1
+lib/libopenal.so.1.16.0
 lib/libopenal.so.1
 lib/libopenal.so
 libdata/pkgconfig/openal.pc
-@dirrmtry include/AL
-@dirrmtry %%ETCDIR%%