gentoo auto-resync : 24:12:2023 - 01:44:20

4 files changed, 224 insertions, 0 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c405c1b43966..0f05efe2c4b5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index e8d2abb0aac0..31da59d257aa 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,10 @@
 AUX clementine-1.4.0_rc2-absl.patch 382 BLAKE2B 7d79b011aa6b1cc54fde671cf294173802fa0ec2eb494e7f54be5c9ebe693247cb809bba3e9a794db6832d8bbb279fbed0c5d7cfacde25b6b28dac32d7756286 SHA512 9a8bbc39248f511dfe616ecdeeaf7e3ac3f92590b4744b19028f3b9038595cad7e2bb2bccbda1c4187cc40813efb68b465a44aea1a25c85ab19710e8173e077e
 AUX clementine-1.4.0_rc2-c17.patch 2261 BLAKE2B e66117f376b440d359eb40c3247c28ed662b4924e066385792cc3638ae2d0296b52b3c4dc5185507f21c51baac78e063ab79d72bbb7ce2df76e82f5ebffe10c0 SHA512 8a68a23956a08c08a4d7ee030606512f375c2039314268f6f615c424a1b3ab46b643af3afdf221a2d827f03962a1644bd5b1de5d4d70c53b1fd02625fc1026ea
 AUX clementine-1.4.0_rc2-lz.patch 889 BLAKE2B ce04feb2b14c4b1e2e994672c0196100b35672da8b830c3ad1b8103f11327aefbccce97c5ad4253227b88939e16d6a6a88c8b3e3530e8589b1b9e28eb524361c SHA512 4bd24c05dd3d748d6b5f66070900fcef841144baaa8557bdc05a6128ee7b64f7b222344447944ef41d83694ec3f7618fd744d8e6053ec34f35b923b0a3db02a7
+AUX clementine-1.4.0_rc2-projectm-dir.patch 1879 BLAKE2B dc2d19a17b6c255360ae961ff55c6598eae51f0b5b1f4147c8b13541121f8c6dd03d864ba04dbc594ec670c5872e356e3522aaef4f67804b6e7aeb438ec0bb9c SHA512 7d891b9c26dd62b1fdad5548de0976192934aa1a28d25501fb5ba896a81d663243196e076054de6678b69cae3b05df16209c0cfd9ee3b652fe051c7ad4f17a2e
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
 EBUILD clementine-1.4.0_rc2-r3.ebuild 4507 BLAKE2B 55467d1946ae46f2d23ef2be17b2b01e689861bf62799473d29d520333ea7fa7067293a050e89fe7d084918e3093773db86c352546542a6e4d25df5cf20a7818 SHA512 9dad86b1435b2317cd78cf2e0826ee30d1d62e76e62f73ded349a502a3654678015bdd0d7d8670d2fbdad6e98b3e54b6478a01905e944d83048f7ade48e81a0a
 EBUILD clementine-1.4.0_rc2-r4.ebuild 4624 BLAKE2B fe9f57e729cdb6886636e20b03514cd1eaf51b1152946ee864786af5c1d7bc3c9b555f89948a4a4774f1a89afac39cb1969be7bd4ead9ff808e685f9701ed185 SHA512 8dbbe2b28494267723e406fe4ff06fee619b3aa0388f1a84e9efe196e344680f1abdea1dc256fdae56aa8492d4bb3f68204544dfcba2bec0d5802c95d569af8d
