Update to version 2.1.8

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=186

qmmp-2.1.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25be3f2b19d8d70b6b5136c3f97d385a5edbf40dac67dd84fcdd4af9d554f795
-size 1371778

qmmp-2.1.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:846a6143c7a9ab29b8ec2f5da2248e41ddf2736f17c15d94b0d73b8af85a69ee
+size 1372377

qmmp-taglib2.patch

@@ -1,123 +0,0 @@
---- a/src/plugins/Input/archive/archivetagreader.cpp
-+++ b/src/plugins/Input/archive/archivetagreader.cpp
-@@ -42,7 +42,11 @@
-         return m_fileName.constData();
- #endif
-     }
-+#if TAGLIB_MAJOR_VERSION >= 2
-+    virtual TagLib::ByteVector readBlock(size_t length) override
-+#else
-     virtual TagLib::ByteVector readBlock(unsigned long length) override
-+#endif
-     {
-         char data[length];
-         qint64 l = m_input->read(data, length);
-@@ -55,10 +59,17 @@
-     }
-     virtual void writeBlock(const TagLib::ByteVector &) override
-     {}
-+#if TAGLIB_MAJOR_VERSION >= 2
-+    virtual void insert(const TagLib::ByteVector &, TagLib::offset_t, size_t) override
-+    {}
-+    virtual void removeBlock(TagLib::offset_t, size_t) override
-+    {}
-+#else
-     virtual void insert(const TagLib::ByteVector &, unsigned long, unsigned long) override
-     {}
-     virtual void removeBlock(unsigned long, unsigned long) override
-     {}
-+#endif
-     virtual bool readOnly() const override
-     {
-         return true;
-
---- a/src/plugins/Input/flac/decoder_flac.cpp
-+++ b/src/plugins/Input/flac/decoder_flac.cpp
-@@ -295,7 +295,11 @@
-             p.remove("flac://");
-             p.remove(QRegularExpression("#\\d+$"));
-             TagLib::FileStream stream(QStringToFileName(p), true);
-+#if TAGLIB_MAJOR_VERSION >= 2
-+            TagLib::FLAC::File fileRef(&stream);
-+#else
-             TagLib::FLAC::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
-+#endif
-             //looking for cuesheet comment
-             TagLib::Ogg::XiphComment *tag = fileRef.xiphComment();
-             TagLib::FLAC::Properties *ap = fileRef.audioProperties();
-
---- a/src/plugins/Input/flac/decoderflacfactory.cpp
-+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
-@@ -97,7 +97,11 @@
- 
-     if(filePath.endsWith(".flac", Qt::CaseInsensitive))
-     {
-+#if TAGLIB_MAJOR_VERSION >= 2
-+        flacFile = new TagLib::FLAC::File(&stream);
-+#else
-         flacFile = new TagLib::FLAC::File(&stream, TagLib::ID3v2::FrameFactory::instance());
-+#endif
-         tag = flacFile->xiphComment();
-         ap = flacFile->audioProperties();
-     }
-
-
---- a/src/plugins/Input/flac/flacmetadatamodel.cpp
-+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
-@@ -41,7 +41,11 @@
-     if(m_path.endsWith(".flac", Qt::CaseInsensitive))
-     {
-         m_stream = new TagLib::FileStream(QStringToFileName(m_path), readOnly);
-+#if TAGLIB_MAJOR_VERSION >= 2
-+        TagLib::FLAC::File *f = new TagLib::FLAC::File(m_stream);
-+#else
-         TagLib::FLAC::File *f = new TagLib::FLAC::File(m_stream, TagLib::ID3v2::FrameFactory::instance());
-+#endif
-         m_tag = f->xiphComment();
-         m_file = f;
-         setDialogHints(dialogHints() | MetaDataModel::IsCueEditable);
-
-
---- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
-+++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
-@@ -220,7 +220,11 @@
-         return QList<TrackInfo*>() << info;
- 
-     TagLib::FileStream stream(QStringToFileName(path), true);
-+#if TAGLIB_MAJOR_VERSION >= 2
-+    TagLib::MPEG::File fileRef(&stream);
-+#else
-     TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
-+#endif
- 
-     if (parts & TrackInfo::MetaData)
-     {
-@@ -348,6 +352,11 @@
-             break;
-         case TagLib::MPEG::Header::Version2_5:
-             info->setValue(Qmmp::FORMAT_NAME, QString("MPEG-2.5 layer %1").arg(fileRef.audioProperties()->layer()));
-+            break;
-+#if TAGLIB_MAJOR_VERSION >= 2
-+        case TagLib::MPEG::Header::Version4:
-+            info->setValue(Qmmp::FORMAT_NAME, QString("MPEG-4 layer %1").arg(fileRef.audioProperties()->layer()));
-+#endif
-         }
-         info->setDuration(fileRef.audioProperties()->lengthInMilliseconds());
-     }
-
-
-
---- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
-+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
-@@ -41,7 +41,11 @@
-     MetaDataModel(readOnly, MetaDataModel::IsCoverEditable)
- {
-     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
-+#if TAGLIB_MAJOR_VERSION >= 2
-+    m_file = new TagLib::MPEG::File(m_stream);
-+#else
-     m_file = new TagLib::MPEG::File(m_stream, TagLib::ID3v2::FrameFactory::instance());
-+#endif
-     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v1);
-     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v2);
-     m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::APE);

qmmp.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Sun Jun 30 00:53:51 UTC 2024 - jun wang <jgwang@suse.com>
+
+- Update to version 2.1.8 
+  + changes from version 2.1.8
+    * improved CUE parser
+    * fixed pkg-config files generated by qmake
+    * fixed memory leak
+    * fixed issue with missing mount points in the qmmp file
+      dialog
+    * fixed unexpected startup of the disabled plugin when trying
+      to change
+      it's settings
+    * fixed linking with xcb
+    * fixed crash when trying to remove queued track
+    * fixed copying of the selected tracks to the new playlist
+    * fixed Wayland compatibility on first startup
+  + changes from version 2.1.7
+    * using XWayland for skinned user interface
+    * using floating point output in the sndfile plugin
+    * fixed file type determination by content in the sndfile
+      plugin
+    * fixed memory leak in the hotkey plugin
+    * fixed stream sample rate in the pipewire plugin
+    * fixed issue with KDE6 file dialog
+  + changes from version 2.1.6
+    * added TagLib 2.0 support
+    * fixed settings form in the simple user interface
+    * improved lyrics plugin:
+      - fixed issue with URL formatting
+      - updated lyrics providers
+      - using UTF-8 for all lyrics providers
+    * updated Spanish translation
+  + remove patch qmmp-taglib2.patch because it applied in
+    source code
+
 -------------------------------------------------------------------
 Fri Mar  8 08:43:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

qmmp.spec

@@ -22,7 +22,7 @@
 %bcond_with faad
 %bcond_with restricted
 Name:           qmmp
-Version:        2.1.5
+Version:        2.1.8
 Release:        0
 Summary:        Qt-based Multimedia Player
 License:        GPL-2.0-or-later
@@ -31,8 +31,6 @@ URL:            https://qmmp.ylsoftware.com/
 Source:         https://qmmp.ylsoftware.com/files/%{name}/%{mver}/%{name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default.
 Patch0:         %{name}-default-pulse.patch
-# PATCH-FIX-UPSTREAM qmmp-taglib2.patch -- Fix build with taglib 2.0 (https://sourceforge.net/p/qmmp-dev/code/11255/)
-Patch1:         qmmp-taglib2.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme