public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/, media-sound/strawberry/files/
@ 2021-01-04 17:13 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-04 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     5536290056e8a9443ff4f3df7e7a71521e46167e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 17:08:53 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 17:13:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55362900

media-sound/strawberry: Bump to version 0.8.5

Bug: https://bugs.gentoo.org/757780
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/strawberry/Manifest                    |   1 +
 .../strawberry-0.8.5-make_backends_optional.patch  |  56 +++++++++
 media-sound/strawberry/metadata.xml                |   3 +
 media-sound/strawberry/strawberry-0.8.5.ebuild     | 130 +++++++++++++++++++++
 4 files changed, 190 insertions(+)

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index acddf673257..723357cc4b3 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,2 +1,3 @@
 DIST strawberry-0.8.3.tar.xz 10280356 BLAKE2B 3c99193af3e753d48822567a3391900b1d4326ece49582718b949eb3753fd15d3cae2469ffdcc28334db95099a914c1065ed84c397b4ade53c624e7eab5cdfe5 SHA512 e64c49a6b479677486ae7868107e945a63a028cbaa6dcfb68c9c0784fe0ea8a1133264832367d092628fb1094ca90d87d6ab49199d4aab7f56f2620eb4e9b2f7
 DIST strawberry-0.8.4.tar.xz 10781080 BLAKE2B 395898e68117848613666edb545d15db22eea418c7dce553c442c52b459406c88640368da9a98c4f25e5cbff40369127ee4cec2dfadacdb79e4cef4c17e0f875 SHA512 a93308e6ba3450e8164f02c2b46bd5e785995d59963be7a896e769fa8312467fe29f1c7d48f5fbc290ccd6392293dc6af65e24001912a9f54292f25a023468b4
+DIST strawberry-0.8.5.tar.xz 10801412 BLAKE2B 4b55a747df72cbf57c56f3e146c8e26e335cfc1238f4dcc8065b4b911fc0ab3894644639a17642a26d7a074d662103e1c55a4acbb6f59bdc971a6ca6e45117ed SHA512 33ab6751e5bd17ff98beed29c179c47bebca92229b94b863a172169704b2fd69d6605cf31db456dee552666b58bcbad867b3cca7bcff2cc6582c4c2c0a2f49c8

diff --git a/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch b/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
new file mode 100644
index 00000000000..e1d54d15a0a
--- /dev/null
+++ b/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
@@ -0,0 +1,56 @@
+From c0ab9083306a3664cc277dfcde9730f473d08a54 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 4 Jan 2021 16:55:12 +0100
+Subject: [PATCH] CMakeLists.txt: Make gstreamer/vlc backend search optional
+
+Gentoo-bug: https://bugs.gentoo.org/757780
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ CMakeLists.txt | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 41027633..df093d88 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,6 +64,12 @@ if(BUILD_WERROR)
+   list(APPEND COMPILE_OPTIONS -Werror)
+ endif(BUILD_WERROR)
+ 
++option(USE_GSTREAMER "Use Gstreamer as backend if found" ON)
++option(USE_VLC "Use VLC as backend if found" ON)
++if(NOT USE_GSTREAMER AND NOT USE_VLC)
++  message( FATAL_ERROR "You need to enable either Gstreamer or VLC backend" )
++endif()
++
+ add_compile_options(${COMPILE_OPTIONS})
+ 
+ if(${CMAKE_BUILD_TYPE} MATCHES "Release")
+@@ -119,13 +125,17 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
+ pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+ pkg_check_modules(GIO REQUIRED gio-2.0)
+ pkg_check_modules(LIBCDIO libcdio)
+-pkg_check_modules(GSTREAMER gstreamer-1.0)
+-pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
+-pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
+-pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
+-pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
+-pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
+-pkg_check_modules(LIBVLC libvlc)
++if(USE_GSTREAMER)
++  pkg_check_modules(GSTREAMER gstreamer-1.0)
++  pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
++  pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
++  pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
++  pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
++  pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
++endif()
++if(USE_VLC)
++  pkg_check_modules(LIBVLC libvlc)
++endif()
+ pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
+ pkg_check_modules(LIBPULSE libpulse)
+ pkg_check_modules(CHROMAPRINT libchromaprint)
+-- 
+2.30.0
+

diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 787d107c603..135ead34eb6 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -9,6 +9,9 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<use>
+		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">jonaski/strawberry</remote-id>
 	</upstream>

diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
new file mode 100644
index 00000000000..f13c436d5df
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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-libmms:1.0
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.5-make_backends_optional.patch" #757780
+)
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	rm -r 3rdparty/taglib || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DUSE_GSTREAMER="$(usex gstreamer)"
+		-DUSE_SYSTEM_TAGLIB=ON
+		-DUSE_VLC="$(usex vlc)"
+		-DWITH_QT6=OFF
+	)
+
+	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"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/, media-sound/strawberry/files/
@ 2021-01-05 19:16 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-05 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ca6f7861621ebc5ce69dbc705c3870b83045d10f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 19:15:48 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 19:16:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6f7861

