pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/strawberry/patches strawberry: remove obsolete p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e94c072f5efd
branches: trunk
changeset: 450765:e94c072f5efd
user: nia <nia%pkgsrc.org@localhost>
date: Wed Apr 21 11:01:52 2021 +0000
description:
strawberry: remove obsolete patches
diffstat:
audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.cpp | 106 ----------
audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.h | 37 ---
audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreadermessages.proto | 15 -
audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.cpp | 31 --
audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.h | 22 --
audio/strawberry/patches/patch-src_core_song.cpp | 34 ---
audio/strawberry/patches/patch-src_core_song.h | 39 ---
audio/strawberry/patches/patch-src_core_tagreaderclient.cpp | 51 ----
audio/strawberry/patches/patch-src_core_tagreaderclient.h | 25 --
audio/strawberry/patches/patch-tests_src_tagreader__test.cpp | 25 --
10 files changed, 0 insertions(+), 385 deletions(-)
diffs (truncated from 425 to 300 lines):
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.cpp
--- a/audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.cpp Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-$NetBSD: patch-ext_libstrawberry-tagreader_tagreader.cpp,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- ext/libstrawberry-tagreader/tagreader.cpp.orig 2020-11-29 07:35:15.638962593 +0000
-+++ ext/libstrawberry-tagreader/tagreader.cpp
-@@ -146,34 +146,34 @@ bool TagReader::IsMediaFile(const QStrin
-
- }
-
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-
-- if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
-- if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
-- if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
-- if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
-- if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
-- if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
-- if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
-- if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
-- if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
-- if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
-- if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
-- if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
-- if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-- if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+ if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+ if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+ if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+ if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+ if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+ if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+ if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+ if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+ if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+ if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+ if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+ if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+ if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+ if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
-- if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+ if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
-- if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+ if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
-
-- return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+ return spb::tagreader::SongMetadata_FileType_UNKNOWN;
-
- }
-
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
-
- const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
- const QFileInfo info(filename);
-@@ -435,7 +435,7 @@ void TagReader::Decode(const QString &ta
-
- }
-
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
-
- if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
- if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@ void TagReader::ParseOggTag(const TagLib
-
- }
-
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
-
- TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
- if (it != map.end()) {
-@@ -503,7 +503,7 @@ void TagReader::ParseAPETag(const TagLib
-
- }
-
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
-
- vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
- vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@ void TagReader::SetVorbisComments(TagLib
-
- }
-
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
-
- if (filename.isEmpty()) return false;
-
-@@ -602,7 +602,7 @@ bool TagReader::SaveFile(const QString &
- return result;
- }
-
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
-
- tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
- tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.h
--- a/audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreader.h Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ext_libstrawberry-tagreader_tagreader.h,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- ext/libstrawberry-tagreader/tagreader.h.orig 2020-11-09 22:12:40.431554880 +0000
-+++ ext/libstrawberry-tagreader/tagreader.h
-@@ -51,10 +51,10 @@ class TagReader {
- ~TagReader();
-
- bool IsMediaFile(const QString &filename) const;
-- pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+ spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-
-- void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
-- bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+ void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+ bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
-
- QByteArray LoadEmbeddedArt(const QString &filename) const;
- QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@ class TagReader {
- static void Decode(const TagLib::String &tag, std::string *output);
- static void Decode(const QString &tag, std::string *output);
-
-- void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-- void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+ void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+ void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-
-- void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
-- void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+ void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+ void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
-
- void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
- void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreadermessages.proto
--- a/audio/strawberry/patches/patch-ext_libstrawberry-tagreader_tagreadermessages.proto Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_libstrawberry-tagreader_tagreadermessages.proto,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- ext/libstrawberry-tagreader/tagreadermessages.proto.orig 2020-11-29 07:34:39.463138999 +0000
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto
-@@ -1,6 +1,6 @@
- syntax = "proto2";
-
--package pb.tagreader;
-+package spb.tagreader;
-
- message SongMetadata {
-
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.cpp
--- a/audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.cpp Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ext_strawberry-tagreader_tagreaderworker.cpp,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- ext/strawberry-tagreader/tagreaderworker.cpp.orig 2020-11-29 07:34:39.463138999 +0000
-+++ ext/strawberry-tagreader/tagreaderworker.cpp
-@@ -27,11 +27,11 @@
- #include "tagreaderworker.h"
-
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
-- : AbstractMessageHandler<pb::tagreader::Message>(socket, parent) {}
-+ : AbstractMessageHandler<spb::tagreader::Message>(socket, parent) {}
-
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message &message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message &message) {
-
-- pb::tagreader::Message reply;
-+ spb::tagreader::Message reply;
-
- if (message.has_read_file_request()) {
- tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -54,7 +54,7 @@ void TagReaderWorker::MessageArrived(con
-
-
- void TagReaderWorker::DeviceClosed() {
-- AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+ AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
-
- qApp->exit();
- }
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.h
--- a/audio/strawberry/patches/patch-ext_strawberry-tagreader_tagreaderworker.h Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ext_strawberry-tagreader_tagreaderworker.h,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- ext/strawberry-tagreader/tagreaderworker.h.orig 2020-11-29 07:34:39.463138999 +0000
-+++ ext/strawberry-tagreader/tagreaderworker.h
-@@ -28,12 +28,12 @@
-
- class QIODevice;
-
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
- explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
-
- protected:
-- void MessageArrived(const pb::tagreader::Message &message) override;
-+ void MessageArrived(const spb::tagreader::Message &message) override;
- void DeviceClosed() override;
-
- private:
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-src_core_song.cpp
--- a/audio/strawberry/patches/patch-src_core_song.cpp Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_core_song.cpp,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- src/core/song.cpp.orig 2020-12-12 17:21:46.352815979 +0000
-+++ src/core/song.cpp
-@@ -744,7 +744,7 @@ void Song::set_genre_id3(int id) {
- set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
-
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
-
- if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
-
-@@ -791,7 +791,7 @@ void Song::InitFromProtobuf(const pb::ta
-
- }
-
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
-
- const QByteArray url(d->url_.toEncoded());
- const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@ void Song::ToProtobuf(pb::tagreader::Son
- pb->set_filesize(d->filesize_);
- pb->set_suspicious_tags(d->suspicious_tags_);
- pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
-- pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+ pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
-
- }
-
diff -r 277cc3ea4027 -r e94c072f5efd audio/strawberry/patches/patch-src_core_song.h
--- a/audio/strawberry/patches/patch-src_core_song.h Wed Apr 21 10:17:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_core_song.h,v 1.1 2021/02/20 11:02:41 wiz Exp $
-
-Fix build with protobuf 3.15.0.
-Based on https://github.com/strawberrymusicplayer/strawberry/issues/654
-
---- src/core/song.h.orig 2020-12-12 17:21:46.352815979 +0000
-+++ src/core/song.h
-@@ -44,11 +44,11 @@ namespace Engine {
- struct SimpleMetaBundle;
- } // namespace Engine
-
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- } // namespace tagreader
--} // namespace pb
-+} // namespace spb
-
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@ class Song {
- // Constructors
- void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
- void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
-- void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+ void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
Home |
Main Index |
Thread Index |
Old Index