Date: Fri, 29 Nov 2019 22:10:30 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518676 - in head/audio/openal-soft: . files Message-ID: <201911292210.xATMAV2F071524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Nov 29 22:10:30 2019 New Revision: 518676 URL: https://svnweb.freebsd.org/changeset/ports/518676 Log: 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 Deleted: head/audio/openal-soft/files/patch-OpenAL32_alBuffer.c Modified: head/audio/openal-soft/Makefile head/audio/openal-soft/distinfo head/audio/openal-soft/files/patch-CMakeLists.txt head/audio/openal-soft/pkg-plist Modified: head/audio/openal-soft/Makefile ============================================================================== --- head/audio/openal-soft/Makefile Fri Nov 29 22:08:31 2019 (r518675) +++ head/audio/openal-soft/Makefile Fri Nov 29 22:10:30 2019 (r518676) @@ -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 specifi 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,8 +23,13 @@ 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 OPTIONS_SUB= yes @@ -55,7 +61,7 @@ SNDIO_CMAKE_BOOL= ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_ 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} . \ Modified: head/audio/openal-soft/distinfo ============================================================================== --- head/audio/openal-soft/distinfo Fri Nov 29 22:08:31 2019 (r518675) +++ head/audio/openal-soft/distinfo Fri Nov 29 22:10:30 2019 (r518676) @@ -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 Modified: head/audio/openal-soft/files/patch-CMakeLists.txt ============================================================================== --- head/audio/openal-soft/files/patch-CMakeLists.txt Fri Nov 29 22:08:31 2019 (r518675) +++ head/audio/openal-soft/files/patch-CMakeLists.txt Fri Nov 29 22:10:30 2019 (r518676) @@ -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() Modified: head/audio/openal-soft/pkg-plist ============================================================================== --- head/audio/openal-soft/pkg-plist Fri Nov 29 22:08:31 2019 (r518675) +++ head/audio/openal-soft/pkg-plist Fri Nov 29 22:10:30 2019 (r518676) @@ -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%%.cma 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911292210.xATMAV2F071524>