commit:     5459efdb16155909b4aaae12d25539640978e6df
Author:     Sebastian Engel <sighunter <AT> gmx <DOT> de>
AuthorDate: Sun Sep 22 09:50:43 2024 +0000
Commit:     Sebastian Engel <sighunter <AT> gmx <DOT> de>
CommitDate: Sun Sep 22 09:54:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5459efdb

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

Signed-off-by: Sebastian Engel <sighunter <AT> gmx.de>

 media-sound/fooyin/fooyin-0.7.1.ebuild | 8 +++-----
 media-sound/fooyin/fooyin-9999.ebuild  | 8 +++-----
 media-sound/fooyin/metadata.xml        | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/media-sound/fooyin/fooyin-0.7.1.ebuild 
b/media-sound/fooyin/fooyin-0.7.1.ebuild
index 96b046b85..fb1680cf6 100644
--- 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,9 +62,8 @@ 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)
@@ -73,12 +71,12 @@ src_configure() {
                -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
index 96b046b85..fb1680cf6 100644
--- 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,9 +62,8 @@ 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)
@@ -73,12 +71,12 @@ src_configure() {
                -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
index 923deb564..447459daf 100644
--- 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>

Reply via email to