media-sound/strawberry: Drop superfluous patch

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../strawberry-0.8.5-make_backends_optional.patch  | 56 ----------------------
 media-sound/strawberry/strawberry-0.8.5.ebuild     |  8 +---
 media-sound/strawberry/strawberry-9999.ebuild      |  8 +---
 3 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch b/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
deleted file mode 100644
index e1d54d15a0a..00000000000
--- a/media-sound/strawberry/files/strawberry-0.8.5-make_backends_optional.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c0ab9083306a3664cc277dfcde9730f473d08a54 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 4 Jan 2021 16:55:12 +0100
-Subject: [PATCH] CMakeLists.txt: Make gstreamer/vlc backend search optional
-
-Gentoo-bug: https://bugs.gentoo.org/757780
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- CMakeLists.txt | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41027633..df093d88 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,6 +64,12 @@ if(BUILD_WERROR)
-   list(APPEND COMPILE_OPTIONS -Werror)
- endif(BUILD_WERROR)
- 
-+option(USE_GSTREAMER "Use Gstreamer as backend if found" ON)
-+option(USE_VLC "Use VLC as backend if found" ON)
-+if(NOT USE_GSTREAMER AND NOT USE_VLC)
-+  message( FATAL_ERROR "You need to enable either Gstreamer or VLC backend" )
-+endif()
-+
- add_compile_options(${COMPILE_OPTIONS})
- 
- if(${CMAKE_BUILD_TYPE} MATCHES "Release")
-@@ -119,13 +125,17 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
- pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
- pkg_check_modules(GIO REQUIRED gio-2.0)
- pkg_check_modules(LIBCDIO libcdio)
--pkg_check_modules(GSTREAMER gstreamer-1.0)
--pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
--pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
--pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
--pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
--pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
--pkg_check_modules(LIBVLC libvlc)
-+if(USE_GSTREAMER)
-+  pkg_check_modules(GSTREAMER gstreamer-1.0)
-+  pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
-+  pkg_check_modules(GSTREAMER_AUDIO gstreamer-audio-1.0)
-+  pkg_check_modules(GSTREAMER_APP gstreamer-app-1.0)
-+  pkg_check_modules(GSTREAMER_TAG gstreamer-tag-1.0)
-+  pkg_check_modules(GSTREAMER_PBUTILS gstreamer-pbutils-1.0)
-+endif()
-+if(USE_VLC)
-+  pkg_check_modules(LIBVLC libvlc)
-+endif()
- pkg_check_modules(SQLITE REQUIRED sqlite3>=3.9)
- pkg_check_modules(LIBPULSE libpulse)
- pkg_check_modules(CHROMAPRINT libchromaprint)
--- 
-2.30.0
-

diff --git a/media-sound/strawberry/strawberry-0.8.5.ebuild b/media-sound/strawberry/strawberry-0.8.5.ebuild
index 5d1628e7686..0d5281b6b69 100644
--- a/media-sound/strawberry/strawberry-0.8.5.ebuild
+++ b/media-sound/strawberry/strawberry-0.8.5.ebuild
@@ -84,10 +84,6 @@ REQUIRED_USE="
 	|| ( gstreamer vlc )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.5-make_backends_optional.patch" #757780
-)
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
@@ -105,13 +101,13 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_VLC="$(usex vlc)"
 		-DUSE_SYSTEM_TAGLIB=ON
-		-DUSE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)
 

diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 5d1628e7686..0d5281b6b69 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -84,10 +84,6 @@ REQUIRED_USE="
 	|| ( gstreamer vlc )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.5-make_backends_optional.patch" #757780
-)
-
 src_prepare() {
 	l10n_find_plocales_changes "src/translations" "" ".po"
 
@@ -105,13 +101,13 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
 		-DENABLE_LIBMTP="$(usex mtp)"
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
-		-DUSE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_VLC="$(usex vlc)"
 		-DUSE_SYSTEM_TAGLIB=ON
-		-DUSE_VLC="$(usex vlc)"
 		-DWITH_QT6=OFF
 	)
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/, media-sound/strawberry/files/
@ 2025-06-26 15:29 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-06-26 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     34604c216c8bfac8fa6708d76ed9cc49dfaa5131
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Jun 25 09:38:52 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=34604c21

media-sound/strawberry: add 1.2.11

add/rm useflags/features :
add discord with a useflag/local-desc, dev-libs/rapidjson.
move udisks to optfeature, because dbus is only required for building.
handle debug with usex and delete flag-o-matic.
add streamtagreader with dev-cpp/sparsehash and media-libs/taglib,
on by default because playing stream is not optional and sparsehash is depless.

deps :
add media-libs/gst-plugins-good (spectrum plugin) for the useflag moodbar.
add x11-libs/libX11 for the useflag X (X11 global shortcuts).
kde requires dbus for building, delete kf/kglobalaccel (runtime call only).
remove media-plugins/gst-plugins-taglib, only required for lameenc (id3v2mux).
remove gettext, no longer required since 1.2.1.

