2 files changed, 0 insertions, 90 deletions
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 962c8413..00000000
--- 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 <stuart@debian.org>
-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 c0cc7490..00000000
--- 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;
- }
-