CVS commit: pkgsrc/sysutils/kfilemetadata5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 28 18:41:53 UTC 2024

Modified Files:
        pkgsrc/sysutils/kfilemetadata5: distinfo
Added Files:
        pkgsrc/sysutils/kfilemetadata5/patches:
            patch-src_extractors_taglibextractor.cpp
            patch-src_writers_taglibwriter.cpp

Log Message:
kfilemetatada5: fix build with taglib2 using upstream commits


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/kfilemetadata5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_taglibextractor.cpp \
    pkgsrc/sysutils/kfilemetadata5/patches/patch-src_writers_taglibwriter.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/kfilemetadata5/distinfo
diff -u pkgsrc/sysutils/kfilemetadata5/distinfo:1.17 pkgsrc/sysutils/kfilemetadata5/distinfo:1.18
--- pkgsrc/sysutils/kfilemetadata5/distinfo:1.17        Sat Jul 29 02:26:37 2023
+++ pkgsrc/sysutils/kfilemetadata5/distinfo     Sun Jan 28 18:41:53 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.17 2023/07/29 02:26:37 markd Exp $
+$NetBSD: distinfo,v 1.18 2024/01/28 18:41:53 wiz Exp $
 
 BLAKE2s (kfilemetadata-5.108.0.tar.xz) = 37f96fb315ec4d25a2e18c69c928537cf18ca98147cbe0b0bca3a397fa8f0c64
 SHA512 (kfilemetadata-5.108.0.tar.xz) = f1a8d20ae91809f736d0355a3fafb9be0e77482b8c7fd6a5ff66f0f6937f4ad61c26841d9bcee2574fdb55f6dcfc1670ec26fef70f3f2a0613ba6a30a7826489
 Size (kfilemetadata-5.108.0.tar.xz) = 471476 bytes
 SHA1 (patch-CMakeLists.txt) = 57d022aa86e532e9fe4185a2b5fc8b90b3e5e463
 SHA1 (patch-cmake_FindFFmpeg.cmake) = 94c7699d9a62b86f3c188ad162385bc3319b7753
+SHA1 (patch-src_extractors_taglibextractor.cpp) = 0406977c311ee9baefb83dd7c6e81dc8d65618a0
+SHA1 (patch-src_writers_taglibwriter.cpp) = 10b7c8c2afb93928024c3da67c756a0298996dae

Added files:

Index: pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_taglibextractor.cpp
diff -u /dev/null pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_taglibextractor.cpp:1.1
--- /dev/null   Sun Jan 28 18:41:53 2024
+++ pkgsrc/sysutils/kfilemetadata5/patches/patch-src_extractors_taglibextractor.cpp     Sun Jan 28 18:41:53 2024
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_extractors_taglibextractor.cpp,v 1.1 2024/01/28 18:41:53 wiz Exp $
+
+Fix build with taglib 2.
+https://github.com/KDE/kfilemetadata/commit/0d1606612aca206a122aa376045ec8871d50de59
+https://github.com/KDE/kfilemetadata/commit/c9a90eedc975f469c35369b9ed9462bb4cb48f79
+
+--- src/extractors/taglibextractor.cpp.orig    2023-07-01 09:57:07.000000000 +0000
++++ src/extractors/taglibextractor.cpp
+@@ -34,6 +34,7 @@
+ #include <id3v2tag.h>
+ #include <mp4tag.h>
+ #include <popularimeterframe.h>
++#include <attachedpictureframe.h>
+ 
+ using namespace KFileMetaData;
+ 
+@@ -578,8 +579,8 @@ void TagLibExtractor::extract(Extraction
+             extractAudioProperties(&file, result);
+             readGenericProperties(file.properties(), result);
+             if (file.hasID3v2Tag()) {
+-                result->addImageData(extractId3Cover(file.tag(), imageTypes));
+-                extractId3Tags(file.tag(), result);
++                result->addImageData(extractId3Cover(file.ID3v2Tag(), imageTypes));
++                extractId3Tags(file.ID3v2Tag(), result);
+             }
+         }
+     } else if (mimeType == QLatin1String("audio/x-musepack")) {
Index: pkgsrc/sysutils/kfilemetadata5/patches/patch-src_writers_taglibwriter.cpp
diff -u /dev/null pkgsrc/sysutils/kfilemetadata5/patches/patch-src_writers_taglibwriter.cpp:1.1
--- /dev/null   Sun Jan 28 18:41:53 2024
+++ pkgsrc/sysutils/kfilemetadata5/patches/patch-src_writers_taglibwriter.cpp   Sun Jan 28 18:41:53 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_writers_taglibwriter.cpp,v 1.1 2024/01/28 18:41:53 wiz Exp $
+
+Fix build with taglib 2.
+https://github.com/KDE/kfilemetadata/commit/0d1606612aca206a122aa376045ec8871d50de59
+https://github.com/KDE/kfilemetadata/commit/c9a90eedc975f469c35369b9ed9462bb4cb48f79
+
+--- src/writers/taglibwriter.cpp.orig  2023-07-01 09:57:07.000000000 +0000
++++ src/writers/taglibwriter.cpp
+@@ -33,6 +33,7 @@
+ #include <wavpackfile.h>
+ #include <wavfile.h>
+ #include <popularimeterframe.h>
++#include <attachedpictureframe.h>
+ 
+ namespace {
+ 
+@@ -552,7 +553,7 @@ void TagLibWriter::write(const WriteData
+             auto savedProperties = file.properties();
+             writeGenericProperties(savedProperties, properties);
+             file.setProperties(savedProperties);
+-            auto id3Tags = dynamic_cast<TagLib::ID3v2::Tag*>(file.tag());
++            auto id3Tags = file.ID3v2Tag();
+             if (id3Tags) {
+                 writeID3v2Tags(id3Tags, properties);
+                 writeID3v2Cover(id3Tags, data.imageData());