gentoo auto-resync : 14:09:2024 - 12:32:27

4 files changed, 136 insertions, 3 deletions

diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 9bcfff6196ad..bfa9adee3657 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-1.1.1.tar.xz 11352308 BLAKE2B f43f39f254dce088dd41141715a639f62eb847f0c881e228d5fb1d75a1ee6f70a94fcea732bffda839e2bf7179dc4bf0d8967eb2713c84111339afdc31891bdd SHA512 f44042bc44b6711b8c433b23733c10a13ac6c09f524604fb6d5b71df236cd211a16ea05587af4681ff6859c0af45dc384c67c5f1712182ff692ecf78d6938e19
-EBUILD strawberry-1.1.1.ebuild 3267 BLAKE2B 8894a29426e9e3ec2033a527465cdc3d69219ab2d4d26db890dcdaf67d47f9906e2d409854238ed6ff15be63bd1b854d8b28807d7fdd08870a364d64ffc49edb SHA512 b43721d6fdf714e7bf3848b23935434864b74478890afc0bbe8263a5fb9a8e4264233304b366efd1c4c62a2e8679d017ec9ed0a1886963b570181d5b40c5017a
-EBUILD strawberry-9999.ebuild 3271 BLAKE2B 156e321b1b37e9225d1cec14113cef9c8767dd00bb139d648f1539d47fd496a4bd107a5636c56f1ca49048aa6f8d2515b1a64830dd185d39d50c083d5bde9c8d SHA512 4270c1a85f7c651f5ddc26ebb38fe8481047c73d60eab60a3189b21437c0ef3353db505c7459c21ca9d76768a7f9ca554495ce14f7443708b3c3cfe4a3b2c73b
+DIST strawberry-1.1.2.tar.xz 11354732 BLAKE2B 0f84c37b4fe9fefcea0927473b757388f9e3e9843b2f64ac7ecedc6d8db40cd22161cbc48e5a18b207859d3a27c4659e188cec4f35045643440a809828e136df SHA512 d8059c611d4fda903fc0199fb3b025027dc2bd06fcce943d6f4dc5b934570cf1238653b788325f922e8fa24f2646137cdb2033c8e8e2726ffb21605f4a836489
+EBUILD strawberry-1.1.1-r1.ebuild 3306 BLAKE2B 0e6679db8c209053d1600249434dc78a3e48104af85df78997db8b17e1a066f2de77dcb3b53b3801a88be6d16817e439010fee453137b4ab9323636958b40163 SHA512 ff1c7c8c4f83c0248612c1592a636004a47fc46848a223b5a7fd16608d9b6550e023aee0855a9c8a6ebdeb0b3573e7ef19fd65e533d223c1fb976c9df8427723
+EBUILD strawberry-1.1.2.ebuild 3376 BLAKE2B dbfbc835a5505257d0b9569d7526dbd9f92bd68539ce2b4a5d623d6649b18a38f7cf6e736514dc45e6db14fda7afa9c0d74652946e5075743c926933d2ef5aa4 SHA512 5c35c0d2cb931c9791e617f03e01741cdc151cb3cec8e08ee39b96ffee13093f3438a0ba48d57b6186883ae90bac0f94f94346c35b73bbb9fe299e998d0ffdf2
+EBUILD strawberry-9999.ebuild 3376 BLAKE2B dbfbc835a5505257d0b9569d7526dbd9f92bd68539ce2b4a5d623d6649b18a38f7cf6e736514dc45e6db14fda7afa9c0d74652946e5075743c926933d2ef5aa4 SHA512 5c35c0d2cb931c9791e617f03e01741cdc151cb3cec8e08ee39b96ffee13093f3438a0ba48d57b6186883ae90bac0f94f94346c35b73bbb9fe299e998d0ffdf2
 MISC metadata.xml 563 BLAKE2B 0fd9e599071332ea3db196da30e8bf7b20592b239fc6e0d8a27de5fd0a99eb7b7eab7ddd5e51e68919cafe693081ac777d7d1a8be486e61e7865e85b1b8192be SHA512 610078300250c88041c59ac1b294471431a03801f809325c5a4207d80aaab9fa388b6a79ea879fc37b1ca1a754f60c0067778e825bdfa3bcaeaec05d27a6162f
diff --git a/media-sound/strawberry/strawberry-1.1.1.ebuild b/media-sound/strawberry/strawberry-1.1.1-r1.ebuild
index a74ee32e184c..cb61111dace6 100644
--- a/media-sound/strawberry/strawberry-1.1.1.ebuild
+++ b/media-sound/strawberry/strawberry-1.1.1-r1.ebuild
@@ -105,6 +105,7 @@ src_configure() {
 		-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)"
diff --git a/media-sound/strawberry/strawberry-1.1.2.ebuild b/media-sound/strawberry/strawberry-1.1.2.ebuild
new file mode 100644
index 000000000000..5b201a9f9534
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.1.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+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="cdda debug +gstreamer ipod moodbar mtp pulseaudio qt6 soup +udisks vlc"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	!qt6? ( dev-qt/linguist-tools:5 )
+"
+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]
+	)
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/chromaprint:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	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] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+	!qt6? ( dev-qt/qttest:5 )
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	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="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-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)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_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
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index 3b96cd045947..5b201a9f9534 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic plocale xdg
 
-PLOCALES="ca cs de es es_AR es_ES es_MX et fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+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"
 
 DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
 HOMEPAGE="https://www.strawberrymusicplayer.org/"
@@ -105,6 +105,7 @@ src_configure() {
 		-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)"