commit: 58878c87b38de60499a315f2257efd3a8f23590f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 1 19:14:25 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 1 19:15:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58878c87
media-sound/cantata: drop 2.5.0-r3 Closes: https://bugs.gentoo.org/927073 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/cantata/Manifest | 1 - media-sound/cantata/cantata-2.5.0-r3.ebuild | 117 --------------------- .../cantata/files/cantata-2.2.0-headers.patch | 48 --------- .../files/cantata-2.5.0-fix-build-taglib2.patch | 42 -------- media-sound/cantata/metadata.xml | 1 - 5 files changed, 209 deletions(-) diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 4000e6fa53d0..f23d8fe6f4fd 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1,2 +1 @@ -DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2 DIST cantata-3.3.0.tar.gz 4783803 BLAKE2B 78995492080cacf4d5f01e923a71edb2208baa9238d269679f6ea0112cf06066295bbeb40b18439bcd45fea8079ea6c52422f5515ed6f0c1511f7942f3b96f15 SHA512 ec011a2e544a882c68a808d27752457e4702f20b0ed66124dcc10586c8f5cc975690a4fc7368abc2747fd4f603f19b787a45f5a664f3ace8bcc9f1f86369253e diff --git a/media-sound/cantata/cantata-2.5.0-r3.ebuild b/media-sound/cantata/cantata-2.5.0-r3.ebuild deleted file mode 100644 index e804a0c16cd9..000000000000 --- a/media-sound/cantata/cantata-2.5.0-r3.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN" -inherit cmake plocale xdg - -DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" -HOMEPAGE="https://github.com/CDrummond/cantata"; -SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" -IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf" -REQUIRED_USE=" - ?? ( cdda cdio ) - cdda? ( udisks || ( cddb musicbrainz ) ) - cddb? ( || ( cdio cdda ) taglib ) - cdio? ( udisks || ( cddb musicbrainz ) ) - mtp? ( taglib udisks ) - musicbrainz? ( || ( cdio cdda ) taglib ) - replaygain? ( taglib ) -" -# cantata has no tests -RESTRICT="test" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/zlib - virtual/libudev:= - cdda? ( media-sound/cdparanoia ) - cddb? ( media-libs/libcddb ) - cdio? ( dev-libs/libcdio-paranoia:= ) - mtp? ( media-libs/libmtp:= ) - musicbrainz? ( media-libs/musicbrainz:5= ) - replaygain? ( - media-libs/libebur128:= - media-sound/mpg123 - media-video/ffmpeg:0= - ) - streaming? ( dev-qt/qtmultimedia:5 ) - taglib? ( - media-libs/taglib:=[asf(+),mp4(+)] - udisks? ( sys-fs/udisks:2 ) - ) - zeroconf? ( net-dns/avahi ) -" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl[perl_features_ithreads] - || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtconcurrent:5 -" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-headers.patch" - "${FILESDIR}/${PN}-2.5.0-fix-build-taglib2.patch" -) - -src_prepare() { - remove_locale() { - rm "translations/${PN}_${1}".ts || die - } - - cmake_src_prepare - - # Unbundle 3rd party libs - rm -r 3rdparty/{ebur128,qtsingleapplication} || die - - plocale_find_changes "translations" "${PN}_" ".ts" - plocale_for_each_disabled_locale remove_locale -} - -src_configure() { - local mycmakeargs=( - -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" - -DENABLE_CDPARANOIA=$(usex cdda) - -DENABLE_CDDB=$(usex cddb) - -DENABLE_CDIOPARANOIA=$(usex cdio) - -DENABLE_HTTP_SERVER=$(usex http-server) - -DENABLE_MTP=$(usex mtp) - -DENABLE_MUSICBRAINZ=$(usex musicbrainz) - -DENABLE_FFMPEG=$(usex replaygain) - -DENABLE_MPG123=$(usex replaygain) - -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) - -DENABLE_TAGLIB=$(usex taglib) - -DENABLE_DEVICES_SUPPORT=$(usex udisks) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_REMOTE_DEVICES=OFF - -DENABLE_UDISKS2=ON - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - has_version media-sound/mpd || \ - elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." - - if ! has_version app-misc/media-player-info; then - elog "Install app-misc/media-player-info to enable identification" - elog "and querying of portable media players" - fi -} diff --git a/media-sound/cantata/files/cantata-2.2.0-headers.patch b/media-sound/cantata/files/cantata-2.2.0-headers.patch deleted file mode 100644 index 962c8413a9fd..000000000000 --- a/media-sound/cantata/files/cantata-2.2.0-headers.patch +++ /dev/null @@ -1,48 +0,0 @@ -Description: Fix include location for ebur128 files - The Debian packages for ebur128 are shipping the headers in: - - libebur128-dev: /usr/include/ebur128.h - - while the upstream code expects ebur128/ebur128.h - -Author: Stuart Prescott <[email protected]> -Forwarded: not sure -- check interaction with cmake rules -diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp -index 24e47d34..382bac90 100644 ---- a/replaygain/ffmpeginput.cpp -+++ b/replaygain/ffmpeginput.cpp -@@ -31,7 +31,7 @@ extern "C" { - #include <QString> - #include <QList> - #include <QByteArray> --#include "ebur128/ebur128.h" -+#include "ebur128.h" - #include "ffmpeginput.h" - - static QMutex mutex; -diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp -index 43ae0371..6a7b266f 100644 ---- a/replaygain/mpg123input.cpp -+++ b/replaygain/mpg123input.cpp -@@ -18,7 +18,7 @@ extern "C" { - #include <QFile> - #include <QString> - #include <QByteArray> --#include "ebur128/ebur128.h" -+#include "ebur128.h" - #include "mpg123input.h" - - struct Mpg123Input::Handle { -diff --git a/replaygain/trackscanner.h b/replaygain/trackscanner.h -index b8709115..631e551a 100644 ---- a/replaygain/trackscanner.h -+++ b/replaygain/trackscanner.h -@@ -25,7 +25,7 @@ - #define _SCANNER_H_ - - #include "jobcontroller.h" --#include "ebur128/ebur128.h" -+#include "ebur128.h" - - class Input; - diff --git a/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch b/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch deleted file mode 100644 index c0cc7490b18d..000000000000 --- a/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch +++ /dev/null @@ -1,42 +0,0 @@ -patch from fork as official is archived -https://github.com/nullobsi/cantata/commit/45bac9eb3e99ed75b6539f92418556dac1c0193d.patch -diff --git a/tags/tags.cpp b/tags/tags.cpp -index ce86a1e8..5817dc1b 100644 ---- a/tags/tags.cpp -+++ b/tags/tags.cpp -@@ -619,7 +619,7 @@ static void readAPETags(TagLib::APE::Tag *tag, Song *song, ReplayGain *rg, QImag - if (map.contains("COVER ART (FRONT)")) { - const TagLib::ByteVector nullStringTerminator(1, 0); - -- TagLib::ByteVector item = map["COVER ART (FRONT)"].value(); -+ TagLib::ByteVector item = map["COVER ART (FRONT)"].binaryData(); - int pos = item.find(nullStringTerminator); // Skip the filename - - if (++pos > 0) { -@@ -1301,7 +1301,7 @@ static void readTags(const TagLib::FileRef fileref, Song *song, ReplayGain *rg, - } - } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) { - if (file->tag()) { -- readID3v2Tags(file->tag(), song, rg, img, lyrics, rating); -+ readID3v2Tags(file->ID3v2Tag(), song, rg, img, lyrics, rating); - } - #ifdef TAGLIB_ASF_FOUND - } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) { -@@ -1419,7 +1419,7 @@ static bool writeTags(const TagLib::FileRef fileref, const Song &from, const Son - } - } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) { - if (file->tag()) { -- changed=writeID3v2Tags(file->tag(), from, to, rg, img, rating) || changed; -+ changed=writeID3v2Tags(file->ID3v2Tag(), from, to, rg, img, rating) || changed; - } - #ifdef TAGLIB_ASF_FOUND - } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) { -@@ -1455,7 +1455,7 @@ Song read(const QString &fileName) - - readTags(fileref, &song, nullptr, nullptr, nullptr, nullptr); - song.file=fileName; -- song.time=fileref.audioProperties() ? fileref.audioProperties()->length() : 0; -+ song.time=fileref.audioProperties() ? fileref.audioProperties()->lengthInSeconds() : 0; - return song; - } - diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml index 4c29857ebbda..1aaba5bbf0b5 100644 --- a/media-sound/cantata/metadata.xml +++ b/media-sound/cantata/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="cdio">Use <pkg>dev-libs/libcdio-paranoia</pkg> for CD support (instead of cdparanoia)</flag> <flag name="http-server">Enable internal HTTP server to play non-MPD files</flag> <flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag> <flag name="streaming">Enable playback of MPD HTTP streams using (<pkg>dev-qt/qtmultimedia</pkg>)</flag>
