Attachment #227757 for bug #258362




LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cpe localbase pkgconfig python:build,test shebangfix \
		tar:bz2
SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
		src/binheader_writef_check.py \


USE_LDCONFIG=	yes

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-sqlite
		-DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
		-DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True

OPTIONS_DEFINE=	DOCS EXTERNAL MANPAGES STATIC ALSA
OPTIONS_SUB=	yes
OPTIONS_DEFAULT=	EXTERNAL ALSA
EXTERNAL_DESC=	Enable FLAC, Ogg Vorbis, Opus support
ALSA_DESC=	Enable ALSA support
TEST_IMPLIES=	STATIC

EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
			libogg.so:audio/libogg \
			libopus.so:audio/opus \
			libvorbis.so:audio/libvorbis
ALSA_LIB_DEPENDS=	libasound.so:alsa-lib
EXTERNAL_CONFIGURE_OFF=	--disable-external-libs
STATIC_CONFIGURE_ON=	--disable-shared --enable-static
ALSA_CONFIGURE_ON=	--enable-alsa
ALSA_CONFIGURE_OFF=	--disable-alsa

.include <bsd.port.options.mk>

.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)





--- 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)

Lines 10-19 bin/sndfile-play Link Here

(-)b/audio/libsndfile/pkg-plist (-4 lines)
10	bin/sndfile-salvage	10	bin/sndfile-salvage
11	include/sndfile.h	11	include/sndfile.h
12	include/sndfile.hh	12	include/sndfile.hh
13	lib/cmake/SndFile/SndFileConfig.cmake
14	lib/cmake/SndFile/SndFileConfigVersion.cmake
15	lib/cmake/SndFile/SndFileTargets-%%CMAKE_BUILD_TYPE%%.cmake
16	lib/cmake/SndFile/SndFileTargets.cmake
17	%%STATIC%%lib/libsndfile.a	13	%%STATIC%%lib/libsndfile.a
18	%%NO_STATIC%%lib/libsndfile.so	14	%%NO_STATIC%%lib/libsndfile.so
19	%%NO_STATIC%%lib/libsndfile.so.1	15	%%NO_STATIC%%lib/libsndfile.so.1

Return to bug 258362

Lines 11-17 COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) Link Here

(-)b/audio/libsndfile/Makefile (-17 / +11 lines)
11	LICENSE= LGPL21+	11	LICENSE= LGPL21+
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	USES= cmake cpe localbase pkgconfig python:build,test shebangfix \	14	USES= cpe localbase pkgconfig python:build,test shebangfix \
15	tar:bz2	15	tar:bz2
16	SHEBANG_FILES= programs/test-sndfile-metadata-set.py \	16	SHEBANG_FILES= programs/test-sndfile-metadata-set.py \
17	src/binheader_writef_check.py \	17	src/binheader_writef_check.py \
Lines 21-53 CPE_VENDOR= ${CPE_PRODUCT}_project Link Here
21		21
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23		23
24	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=True \	24	GNU_CONFIGURE= yes
25	-DCMAKE_DISABLE_FIND_PACKAGE_Sndio:BOOL=True \	25	CONFIGURE_ARGS= --disable-sqlite
26	-DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
27	-DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True
28		26
29	OPTIONS_DEFINE= DOCS EXTERNAL MANPAGES STATIC TEST	27	OPTIONS_DEFINE= DOCS EXTERNAL MANPAGES STATIC ALSA
30	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes
31	OPTIONS_DEFAULT= EXTERNAL	29	OPTIONS_DEFAULT= EXTERNAL ALSA
32	EXTERNAL_DESC= Enable FLAC, Ogg Vorbis, Opus support	30	EXTERNAL_DESC= Enable FLAC, Ogg Vorbis, Opus support
33	TEST_DESC= Build tests (forces static library only)	31	ALSA_DESC= Enable ALSA support
34	TEST_IMPLIES= STATIC
35		32
36	EXTERNAL_LIB_DEPENDS= libFLAC.so:audio/flac \	33	EXTERNAL_LIB_DEPENDS= libFLAC.so:audio/flac \
37	libogg.so:audio/libogg \	34	libogg.so:audio/libogg \
38	libopus.so:audio/opus \	35	libopus.so:audio/opus \
39	libvorbis.so:audio/libvorbis	36	libvorbis.so:audio/libvorbis
40		37	ALSA_LIB_DEPENDS= libasound.so:alsa-lib
41	MANPAGES_CMAKE_BOOL= INSTALL_MANPAGES	38	EXTERNAL_CONFIGURE_OFF= --disable-external-libs
42	STATIC_CMAKE_OFF= -DBUILD_SHARED_LIBS:BOOL=ON	39	STATIC_CONFIGURE_ON= --disable-shared --enable-static
43	TEST_CMAKE_BOOL= BUILD_TESTING	40	ALSA_CONFIGURE_ON= --enable-alsa
		41	ALSA_CONFIGURE_OFF= --disable-alsa
44		42
45	.include <bsd.port.options.mk>	43	.include <bsd.port.options.mk>
46		44
47	.if ! ${PORT_OPTIONS:MEXTERNAL}
48	EXTRA_PATCHES= ${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs
49	.endif
50
51	do-test:	45	do-test:
52	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)	46	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)
53		47

Removed Link Here

(-)a/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs (-32 lines)
1	--- cmake/SndFileChecks.cmake.orig 2020-07-23 13:42:53 UTC
2	+++ cmake/SndFileChecks.cmake
3	@@ -31,28 +31,7 @@ if (VCPKG_TOOLCHAIN AND (NOT CMAKE_VERSION VERSION_LES
4	set (CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
5	endif ()
6
7	-if (CMAKE_FIND_PACKAGE_PREFER_CONFIG)
8	- find_package (Ogg 1.3 CONFIG)
9	- find_package (Vorbis CONFIG COMPONENTS Enc)
10	- find_package (FLAC CONFIG)
11	- find_package (Opus CONFIG)
12	-
13	- include (FindPackageHandleStandardArgs)
14	- find_package_handle_standard_args (Ogg CONFIG_MODE)
15	- find_package_handle_standard_args (Vorbis CONFIG_MODE)
16	- find_package_handle_standard_args (FLAC CONFIG_MODE)
17	- find_package_handle_standard_args (Opus CONFIG_MODE)
18	-else ()
19	- find_package (Ogg 1.3)
20	- find_package (Vorbis COMPONENTS Enc)
21	- find_package (FLAC)
22	- find_package (Opus)
23	-endif ()
24	-if (Vorbis_FOUND AND FLAC_FOUND AND Opus_FOUND)
25	- set (HAVE_EXTERNAL_XIPH_LIBS 1)
26	-else ()
27	- set (HAVE_EXTERNAL_XIPH_LIBS 0)
28	-endif ()
29	+set (HAVE_EXTERNAL_XIPH_LIBS 0)
30
31	find_package (Speex)
32	find_package (SQLite3)