commit: abda45906f0e009a9aea2f6e7c2566cb656ab9e5 Author: Gino McCarty <onigino <AT> protonmail <DOT> com> AuthorDate: Sat Nov 23 19:28:42 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Nov 25 08:16:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abda4590
media-sound/strawberry: version bump to 1.2.1 - drop vlc - drop qt5 - fix libebur128 dependency - match upstream build options Signed-off-by: Gino McCarty <onigino <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/39436 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/strawberry/Manifest | 1 + media-sound/strawberry/metadata.xml | 7 +- media-sound/strawberry/strawberry-1.2.1.ebuild | 106 +++++++++++++++++++++++++ media-sound/strawberry/strawberry-9999.ebuild | 95 +++++++++------------- 4 files changed, 148 insertions(+), 61 deletions(-) diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest index 5095b66d5180..e450d4354064 100644 --- a/media-sound/strawberry/Manifest +++ b/media-sound/strawberry/Manifest @@ -1 +1,2 @@ DIST strawberry-1.1.3.tar.xz 11347368 BLAKE2B 38e6de5e2723f14973ca922d2bcf593cc445b711e3c437fa425959555b1f942657e32ba62259383720becb945664a60f06fee7468fc03ef4492209e1b0cb6e78 SHA512 666c52f5b912aebc09d86465ee9ac464b8c87e1d20d1650204e305a5d5d1c5b34f97bcbd60ef9bd8c50ed927fe55595ade56c1c5202665931f1a1c58fb7118d3 +DIST strawberry-1.2.1.tar.xz 11459892 BLAKE2B 1221b4971657d450d5d3128ff5d3d55f1f8e467bbe9dc24a30c2667049341db57532e962b53e0a177aa2a3245d95f5402c652f50848195e0f700f1331731ca22 SHA512 da4f122d981bae03fd81302d4b4d4dc7a74b7c29da293199a0eaddcdbbabbe53de2511cd4e7a9bab6e7a2203aa905f158f2b46bbedeae58fce4379510b9200d5 diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml index 9496c014df75..0f4c08885dfa 100644 --- a/media-sound/strawberry/metadata.xml +++ b/media-sound/strawberry/metadata.xml @@ -6,11 +6,14 @@ <name>Gentoo Sound project</name> </maintainer> <use> - <flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag> + <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg></flag> + <flag name="loudness">Enable loudness normalisation according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg></flag> <flag name="moodbar">Enable moodbar support</flag> <flag name="soup">Allow streaming with <pkg>media-plugins/gst-plugins-soup</pkg></flag> + <flag name="streaming">Enable Online Streaming Support</flag> + <flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag> </use> <upstream> - <remote-id type="github">jonaski/strawberry</remote-id> + <remote-id type="github">strawberrymusicplayer/strawberry</remote-id> </upstream> </pkgmetadata> diff --git a/media-sound/strawberry/strawberry-1.2.1.ebuild b/media-sound/strawberry/strawberry-1.2.1.ebuild new file mode 100644 index 000000000000..50b3d4f3a933 --- /dev/null +++ b/media-sound/strawberry/strawberry-1.2.1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic 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 +else + SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"; + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X" + +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +#INFO: alsa-lib is always required in linux even if its not built +COMMON_DEPEND=" + dev-db/sqlite:= + dev-libs/glib:2 + dev-libs/icu:= + media-libs/alsa-lib + media-libs/taglib + dev-libs/kdsingleapplication[qt6(+)] + dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?] + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + cdda? ( dev-libs/libcdio:= ) + chromaprint? ( media-libs/chromaprint:= ) + ipod? ( + media-libs/libgpod + x11-libs/gdk-pixbuf + ) + moodbar? ( sci-libs/fftw:3.0 ) + mtp? ( media-libs/libmtp ) + loudness? ( media-libs/libebur128 ) + pulseaudio? ( media-libs/libpulse ) +" +# 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} + media-plugins/gst-plugins-meta:1.0[taglib] + udisks? ( sys-fs/udisks:2 ) + kde? ( kde-frameworks/kglobalaccel ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/gtest + dev-libs/boost +" + +DOCS=( Changelog README.md ) + +REQUIRED_USE=" + || ( alsa pulseaudio ) +" + +src_configure() { + # spotify is not in portage + local mycmakeargs=( + $(cmake_use_find_package X X11 ) + -DBUILD_WERROR=OFF + # avoid automagically enabling of ccache (bug #611010) + -DCCACHE_EXECUTABLE=OFF + -DENABLE_GIO=ON + -DENABLE_GIO_UNIX=ON + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_PULSE="$(usex pulseaudio)" + -DENABLE_DBUS="$(usex dbus)" + -DENABLE_MPRIS2="$(usex dbus)" + -DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde) + -DENABLE_SONGFINGERPRINTING="$(usex chromaprint)" + -DENABLE_MUSICBRAINZ="$(usex chromaprint)" + -DENABLE_X11_GLOBALSHORTCUTS="$(usex X)" + -DENABLE_AUDIOCD="$(usex cdda)" + -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)" + -DENABLE_QOBUZ="$(usex streaming)" + -DENABLE_SPOTIFY="$(usex streaming)" + ) + + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + 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" +} diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild index 5b201a9f9534..50b3d4f3a933 100644 --- a/media-sound/strawberry/strawberry-9999.ebuild +++ b/media-sound/strawberry/strawberry-9999.ebuild @@ -3,9 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic plocale xdg - -PLOCALES="ca_ES cs_CZ de_DE es_AR es_ES es_MX et_EE fi_FI fr_FR hu_HU id_ID it_IT ja_JP ko_KR nb_NO nl_NL pl_PL pt_BR ru_RU sv_SE tr_CY tr_TR uk_UA zh_CN zh_TW" +inherit cmake flag-o-matic xdg DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" HOMEPAGE="https://www.strawberrymusicplayer.org/"; @@ -19,98 +17,79 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc" +IUSE="alsa cdda chromaprint dbus debug kde +loudness ipod moodbar mtp +pulseaudio streaming +udisks X" BDEPEND=" sys-devel/gettext virtual/pkgconfig - !qt6? ( dev-qt/linguist-tools:5 ) " + +#INFO: alsa-lib is always required in linux even if its not built COMMON_DEPEND=" dev-db/sqlite:= dev-libs/glib:2 dev-libs/icu:= - dev-libs/protobuf:= media-libs/alsa-lib media-libs/taglib - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - qt6? ( - dev-libs/kdsingleapplication[qt6(+)] - dev-qt/qtbase:6[concurrent,dbus,gui,network,ssl,sql,sqlite,widgets] - ) + dev-libs/kdsingleapplication[qt6(+)] + dev-qt/qtbase:6[concurrent,dbus?,gui,network,ssl,sql,sqlite,widgets,X?] + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 cdda? ( dev-libs/libcdio:= ) - gstreamer? ( - media-libs/chromaprint:= - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 + chromaprint? ( media-libs/chromaprint:= ) + ipod? ( + media-libs/libgpod + x11-libs/gdk-pixbuf ) - ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) + loudness? ( media-libs/libebur128 ) pulseaudio? ( media-libs/libpulse ) - vlc? ( media-video/vlc ) " # 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} - gstreamer? ( - media-plugins/gst-plugins-meta:1.0 - soup? ( media-plugins/gst-plugins-soup:1.0 ) - media-plugins/gst-plugins-taglib:1.0 - ) - mtp? ( gnome-base/gvfs[mtp] ) + media-plugins/gst-plugins-meta:1.0[taglib] udisks? ( sys-fs/udisks:2 ) + kde? ( kde-frameworks/kglobalaccel ) " DEPEND="${COMMON_DEPEND} dev-cpp/gtest dev-libs/boost - !qt6? ( dev-qt/qttest:5 ) " DOCS=( Changelog README.md ) REQUIRED_USE=" - cdda? ( gstreamer ) - || ( gstreamer vlc ) + || ( alsa pulseaudio ) " -src_prepare() { - plocale_find_changes "src/translations" "" ".po" - - cmake_src_prepare -} - src_configure() { # spotify is not in portage local mycmakeargs=( + $(cmake_use_find_package X X11 ) -DBUILD_WERROR=OFF # avoid automagically enabling of ccache (bug #611010) -DCCACHE_EXECUTABLE=OFF -DENABLE_GIO=ON - -DLINGUAS="$(plocale_get_locales)" + -DENABLE_GIO_UNIX=ON + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_PULSE="$(usex pulseaudio)" + -DENABLE_DBUS="$(usex dbus)" + -DENABLE_MPRIS2="$(usex dbus)" + -DENABLE_KGLOBALACCEL_GLOBALSHORTCUTS=$(usex kde) + -DENABLE_SONGFINGERPRINTING="$(usex chromaprint)" + -DENABLE_MUSICBRAINZ="$(usex chromaprint)" + -DENABLE_X11_GLOBALSHORTCUTS="$(usex X)" -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_GSTREAMER="$(usex gstreamer)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_MTP="$(usex mtp)" + -DENABLE_GPOD="$(usex ipod)" -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_MUSICBRAINZ="$(usex gstreamer)" - -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)" - -DENABLE_SPOTIFY="$(usex gstreamer)" -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_VLC="$(usex vlc)" - -DBUILD_WITH_QT6="$(usex qt6)" - -DBUILD_WITH_QT5="$(usex !qt6)" - -DQT_VERSION_MAJOR="$(usex qt6 6 5)" + -DENABLE_EBUR128="$(usex loudness)" + -DENABLE_SUBSONIC="$(usex streaming)" + -DENABLE_TIDAL="$(usex streaming)" + -DENABLE_QOBUZ="$(usex streaming)" + -DENABLE_SPOTIFY="$(usex streaming)" ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT @@ -121,9 +100,7 @@ src_configure() { pkg_postinst() { xdg_pkg_postinst - if use gstreamer ; then - 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" - fi + 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" }
