audio/openal-soft: Update to 1.20.0

- Limit LLD_UNSAFE to FreeBSD 12.0.  It links fine with newer lld
  versions.

Changes:	https://raw.githubusercontent.com/kcat/openal-soft/openal-soft-1.20.0/ChangeLog

5 files changed, 33 insertions, 38 deletions

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 79fb7163edc1..2aef5ec1fb7a 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openal-soft
-PORTVERSION=	1.19.1
-PORTREVISION=	3
+PORTVERSION=	1.20.0
 CATEGORIES=	audio
 MASTER_SITES=	https://openal-soft.org/openal-releases/
 
@@ -12,7 +11,9 @@ COMMENT=	Software implementation of the OpenAL specification
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake compiler:c11 tar:bzip2
+LIB_DEPENDS=	libmysofa.so:audio/libmysofa
+
+USES=		cmake compiler:c++11-lang tar:bzip2
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"
@@ -22,7 +23,12 @@ CMAKE_ON=	ALSOFT_BACKEND_WAVE ALSOFT_UTILS
 
 # do not link with librt and libdl.
 LDFLAGS+=	-Wl,--as-needed
+# fails to link with lld 6, remove after FreeBSD 12.0 EOL
+.if exists(/usr/lib/clang/6.0.1)
 LLD_UNSAFE=	yes
+.endif
+
+PLIST_SUB=	SOVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO
 OPTIONS_DEFAULT=	OSS
@@ -55,7 +61,7 @@ SNDIO_CMAKE_BOOL=	ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
-		${WRKSRC}/Alc/alconfig.c
+		${WRKSRC}/alc/alconfig.cpp
 
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo
index e81926990dca..cdae0673385d 100644
--- a/audio/openal-soft/distinfo
+++ b/audio/openal-soft/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539442332
-SHA256 (openal-soft-1.19.1.tar.bz2) = 5c2f87ff5188b95e0dc4769719a9d89ce435b8322b4478b95dd4b427fe84b2e9
-SIZE (openal-soft-1.19.1.tar.bz2) = 577310
+TIMESTAMP = 1575041266
+SHA256 (openal-soft-1.20.0.tar.bz2) = c089497922b454baf96d5e4bbc1a114cf75c56b44801edc48b9b82ab5ed1e60e
+SIZE (openal-soft-1.20.0.tar.bz2) = 587550
diff --git a/audio/openal-soft/files/patch-CMakeLists.txt b/audio/openal-soft/files/patch-CMakeLists.txt
index a4a07355bc54..802eec6b0ae0 100644
--- a/audio/openal-soft/files/patch-CMakeLists.txt
+++ b/audio/openal-soft/files/patch-CMakeLists.txt
@@ -1,29 +1,29 @@
---- CMakeLists.txt.orig	2017-09-24 13:41:50 UTC
+--- CMakeLists.txt.orig	2019-11-28 08:45:08 UTC
 +++ CMakeLists.txt
-@@ -1381,7 +1381,7 @@ endif()
+@@ -1353,7 +1353,7 @@ endif()
  # Install alsoft.conf configuration file
  IF(ALSOFT_CONFIG)
      INSTALL(FILES alsoftrc.sample
--            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal
-+            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft
-     )
+-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
      MESSAGE(STATUS "Installing sample configuration")
      MESSAGE(STATUS "")
-@@ -1391,7 +1391,7 @@ ENDIF()
+ ENDIF()
+@@ -1361,7 +1361,7 @@ ENDIF()
+ # Install HRTF definitions
  IF(ALSOFT_HRTF_DEFS)
-     INSTALL(FILES hrtf/default-44100.mhr
-                   hrtf/default-48000.mhr
--            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf
-+            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf
-     )
+     INSTALL(FILES hrtf/default-44100.mhr hrtf/default-48000.mhr
+-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf)
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf)
      MESSAGE(STATUS "Installing HRTF definitions")
      MESSAGE(STATUS "")
-@@ -1405,7 +1405,7 @@ IF(ALSOFT_AMBDEC_PRESETS)
-                   presets/rectangle.ambdec
-                   presets/square.ambdec
-                   presets/presets.txt
--            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/presets
-+            DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets
-     )
+ ENDIF()
+@@ -1376,7 +1376,7 @@ IF(ALSOFT_AMBDEC_PRESETS)
+         presets/rectangle.ambdec
+         presets/square.ambdec
+         presets/presets.txt
+-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/presets)
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets)
      MESSAGE(STATUS "Installing AmbDec presets")
      MESSAGE(STATUS "")
+ ENDIF()
diff --git a/audio/openal-soft/files/patch-OpenAL32_alBuffer.c b/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
deleted file mode 100644
index 974f84ec5557..000000000000
--- a/audio/openal-soft/files/patch-OpenAL32_alBuffer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenAL32/alBuffer.c.orig	2017-07-30 05:09:21 UTC
-+++ OpenAL32/alBuffer.c
-@@ -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;
- 
-     for(i = 0;i < COUNTOF(list);i++)
-     {
diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
index 9a3c497c89ac..4743237842af 100644
--- a/audio/openal-soft/pkg-plist
+++ b/audio/openal-soft/pkg-plist
@@ -1,6 +1,6 @@
 %%CONFIG%%bin/alsoft-config
 bin/altonegen
-bin/makehrtf
+bin/makemhr
 bin/openal-info
 %%ETCDIR%%/alsoftrc.sample
 %%ETCDIR%%/hrtf/default-44100.mhr
@@ -22,7 +22,7 @@ lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OpenAL/OpenALConfig.cmake
 lib/libopenal.so
 lib/libopenal.so.1
-lib/libopenal.so.1.19.1
+lib/libopenal.so.%%SOVERSION%%
 libdata/pkgconfig/openal.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c