Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cantata for openSUSE:Factory checked in at 2024-02-20 21:16:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantata (Old) and /work/SRC/openSUSE:Factory/.cantata.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantata" Tue Feb 20 21:16:47 2024 rev:22 rq:1148333 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cantata/cantata.changes 2023-08-28 17:14:45.335660473 +0200 +++ /work/SRC/openSUSE:Factory/.cantata.new.1706/cantata.changes 2024-02-20 21:16:51.603490289 +0100 @@ -1,0 +2,8 @@ +Tue Feb 20 15:46:42 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Remove the taglib-extras build dependency, it fails to build + with taglib 2 and will be removed. +- Add patch to fix build with taglib 2: + * 0001-Update-for-tablib-2.0-compatibility.patch + +------------------------------------------------------------------- New: ---- 0001-Update-for-tablib-2.0-compatibility.patch BETA DEBUG BEGIN: New:- Add patch to fix build with taglib 2: * 0001-Update-for-tablib-2.0-compatibility.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantata.spec ++++++ --- /var/tmp/diff_new_pack.MwMd4I/_old 2024-02-20 21:16:52.203512054 +0100 +++ /var/tmp/diff_new_pack.MwMd4I/_new 2024-02-20 21:16:52.207512199 +0100 @@ -24,7 +24,8 @@ Group: Productivity/Multimedia/Sound/Players URL: https://github.com/CDrummond/cantata/ Source0: https://github.com/CDrummond/cantata/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz - +# PATCH-FIX-UPSTREAM -- taglib 2.0 support https://github.com/fenuks/cantata/commit/45bac9e +Patch0: 0001-Update-for-tablib-2.0-compatibility.patch BuildRequires: fdupes BuildRequires: media-player-info BuildRequires: pkgconfig @@ -49,7 +50,6 @@ BuildRequires: pkgconfig(libmusicbrainz5) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(taglib) -BuildRequires: pkgconfig(taglib-extras) BuildRequires: pkgconfig(udisks2) BuildRequires: pkgconfig(zlib) Requires: media-player-info @@ -91,7 +91,10 @@ information, please refer to the main README. %prep -%autosetup +%setup -q +%if %{pkg_vcmp pkgconfig(taglib) >= 2.0} +%patch -P0 -p1 +%endif %build %cmake -DENABLE_REMOTE_DEVICES=OFF \ ++++++ 0001-Update-for-tablib-2.0-compatibility.patch ++++++ >From 3d9fd5cd0f0f3c33dde263cba299467c4dff222b Mon Sep 17 00:00:00 2001 From: fenuks <fenuks> Date: Mon, 29 Jan 2024 23:37:31 +0100 Subject: [PATCH] Update for tablib 2.0 compatibility --- CMakeLists.txt | 3 ++- tags/tags.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b99e161..ad8e987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ endif () if (ENABLE_TAGLIB) if (NOT TAGLIB_FOUND) - set(TAGLIB_MIN_VERSION "1.6") + set(TAGLIB_MIN_VERSION "2.0") find_package(Taglib) endif() macro_log_feature(TAGLIB_FOUND "TagLib" "Tag editor, file organiser, etc." "http://taglib.github.io/";) @@ -186,6 +186,7 @@ if (TAGLIB_FOUND) macro_log_feature(MTP_FOUND "libmtp" "MTP Device Support." "http://libmtp.sourceforge.net";) endif () else (TAGLIB_FOUND) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable -Wno-unused-parameter") set(ENABLE_DEVICES_SUPPORT OFF) endif () diff --git a/tags/tags.cpp b/tags/tags.cpp index ce86a1e..5817dc1 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; } -- 2.43.1
