[gentoo-commits] repo/gentoo:master commit in: media-sound/strawberry/, media-sound/strawberry/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

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"
+}