commit: 6c83440ae40068846876e2b35577e18e36753dd3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 13 21:52:49 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 21:54:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c83440a
media-sound/clementine: drop 1.4.0_rc2-r6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../clementine/clementine-1.4.0_rc2-r6.ebuild | 170 ------------------- .../files/clementine-1.4.0_rc2-absl2.patch | 86 ---------- .../clementine-1.4.0_rc2-fix-build-taglib2.patch | 188 --------------------- 3 files changed, 444 deletions(-) diff --git a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild b/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild deleted file mode 100644 index 914852a6f203..000000000000 --- a/media-sound/clementine/clementine-1.4.0_rc2-r6.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2025 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:= - 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-absl2.patch" - "${FILESDIR}/clementine-1.4.0_rc2-projectm-dir.patch" - "${FILESDIR}/clementine-1.4.0_rc2-fix-build-taglib2.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-absl2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch deleted file mode 100644 index f6f9b4532b2b..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-absl2.patch +++ /dev/null @@ -1,86 +0,0 @@ -Fix build - -https://bugs.gentoo.org/912853 -https://bugs.gentoo.org/947632 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 010191b..57163b9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,7 @@ endif(OPENGL_FOUND) - find_package(Boost REQUIRED) - find_package(Gettext REQUIRED) - find_package(PkgConfig REQUIRED) --find_package(Protobuf REQUIRED) -+find_package(protobuf REQUIRED) - find_package(FFTW3) - find_package(ALSA) - if (NOT APPLE) -diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt -index 115d1f4..717d76c 100644 ---- a/ext/libclementine-remote/CMakeLists.txt -+++ b/ext/libclementine-remote/CMakeLists.txt -@@ -6,14 +6,14 @@ set(MESSAGES - remotecontrolmessages.proto - ) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(libclementine-remote STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ) - -+protobuf_generate(TARGET libclementine-remote LANGUAGE cpp) -+ - target_link_libraries(libclementine-remote -- ${PROTOBUF_LIBRARY} - libclementine-common -+ protobuf::libprotobuf - ) - -diff --git a/ext/libclementine-spotifyblob/CMakeLists.txt b/ext/libclementine-spotifyblob/CMakeLists.txt -index 7a73b14..072fe60 100644 ---- a/ext/libclementine-spotifyblob/CMakeLists.txt -+++ b/ext/libclementine-spotifyblob/CMakeLists.txt -@@ -7,12 +7,12 @@ set(MESSAGES - spotifymessages.proto - ) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(clementine-spotifyblob-messages STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ) - -+protobuf_generate(TARGET clementine-spotifyblob-messages LANGUAGE cpp) -+ - target_link_libraries(clementine-spotifyblob-messages - libclementine-common - ) -diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt -index 8a0a944..fc2d6e6 100644 ---- a/ext/libclementine-tagreader/CMakeLists.txt -+++ b/ext/libclementine-tagreader/CMakeLists.txt -@@ -28,16 +28,16 @@ optional_source(HAVE_GOOGLE_DRIVE - - qt5_wrap_cpp(MOC ${HEADERS}) - --protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) -- - add_library(libclementine-tagreader STATIC -- ${PROTO_SOURCES} -+ ${MESSAGES} - ${SOURCES} - ${MOC} - ) - -+protobuf_generate(TARGET libclementine-tagreader LANGUAGE cpp) -+ - target_link_libraries(libclementine-tagreader -- ${PROTOBUF_LIBRARY} - libclementine-common -+ protobuf::libprotobuf - ) - diff --git a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch b/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch deleted file mode 100644 index 0c26343c7bf0..000000000000 --- a/media-sound/clementine/files/clementine-1.4.0_rc2-fix-build-taglib2.patch +++ /dev/null @@ -1,188 +0,0 @@ -https://github.com/clementine-player/Clementine/commit/e9c09b1c4054925fa6366233cb44d4d0a543258f.patch -compatibility added with taglib1 ---- a/ext/libclementine-tagreader/cloudstream.cpp -+++ b/ext/libclementine-tagreader/cloudstream.cpp -@@ -91,7 +91,11 @@ - clear(); - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+TagLib::ByteVector CloudStream::readBlock(size_t length) { -+#else - TagLib::ByteVector CloudStream::readBlock(ulong length) { -+#endif - const uint start = cursor_; - const uint end = qMin(cursor_ + length - 1, length_ - 1); - -@@ -144,11 +148,19 @@ - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) { -+#else - void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::removeBlock(TagLib::offset_t, size_t) { -+#else - void CloudStream::removeBlock(ulong, ulong) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - -@@ -159,7 +171,11 @@ - - bool CloudStream::isOpen() const { return true; } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) { -+#else - void CloudStream::seek(long offset, TagLib::IOStream::Position p) { -+#endif - switch (p) { - case TagLib::IOStream::Beginning: - cursor_ = offset; -@@ -178,11 +194,19 @@ - - void CloudStream::clear() { cursor_ = 0; } - -+#if (TAGLIB_MAJOR_VERSION == 2) -+TagLib::offset_t CloudStream::tell() const { return cursor_; } -+ -+TagLib::offset_t CloudStream::length() { return length_; } -+ -+void CloudStream::truncate(TagLib::offset_t) { -+#else - long CloudStream::tell() const { return cursor_; } - - long CloudStream::length() { return length_; } - - void CloudStream::truncate(long) { -+#endif - qLog(Debug) << Q_FUNC_INFO << "not implemented"; - } - ---- a/ext/libclementine-tagreader/cloudstream.h -+++ b/ext/libclementine-tagreader/cloudstream.h -@@ -35,6 +35,19 @@ - - // Taglib::IOStream - virtual TagLib::FileName name() const; -+#if (TAGLIB_MAJOR_VERSION == 2) -+ virtual TagLib::ByteVector readBlock(size_t length); -+ virtual void writeBlock(const TagLib::ByteVector&); -+ virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t); -+ virtual void removeBlock(TagLib::offset_t, size_t); -+ virtual bool readOnly() const; -+ virtual bool isOpen() const; -+ virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p); -+ virtual void clear(); -+ virtual TagLib::offset_t tell() const; -+ virtual TagLib::offset_t length(); -+ virtual void truncate(TagLib::offset_t); -+#else - virtual TagLib::ByteVector readBlock(ulong length); - virtual void writeBlock(const TagLib::ByteVector&); - virtual void insert(const TagLib::ByteVector&, ulong, ulong); -@@ -46,6 +59,7 @@ - virtual long tell() const; - virtual long length(); - virtual void truncate(long); -+#endif - - google::sparsetable<char>::size_type cached_bytes() const { - return cache_.num_nonempty(); ---- a/ext/libclementine-tagreader/tagreader.cpp -+++ b/ext/libclementine-tagreader/tagreader.cpp -@@ -198,7 +198,7 @@ - // Find album artists - TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST"); - if (it != items.end()) { -- TagLib::StringList album_artists = it->second.toStringList(); -+ TagLib::StringList album_artists = it->second.values(); - if (!album_artists.isEmpty()) { - Decode(album_artists.front(), nullptr, song->mutable_albumartist()); - } -@@ -243,22 +243,22 @@ - } - - if (items.contains("BPM")) { -- Decode(items["BPM"].toStringList().toString(", "), nullptr, -+ Decode(items["BPM"].values().toString(", "), nullptr, - song->mutable_performer()); - } - - if (items.contains("PERFORMER")) { -- Decode(items["PERFORMER"].toStringList().toString(", "), nullptr, -+ Decode(items["PERFORMER"].values().toString(", "), nullptr, - song->mutable_performer()); - } - - if (items.contains("COMPOSER")) { -- Decode(items["COMPOSER"].toStringList().toString(", "), nullptr, -+ Decode(items["COMPOSER"].values().toString(", "), nullptr, - song->mutable_composer()); - } - - if (items.contains("GROUPING")) { -- Decode(items["GROUPING"].toStringList().toString(" "), nullptr, -+ Decode(items["GROUPING"].values().toString(" "), nullptr, - song->mutable_grouping()); - } - -@@ -565,8 +565,8 @@ - if (fileref->audioProperties()) { - song->set_bitrate(fileref->audioProperties()->bitrate()); - song->set_samplerate(fileref->audioProperties()->sampleRate()); -- song->set_length_nanosec(fileref->audioProperties()->length() * -- kNsecPerSec); -+ song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() * -+ kNsecPerMsec); - } - - // Get the filetype if we can -@@ -1376,9 +1376,15 @@ - std::unique_ptr<TagLib::File> tag; - if (mime_type == "audio/mpeg" && - title.endsWith(".mp3", Qt::CaseInsensitive)) { -+#if (TAGLIB_MAJOR_VERSION == 2) -+ tag.reset(new TagLib::MPEG::File(stream.get(), true, -+ TagLib::AudioProperties::Accurate, -+ TagLib::ID3v2::FrameFactory::instance())); -+#else - tag.reset(new TagLib::MPEG::File(stream.get(), - TagLib::ID3v2::FrameFactory::instance(), - TagLib::AudioProperties::Accurate)); -+#endif - } else if (mime_type == "audio/mp4" || - (mime_type == "audio/mpeg" && - title.endsWith(".m4a", Qt::CaseInsensitive))) { -@@ -1398,9 +1398,15 @@ - TagLib::AudioProperties::Accurate)); - } else if (mime_type == "application/x-flac" || mime_type == "audio/flac" || - mime_type == "audio/x-flac") { -+#if (TAGLIB_MAJOR_VERSION == 2) -+ tag.reset(new TagLib::FLAC::File(stream.get(), true, -+ TagLib::AudioProperties::Accurate, -+ TagLib::ID3v2::FrameFactory::instance())); -+#else - tag.reset(new TagLib::FLAC::File(stream.get(), - TagLib::ID3v2::FrameFactory::instance(), - true, TagLib::AudioProperties::Accurate)); -+#endif - } else if (mime_type == "audio/x-ms-wma") { - tag.reset(new TagLib::ASF::File(stream.get(), true, - TagLib::AudioProperties::Accurate)); -@@ -1431,7 +1431,7 @@ - song->set_type(cpb::tagreader::SongMetadata_Type_STREAM); - - if (tag->audioProperties()) { -- song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec); -+ song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec); - } - return true; - }
