media-sound/fooyin: disable sndfile, switch USE defaults for openmpt

Signed-off-by: Sebastian Engel <[email protected]>
gentoo · Sep 22, 2024 · 5459efd · 5459efd
1 parent 92f9e16
commit 5459efd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/media-sound/fooyin/fooyin-0.7.1.ebuild b/media-sound/fooyin/fooyin-0.7.1.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="alsa +archive +openmpt pipewire sdl +sndfile test"
+IUSE="alsa +archive openmpt pipewire sdl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	|| ( alsa pipewire sdl )
@@ -40,7 +40,6 @@ RDEPEND="
 	openmpt? ( media-libs/libopenmpt )
 	pipewire? ( media-video/pipewire:= )
 	sdl? ( media-libs/libsdl2 )
-	sndfile? ( media-libs/libsndfile )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -63,22 +62,21 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-# libvgm and libgme dependencies can currently not be satisfied,
+# libvgm, sndfile and libgme dependencies can currently not be satisfied,
 # so building their input plugins is unconditionally disabled for now.
-# SndFile not found though it is enabled, why?
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_ALSA=$(usex alsa)
 		-DBUILD_TESTING=$(usex test)
 		-DBUILD_CCACHE=OFF
 		-DBUILD_LIBVGM=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_LIBGME=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile=ON
 		-DINSTALL_HEADERS=ON
 		$(cmake_use_find_package archive LibArchive)
 		$(cmake_use_find_package openmpt OpenMpt)
 		$(cmake_use_find_package pipewire PipeWire)
 		$(cmake_use_find_package sdl SDL2)
-		$(cmake_use_find_package sndfile SndFile)
 	)
 
 	cmake_src_configure

diff --git a/media-sound/fooyin/fooyin-9999.ebuild b/media-sound/fooyin/fooyin-9999.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="alsa +archive +openmpt pipewire sdl +sndfile test"
+IUSE="alsa +archive openmpt pipewire sdl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	|| ( alsa pipewire sdl )
@@ -40,7 +40,6 @@ RDEPEND="
 	openmpt? ( media-libs/libopenmpt )
 	pipewire? ( media-video/pipewire:= )
 	sdl? ( media-libs/libsdl2 )
-	sndfile? ( media-libs/libsndfile )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -63,22 +62,21 @@ src_prepare() {
 	cmake_src_prepare
 }
 
-# libvgm and libgme dependencies can currently not be satisfied,
+# libvgm, sndfile and libgme dependencies can currently not be satisfied,
 # so building their input plugins is unconditionally disabled for now.
-# SndFile not found though it is enabled, why?
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_ALSA=$(usex alsa)
 		-DBUILD_TESTING=$(usex test)
 		-DBUILD_CCACHE=OFF
 		-DBUILD_LIBVGM=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_LIBGME=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_SndFile=ON
 		-DINSTALL_HEADERS=ON
 		$(cmake_use_find_package archive LibArchive)
 		$(cmake_use_find_package openmpt OpenMpt)
 		$(cmake_use_find_package pipewire PipeWire)
 		$(cmake_use_find_package sdl SDL2)
-		$(cmake_use_find_package sndfile SndFile)
 	)
 
 	cmake_src_configure

diff --git a/media-sound/fooyin/metadata.xml b/media-sound/fooyin/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Sebastian Engel</name>
 	</maintainer>
 	<use>
-		<flag name="archive">Build the LibArchive input plugin using <pkg>app-arch/libarchive</pkg></flag>
-		<flag name="openmpt">Build the OpenMpt input plugin using <pkg>media-libs/libopenmpt</pkg></flag>
+		<flag name="archive">Build the libarchive input plugin using <pkg>app-arch/libarchive</pkg></flag>
+		<flag name="openmpt">Build the OpenMPT input plugin using <pkg>media-libs/libopenmpt</pkg></flag>
 		<flag name="pipewire">Enable sound support via native PipeWire backend</flag>
 	</use>
 	<upstream>