+EBUILD clementine-1.4.0_rc2-r5.ebuild 4679 BLAKE2B 44d0b63e30781d26e2f294077759e5a2eee346c520778ed6a84f51e4198e4696523c2a99a2e90b19222b1cccb2c45231d250b7db63495de1bfdf570a57670317 SHA512 4abf6e3789df683d0d022b4906f4997cb9e164b6fadc4d166844f5a129945c9758c757f65f3cecb2bf7915cdfa7c700a4de94330e7f39973520ce72d271d9f3e
 EBUILD clementine-9999.ebuild 4487 BLAKE2B a37b746a284c0e34f2102ef040b1fc997227733f5ce3b7960baeacf9a2f5386b93869625bcf7fe168cb33b7ad0faafaa4d47a1d7f517f64e4b009221019ae3a0 SHA512 a7b1912add167b7f5a6afb351e32193cc7b2fbd10ed21fd11b3789d7292c53ef5eff1382c3602cf643037842e892e8aef677d7bcf90d5a1e676887826096089e
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
new file mode 100644
index 000000000000..6e37ca03e086
--- /dev/null
+++ b/media-sound/clementine/clementine-1.4.0_rc2-r5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
+HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
+
+PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake flag-o-matic plocale virtualx xdg
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/clementine-player/Clementine/archive/refs/tags/${PV/_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Clementine-${PV/_}"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa box cdda +dbus debug dropbox googledrive ipod lastfm moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-cpp/abseil-cpp:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	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
+	dev-qt/qtx11extras:5
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	moodbar? ( sci-libs/fftw:3.0= )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+	projectm? (
+		media-libs/glew:=
+		>=media-libs/libprojectm-3.1.12:0=
+		virtual/opengl
+	)
+	pulseaudio? ( media-libs/libpulse )
+"
+RDEPEND="${COMMON_DEPEND}
+	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-libs/boost
+	dev-libs/libxml2
+	dev-qt/qtopengl:5
+	dev-qt/qtxml:5
+	virtual/glu
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	seafile? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+"
+BDEPEND="
+	>=dev-cpp/gtest-1.8.0
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		dev-qt/qttest:5
+		gnome-base/gsettings-desktop-schemas
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/clementine-1.4.0_rc2-lz.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-c17.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-absl.patch"
+	"${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch"
+)
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory tests
+	fi
+
+	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DENABLE_GIO=ON
+		-DENABLE_SPOTIFY=OFF
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		"$(cmake_use_find_package alsa ALSA)"
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx cmake_build clementine_test
+}
+
+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/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch
new file mode 100644
index 000000000000..8f92766193d6
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.4.0_rc2-projectm-dir.patch
@@ -0,0 +1,53 @@
+Read visualisations from subdirs
+
+https://bugs.gentoo.org/917064
+https://github.com/clementine-player/Clementine/issues/7151
+
+--- a/src/visualisations/projectmpresetmodel.cpp
++++ b/src/visualisations/projectmpresetmodel.cpp
+@@ -27,22 +27,26 @@
+ #endif
+ 
+ #include <QDir>
++#include <QDirIterator>
+ #include <QtDebug>
++#include <set>
+ 
+ ProjectMPresetModel::ProjectMPresetModel(ProjectMVisualisation* vis,
+                                          QObject* parent)
+     : QAbstractItemModel(parent), vis_(vis) {
+   // Find presets
+-  QDir preset_dir(vis_->preset_url());
+-  QStringList presets(
+-      preset_dir.entryList(QStringList() << "*.milk"
+-                                         << "*.prjm",
++  QDirIterator it(vis_->preset_url(),
++                  QStringList() << "*.milk" << "*.prjm",
+                            QDir::Files | QDir::NoDotAndDotDot | QDir::Readable,
+-                           QDir::Name | QDir::IgnoreCase));
++                           QDirIterator::Subdirectories);
++  std::set<std::pair<QString, QString>> files;
++  while (it.hasNext()) {
++    it.next();
++    files.insert({it.filePath(), it.fileName()});
++  }
+ 
+-  for (const QString& filename : presets) {
+-    all_presets_ << Preset(preset_dir.absoluteFilePath(filename), filename,
+-                           false);
++  for (const auto& [filePath, fileName] : files) {
++    all_presets_ << Preset(filePath, fileName, false);
+   }
+ }
+ 
+--- a/src/visualisations/projectmvisualisation.cpp
++++ b/src/visualisations/projectmvisualisation.cpp
+@@ -93,7 +93,7 @@ void ProjectMVisualisation::InitProjectM() {
+     if (!QFile::exists(path)) continue;
+ 
+     // Don't use empty directories
+-    if (QDir(path).entryList(QDir::Files | QDir::NoDotAndDotDot).isEmpty())
++    if (QDir(path).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty())
+       continue;
+ 
+     preset_path = path;