commit:     feb5067ca28cc0a7110a2f3c132e9a6299fde355
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Jun 25 10:36:05 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 15:28:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb5067c

media-sound/strawberry: sync live

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42748
Closes: https://github.com/gentoo/gentoo/pull/42748
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/strawberry/strawberry-9999.ebuild | 60 ++++++++++++++-------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/media-sound/strawberry/strawberry-9999.ebuild 
b/media-sound/strawberry/strawberry-9999.ebuild
index ae3910d7dd61..de32a81150f5 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic virtualx xdg
+inherit cmake optfeature virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and 
Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/";
-
 if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry";
        inherit git-r3
@@ -18,59 +17,57 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="alsa cdda chromaprint +dbus debug kde +loudness ipod moodbar mtp 
+pulseaudio streaming test +udisks X"
+IUSE="alsa cdda chromaprint +dbus debug discord kde +loudness ipod moodbar mtp 
+pulseaudio streaming test X"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="kde? ( dbus )"
 
-# alsa-lib is always required in linux even if it's not built
 COMMON_DEPEND="
-       dev-db/sqlite:=
+       dev-db/sqlite:3
        dev-libs/glib:2
        dev-libs/icu:=
        dev-libs/kdsingleapplication[qt6(+)]
        dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?]
-       media-libs/alsa-lib
        media-libs/taglib:=
        media-libs/gstreamer:1.0
-       media-libs/gst-plugins-base:1.0
+       media-libs/gst-plugins-base:1.0[alsa?]
+       alsa? ( media-libs/alsa-lib )
        cdda? ( dev-libs/libcdio:= )
        chromaprint? ( media-libs/chromaprint:= )
        ipod? (
                media-libs/libgpod
-               x11-libs/gdk-pixbuf
+               x11-libs/gdk-pixbuf:2
        )
-       moodbar? ( sci-libs/fftw:3.0 )
-       mtp? ( media-libs/libmtp )
-       loudness? ( media-libs/libebur128 )
+       loudness? ( media-libs/libebur128:= )
+       moodbar? ( sci-libs/fftw:3.0= )
+       mtp? ( media-libs/libmtp:= )
        pulseaudio? ( media-libs/libpulse )
+       X? ( x11-libs/libX11 )
 "
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required.
-# Check if this can be overcome someway.
-RDEPEND="
-       ${COMMON_DEPEND}
+# gst-plugins-good provides spectrum plugin for moodbar
+RDEPEND="${COMMON_DEPEND}
        media-plugins/gst-plugins-meta:1.0
-       media-plugins/gst-plugins-taglib
-       udisks? ( sys-fs/udisks:2 )
-       kde? ( kde-frameworks/kglobalaccel )
+       moodbar? ( media-libs/gst-plugins-good:1.0 )
+       pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 )
 "
-DEPEND="
-       ${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}
+       dev-cpp/sparsehash
        dev-libs/boost
+       discord? ( dev-libs/rapidjson )
        test? ( dev-cpp/gtest )
 "
 BDEPEND="
        dev-qt/qttools:6[linguist]
-       sys-devel/gettext
        virtual/pkgconfig
 "
 
-DOCS=( Changelog README.md )
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.2.11-unforce_alsa.patch
+)
 
-REQUIRED_USE="
-       || ( alsa pulseaudio )
-"
+DOCS=( Changelog README.md )
 
 src_configure() {
-       # spotify is not in portage
+       # spotify is not in portage (gst-plugins-rs)
        local mycmakeargs=(
                $(cmake_use_find_package test GTest)
                $(cmake_use_find_package X X11)
@@ -79,10 +76,16 @@ src_configure() {
                -DCCACHE_EXECUTABLE=OFF
                -DENABLE_GIO=ON
                -DENABLE_GIO_UNIX=ON
+               # depends on sparsehash and taglib
+               # enabled by default because stream reading is not optional
+               -DENABLE_STREAMTAGREADER=ON
                -DENABLE_ALSA="$(usex alsa)"
                -DENABLE_PULSE="$(usex pulseaudio)"
                -DENABLE_DBUS="$(usex dbus)"
                -DENABLE_MPRIS2="$(usex dbus)"
+               -DENABLE_UDISKS2="$(usex dbus)"
+               -DENABLE_DEBUG_OUTPUT="$(usex debug)"
+               -DENABLE_DISCORD_RPC="$(usex discord)"
                -DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde)
                -DENABLE_SONGFINGERPRINTING="$(usex chromaprint)"
                -DENABLE_MUSICBRAINZ="$(usex chromaprint)"
@@ -91,7 +94,6 @@ src_configure() {
                -DENABLE_MTP="$(usex mtp)"
                -DENABLE_GPOD="$(usex ipod)"
                -DENABLE_MOODBAR="$(usex moodbar)"
-               -DENABLE_UDISKS2="$(usex udisks)"
                -DENABLE_EBUR128="$(usex loudness)"
                -DENABLE_SUBSONIC="$(usex streaming)"
                -DENABLE_TIDAL="$(usex streaming)"
@@ -99,8 +101,6 @@ src_configure() {
                -DENABLE_SPOTIFY="$(usex streaming)"
        )
 
-       use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
        cmake_src_configure
 }
 
@@ -111,6 +111,8 @@ src_test() {
 pkg_postinst() {
        xdg_pkg_postinst
 
+       use dbus && optfeature "removable device detection" sys-fs/udisks
+
        elog "Note that list of supported formats is controlled by 
media-plugins/gst-plugins-meta "
        elog "USE flags. You may be interested in setting aac, flac, mp3, ogg 
or wavpack USE flags "
        elog "depending on your preferences"

Reply via email to