git: fd670f7c6892 - main - audio/libsndfile: Update to 1.2.2

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd670f7c68929904d74fd6fe1f22840d58047836

commit fd670f7c68929904d74fd6fe1f22840d58047836
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-08-19 09:15:27 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-08-19 09:44:00 +0000

    audio/libsndfile: Update to 1.2.2
    
    Changelog:
    https://github.com/libsndfile/libsndfile/releases/tag/1.2.2
    
    Sponsored by:   Blinkinblox
---
 audio/libsndfile/Makefile                          | 14 ++--------
 audio/libsndfile/distinfo                          |  6 ++--
 ...h-cmake_SndFileChecks.cmake-disableexternallibs | 32 ----------------------
 audio/libsndfile/pkg-plist                         |  2 +-
 4 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 708da77011c0..d709a2f65bbc 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libsndfile
-DISTVERSION=	1.2.0
-PORTREVISION=	1
+DISTVERSION=	1.2.2
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -39,20 +38,11 @@ EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			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 <bsd.port.options.mk>
-
-# 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)
 
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
@@ -17,7 +17,7 @@ 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