Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Apr 2026 18:35:59 +0000
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7fe0f82e1e1c - main - audio/libsndfile: Update to latest commit
Message-ID:  <69e5208f.464c6.37dab7e@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by diizzy:

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

commit 7fe0f82e1e1ce37f6e5d1d5c02734c23176ebf7d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-04-19 16:55:35 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-04-19 18:30:38 +0000

    audio/libsndfile: Update to latest commit
    
    * Update to latest commit upstream, fixes various bugs and issues
    * Backport upstream PR 1106
    * Remove STATIC option
    * Rework "make test" so it doesn't depend on other options or toggles
    * Disable lossy_comp_test_ogg_opus test as it breaks with opus 1.6.0+
    
    Changelog:
    https://github.com/libsndfile/libsndfile/compare/1.2.2...ea9ff56
    
    References:
    https://github.com/libsndfile/libsndfile/pull/1106
    https://github.com/libsndfile/libsndfile/issues/1107
---
 audio/libsndfile/Makefile  | 47 +++++++++++++++++++++++++++-------------------
 audio/libsndfile/distinfo  | 10 +++++-----
 audio/libsndfile/pkg-plist |  7 +++----
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index c45bc38f4a19..8399eb1e767c 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	libsndfile
-DISTVERSION=	1.2.2
-PORTREVISION=	2
+DISTVERSION=	1.2.2.20251216
 CATEGORIES=	audio
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
+#MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch:-p1
+PATCH_SITES=   https://github.com/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES=    f8cc69656cf401cc33e4e380dfb972c9fdca0750.patch:-p1
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
@@ -14,27 +13,38 @@ WWW=		http://www.mega-nerd.com/libsndfile/
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe localbase pkgconfig python:build,test \
+USES=		cmake:testing cpe localbase pkgconfig python:build,test \
 		shebangfix tar:xz
+CPE_VENDOR=	${CPE_PRODUCT}_project
 SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
 		src/binheader_writef_check.py \
 		src/create_symbols_file.py
+USE_LDCONFIG=	yes
 
-CPE_VENDOR=	${CPE_PRODUCT}_project
+USE_GITHUB=	yes
+GH_TAGNAME=	68f6c16
 
-USE_LDCONFIG=	yes
+.if make(test)
+# Tests only works with STATIC lib so don't pollute default build dir
+BUILD_WRKSRC=	${WRKDIR}/.build-testing
+INSTALL_WRKSRC=	${WRKDIR}/.build-testing
+TEST_WRKSRC=	${WRKDIR}/.build-testing
+.endif
 
-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
+CMAKE_TESTING_OFF=	BUILD_SHARED_LIBS
 
-OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES STATIC TEST
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		CMAKE_DISABLE_FIND_PACKAGE_ALSA \
+		CMAKE_DISABLE_FIND_PACKAGE_Sndio \
+		CMAKE_DISABLE_FIND_PACKAGE_Speex \
+		CMAKE_DISABLE_FIND_PACKAGE_SQLite3
+CMAKE_ARGS=	-DCMAKE_CTEST_ARGUMENTS="-E;lossy_comp_test_ogg_opus"
+
+OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES 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 \
@@ -43,11 +53,10 @@ EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			libopus.so:audio/opus \
 			libvorbis.so:audio/libvorbis
 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
 
-do-test:
-	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)
+pre-test:
+	${MKDIR} ${EXTRACT_WRKDIR}/.build-testing
 
 .include <bsd.port.mk>
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 510494b71533..7354b6cfcbae 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1699480963
-SHA256 (libsndfile-1.2.2.tar.xz) = 3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e
-SIZE (libsndfile-1.2.2.tar.xz) = 730760
-SHA256 (0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch) = f42720a0307a5d3785c2719729d0eeaa0f15e6fe1c3645f5028fef89a35d7bd2
-SIZE (0754562e13d2e63a248a1c82f90b30bc0ffe307c.patch) = 1722
+TIMESTAMP = 1776595646
+SHA256 (libsndfile-libsndfile-1.2.2.20251216-68f6c16_GH0.tar.gz) = f5f9de38b23b7c69d31c2fc083ab1e1edfb2026f0785bef4e38bca8b3b7e1c03
+SIZE (libsndfile-libsndfile-1.2.2.20251216-68f6c16_GH0.tar.gz) = 684377
+SHA256 (f8cc69656cf401cc33e4e380dfb972c9fdca0750.patch) = 867136ffe7968d08eb6fcf2f7d21098699a5fe82dc5296af3db91a355fde4727
+SIZE (f8cc69656cf401cc33e4e380dfb972c9fdca0750.patch) = 967
diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist
index 8e757bfdc730..feace83e2f42 100644
--- a/audio/libsndfile/pkg-plist
+++ b/audio/libsndfile/pkg-plist
@@ -14,10 +14,9 @@ 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.37
+lib/libsndfile.so
+lib/libsndfile.so.1
+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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e5208f.464c6.37dab7e>