diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index 708da77011c0..d709a2f65bbc 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -1,59 +1,49 @@ PORTNAME= libsndfile -DISTVERSION= 1.2.0 -PORTREVISION= 1 +DISTVERSION= 1.2.2 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) WWW= http://www.mega-nerd.com/libsndfile/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake cpe localbase pathfix pkgconfig python:build,test \ shebangfix tar:xz SHEBANG_FILES= programs/test-sndfile-metadata-set.py \ src/binheader_writef_check.py \ src/create_symbols_file.py CPE_VENDOR= ${CPE_PRODUCT}_project USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=True \ -DCMAKE_DISABLE_FIND_PACKAGE_Sndio:BOOL=True \ -DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \ -DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True OPTIONS_DEFINE= DOCS EXTERNAL MANPAGES STATIC TEST OPTIONS_SUB= yes OPTIONS_DEFAULT= EXTERNAL EXTERNAL_DESC= Enable FLAC, MP3, Ogg Vorbis, Opus support TEST_DESC= Build tests (forces static library only) TEST_IMPLIES= STATIC EXTERNAL_LIB_DEPENDS= libFLAC.so:audio/flac \ libmp3lame.so:audio/lame \ libmpg123.so:audio/mpg123 \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libvorbis.so:audio/libvorbis -EXTERNAL_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_mp3lame:BOOL=True \ - -DCMAKE_DISABLE_FIND_PACKAGE_Mpg123:BOOL=True \ +EXTERNAL_CMAKE_BOOL= ENABLE_EXTERNAL_LIBS ENABLE_MPEG MANPAGES_CMAKE_BOOL= INSTALL_MANPAGES STATIC_CMAKE_OFF= -DBUILD_SHARED_LIBS:BOOL=ON TEST_CMAKE_BOOL= BUILD_TESTING -.include - -# Disables external libs except mp3, as this is handled -# differently in the cmake files -.if ! ${PORT_OPTIONS:MEXTERNAL} -EXTRA_PATCHES= ${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs -.endif - do-test: (cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V) .include diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo index 6196ab82a801..c4529d683265 100644 --- a/audio/libsndfile/distinfo +++ b/audio/libsndfile/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672007310 -SHA256 (libsndfile-1.2.0.tar.xz) = 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a -SIZE (libsndfile-1.2.0.tar.xz) = 730268 +TIMESTAMP = 1691924884 +SHA256 (libsndfile-1.2.2.tar.xz) = 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e +SIZE (libsndfile-1.2.2.tar.xz) = 730760 diff --git a/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs b/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs deleted file mode 100644 index b54e202af521..000000000000 --- a/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs +++ /dev/null @@ -1,32 +0,0 @@ ---- cmake/SndFileChecks.cmake.orig 2020-07-23 13:42:53 UTC -+++ cmake/SndFileChecks.cmake -@@ -31,28 +31,7 @@ if (VCPKG_TOOLCHAIN AND (NOT CMAKE_VERSION VERSION_LES - set (CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) - endif () - --if (CMAKE_FIND_PACKAGE_PREFER_CONFIG) -- find_package (Ogg 1.3 CONFIG) -- find_package (Vorbis CONFIG COMPONENTS Enc) -- find_package (FLAC CONFIG) -- find_package (Opus CONFIG) -- -- include (FindPackageHandleStandardArgs) -- find_package_handle_standard_args (Ogg CONFIG_MODE) -- find_package_handle_standard_args (Vorbis CONFIG_MODE) -- find_package_handle_standard_args (FLAC CONFIG_MODE) -- find_package_handle_standard_args (Opus CONFIG_MODE) --else () -- find_package (Ogg 1.3) -- find_package (Vorbis COMPONENTS Enc) -- find_package (FLAC) -- find_package (Opus) --endif () --if (Vorbis_FOUND AND FLAC_FOUND AND Opus_FOUND) -- set (HAVE_EXTERNAL_XIPH_LIBS 1) --else () -- set (HAVE_EXTERNAL_XIPH_LIBS 0) --endif () -+set (HAVE_EXTERNAL_XIPH_LIBS 0) - - find_package (Speex) - find_package (SQLite3) diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist index cc5a30bc50f4..8e757bfdc730 100644 --- a/audio/libsndfile/pkg-plist +++ b/audio/libsndfile/pkg-plist @@ -1,47 +1,47 @@ bin/sndfile-cmp bin/sndfile-concat bin/sndfile-convert bin/sndfile-deinterleave bin/sndfile-info bin/sndfile-interleave bin/sndfile-metadata-get bin/sndfile-metadata-set bin/sndfile-play bin/sndfile-salvage include/sndfile.h include/sndfile.hh lib/cmake/SndFile/SndFileConfig.cmake lib/cmake/SndFile/SndFileConfigVersion.cmake lib/cmake/SndFile/SndFileTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SndFile/SndFileTargets.cmake %%STATIC%%lib/libsndfile.a %%NO_STATIC%%lib/libsndfile.so %%NO_STATIC%%lib/libsndfile.so.1 -%%NO_STATIC%%lib/libsndfile.so.1.0.35 +%%NO_STATIC%%lib/libsndfile.so.1.0.37 libdata/pkgconfig/sndfile.pc %%MANPAGES%%share/man/man1/sndfile-cmp.1.gz %%MANPAGES%%share/man/man1/sndfile-concat.1.gz %%MANPAGES%%share/man/man1/sndfile-convert.1.gz %%MANPAGES%%share/man/man1/sndfile-deinterleave.1.gz %%MANPAGES%%share/man/man1/sndfile-info.1.gz %%MANPAGES%%share/man/man1/sndfile-interleave.1.gz %%MANPAGES%%share/man/man1/sndfile-metadata-get.1.gz %%MANPAGES%%share/man/man1/sndfile-metadata-set.1.gz %%MANPAGES%%share/man/man1/sndfile-play.1.gz %%MANPAGES%%share/man/man1/sndfile-salvage.1.gz %%PORTDOCS%%%%DOCSDIR%%/FAQ.md %%PORTDOCS%%%%DOCSDIR%%/api.md %%PORTDOCS%%%%DOCSDIR%%/bugs.md %%PORTDOCS%%%%DOCSDIR%%/command.md %%PORTDOCS%%%%DOCSDIR%%/embedded_files.md %%PORTDOCS%%%%DOCSDIR%%/formats.md %%PORTDOCS%%%%DOCSDIR%%/index.md %%PORTDOCS%%%%DOCSDIR%%/libsndfile.css %%PORTDOCS%%%%DOCSDIR%%/libsndfile.jpg %%PORTDOCS%%%%DOCSDIR%%/lists.md %%PORTDOCS%%%%DOCSDIR%%/new_file_type_howto.md %%PORTDOCS%%%%DOCSDIR%%/octave.md %%PORTDOCS%%%%DOCSDIR%%/print.css %%PORTDOCS%%%%DOCSDIR%%/sndfile_info.md %%PORTDOCS%%%%DOCSDIR%%/tutorial.md %%PORTDOCS%%%%DOCSDIR%%/win32.md