output :
gstreamer is always required (oss, jack, pulse, alsa, pipewire).
so adding gst-plugins-base[alsa?] and gst-plugins-pulse.
strictly, alsa useflag (ENABLE_ALSA) handles alsa-plugin/integration, optional,
which makes strawberry link against alsa-lib. It doesn't really matter.
it's almost the same with pulseaudio.

remove the old comment for bundle sqlitedriver, removed since 0.1.3

Bug 925505 for libebur is resolved since 7e737b5 :
> loudness? ( media-libs/libebur128 )
> -DENABLE_EBUR128="$(usex loudness)"

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

 media-sound/strawberry/Manifest                    |   1 +
 .../files/strawberry-1.2.11-unforce_alsa.patch     |  18 ++++
 media-sound/strawberry/metadata.xml                |   1 +
 media-sound/strawberry/strawberry-1.2.11.ebuild    | 119 +++++++++++++++++++++
 4 files changed, 139 insertions(+)

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index ac75cf94035c..0e2a772e4f87 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1 +1,2 @@
+DIST strawberry-1.2.11.tar.xz 11458100 BLAKE2B b455eebf0aac6559aadd0515ef3a57953f3f1fc8c377f6640ef3faaed44c1cbeedb0b52ad992fbcad4293be0ba01bc393d192c96231156d697c269dc3382d039 SHA512 22e351e9ce6504120495465224e27295a093c09b747cd97b8e00062ca987d9400ad39514bae4aca96a851c68d1e5c354491f7efe65561a970e4a32da4e40920c
 DIST strawberry-1.2.7.tar.xz 11487296 BLAKE2B 9fac1cdaf2c3945eeaa433400212f00d9b9548e80113cbd61a21e9d878caf6a1b04c1bc4627b04b88f9a9c2739f320226cfcad2c7067cb324c5a7ef8ab53804d SHA512 a343abd9c45002acee37d253001181c939c9d9ebe7a888c0f5c436f610825e601b0ed2c789b372b8f07f60e8d5ce8b9f7d6e715f8a0d1a3fb77e7b8260192f4b

diff --git a/media-sound/strawberry/files/strawberry-1.2.11-unforce_alsa.patch b/media-sound/strawberry/files/strawberry-1.2.11-unforce_alsa.patch
new file mode 100644
index 000000000000..1c7974e01ab5
--- /dev/null
+++ b/media-sound/strawberry/files/strawberry-1.2.11-unforce_alsa.patch
@@ -0,0 +1,18 @@
+Make alsa optional
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca53957..7305e85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -165,11 +165,7 @@ if(NOT Boost_FOUND)
+ endif()
+ find_package(ICU COMPONENTS uc i18n REQUIRED)
+ if(UNIX AND NOT APPLE)
+-  if(LINUX)
+-    find_package(ALSA REQUIRED)
+-  else()
+-    find_package(ALSA)
+-  endif()
++  find_package(ALSA)
+   find_package(X11 COMPONENTS X11_xcb)
+ endif()
+ pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)

diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml
index 466d6bb678cb..c65efde3bdef 100644
--- a/media-sound/strawberry/metadata.xml
+++ b/media-sound/strawberry/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="discord">Enables Discord Rich Presence</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="streaming">Enable Online Streaming Support</flag>

diff --git a/media-sound/strawberry/strawberry-1.2.11.ebuild b/media-sound/strawberry/strawberry-1.2.11.ebuild
new file mode 100644
index 000000000000..de32a81150f5
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.2.11.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+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 discord kde +loudness ipod moodbar mtp +pulseaudio streaming test X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="kde? ( dbus )"
+
+COMMON_DEPEND="
+	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/taglib:=
+	media-libs/gstreamer: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:2
+	)
+	loudness? ( media-libs/libebur128:= )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( media-libs/libmtp:= )
+	pulseaudio? ( media-libs/libpulse )
+	X? ( x11-libs/libX11 )
+"
+# gst-plugins-good provides spectrum plugin for moodbar
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	moodbar? ( media-libs/gst-plugins-good:1.0 )
+	pulseaudio? ( media-plugins/gst-plugins-pulse:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/sparsehash
+	dev-libs/boost
+	discord? ( dev-libs/rapidjson )
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.11-unforce_alsa.patch
+)
+
+DOCS=( Changelog README.md )
+
+src_configure() {
+	# spotify is not in portage (gst-plugins-rs)
+	local mycmakeargs=(
+		$(cmake_use_find_package test GTest)
+		$(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
+		# 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)"
+		-DENABLE_X11_GLOBALSHORTCUTS="$(usex X)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_MTP="$(usex mtp)"
+		-DENABLE_GPOD="$(usex ipod)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_EBUR128="$(usex loudness)"
+		-DENABLE_SUBSONIC="$(usex streaming)"
+		-DENABLE_TIDAL="$(usex streaming)"
+		-DENABLE_QOBUZ="$(usex streaming)"
+		-DENABLE_SPOTIFY="$(usex streaming)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_build run_strawberry_tests
+}
+
+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"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-06-26 15:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-04 17:13 [gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/, media-sound/strawberry/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2021-01-05 19:16 Lars Wendler
2025-06-26 15:29 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox