From nobody Wed Sep 8 12:16:26 2021 X-Original-To: multimedia@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B3DE717A38B8 for ; Wed, 8 Sep 2021 12:16:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H4Lhp4Qp8z3HwP for ; Wed, 8 Sep 2021 12:16:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78D3525B03 for ; Wed, 8 Sep 2021 12:16:26 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 188CGQ1H036845 for ; Wed, 8 Sep 2021 12:16:26 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 188CGQai036844 for multimedia@FreeBSD.org; Wed, 8 Sep 2021 12:16:26 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: multimedia@FreeBSD.org Subject: [Bug 258362] audio/libsndfile: Unnecessary uses of CMake Date: Wed, 08 Sep 2021 12:16:26 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: msl0000023508@gmail.com X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: multimedia@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Multimedia discussions List-Archive: https://lists.freebsd.org/archives/freebsd-multimedia List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-multimedia@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D258362 --- Comment #3 from WHR --- Comment on attachment 227757 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D227757 audio.libsndfile-without-cmake.diff >diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile >index 95cf2fe40b87..09eceb94b9d4 100644 >--- a/audio/libsndfile/Makefile >+++ b/audio/libsndfile/Makefile >@@ -11,7 +11,7 @@ COMMENT=3D Reading and writing files containing sampled = sound (like WAV or AIFF) > LICENSE=3D LGPL21+ > LICENSE_FILE=3D ${WRKSRC}/COPYING >=20 >-USES=3D cmake cpe localbase pkgconfig python:build,test shebangfix \ >+USES=3D cpe localbase pkgconfig python:build,test shebangfix \ > tar:bz2 > SHEBANG_FILES=3D programs/test-sndfile-metadata-set.py \ > src/binheader_writef_check.py \ >@@ -21,33 +21,27 @@ CPE_VENDOR=3D ${CPE_PRODUCT}_project >=20 > USE_LDCONFIG=3D yes >=20 >-CMAKE_ARGS=3D -DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=3DTrue \ >- -DCMAKE_DISABLE_FIND_PACKAGE_Sndio:BOOL=3DTrue \ >- -DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=3DTrue \ >- -DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=3DTrue >+GNU_CONFIGURE=3D yes >+CONFIGURE_ARGS=3D --disable-sqlite >=20 >-OPTIONS_DEFINE=3D DOCS EXTERNAL MANPAGES STATIC TEST >+OPTIONS_DEFINE=3D DOCS EXTERNAL MANPAGES STATIC ALSA > OPTIONS_SUB=3D yes >-OPTIONS_DEFAULT=3D EXTERNAL >+OPTIONS_DEFAULT=3D EXTERNAL ALSA > EXTERNAL_DESC=3D Enable FLAC, Ogg Vorbis, Opus support >-TEST_DESC=3D Build tests (forces static library only) >-TEST_IMPLIES=3D STATIC >+ALSA_DESC=3D Enable ALSA support for sndfile-play >=20 > EXTERNAL_LIB_DEPENDS=3D libFLAC.so:audio/flac \ > libogg.so:audio/libogg \ > libopus.so:audio/opus \ > libvorbis.so:audio/libvorbis >- >-MANPAGES_CMAKE_BOOL=3D INSTALL_MANPAGES >-STATIC_CMAKE_OFF=3D -DBUILD_SHARED_LIBS:BOOL=3DON >-TEST_CMAKE_BOOL=3D BUILD_TESTING >+ALSA_LIB_DEPENDS=3D libasound.so:audio/alsa-lib >+EXTERNAL_CONFIGURE_OFF=3D --disable-external-libs >+STATIC_CONFIGURE_ON=3D --disable-shared --enable-static >+ALSA_CONFIGURE_ON=3D --enable-alsa >+ALSA_CONFIGURE_OFF=3D --disable-alsa >=20 > .include >=20 >-.if ! ${PORT_OPTIONS:MEXTERNAL} >-EXTRA_PATCHES=3D ${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disable= externallibs >-.endif >- > do-test: > (cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=3D1 ctest -V) >=20 >diff --git a/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-d= isableexternallibs b/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.= cmake-disableexternallibs >deleted file mode 100644 >index b54e202af521..000000000000 >--- a/audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disablee= xternallibs >+++ /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 () >-=20 >--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) >-=20 >- find_package (Speex) >- find_package (SQLite3) >diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist >index bbe7b16354cd..c29eeb7d94aa 100644 >--- a/audio/libsndfile/pkg-plist >+++ b/audio/libsndfile/pkg-plist >@@ -10,10 +10,6 @@ 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 --=20 You are receiving this mail because: You are the assignee for the bug.=