Accepting request 545760 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/545760
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=57

qmmp-1.1.12.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4601898490167560e189a736ae619f6161cefd12a46252a9f151ec1bf7aac6da
-size 1147871

qmmp-1.2.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e
+size 1182024

qmmp-taglib-1.9.patch

@@ -1,149 +0,0 @@
---- a/src/plugins/CMakeLists.txt
-+++ b/src/plugins/CMakeLists.txt
-@@ -2,7 +2,7 @@ SET(USE_ENCA TRUE CACHE BOOL "enable/dis
- include(FindPkgConfig)
- set(CMAKE_CXX_VISIBILITY_PRESET hidden)
- pkg_search_module(ENCA enca>=1.9)
--pkg_search_module(TAGLIB taglib>=1.10)
-+pkg_search_module(TAGLIB taglib>=1.9)
- add_subdirectory(Input)
- add_subdirectory(Output)
- add_subdirectory(Visual)
---- a/src/plugins/General/converter/converter.cpp
-+++ b/src/plugins/General/converter/converter.cpp
-@@ -33,6 +33,11 @@
- #include <taglib/mpegfile.h>
- #include "converter.h"
- 
-+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-+#undef QStringToTString
-+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-+#endif
-+
- Converter::Converter(QObject *parent) : QObject(parent), QRunnable()
- {
-     m_user_stop = false;
---- a/src/plugins/General/rgscan/rgscandialog.cpp
-+++ b/src/plugins/General/rgscan/rgscandialog.cpp
-@@ -42,6 +42,11 @@
- 
- #define FILE_SKIPPED (Qt::UserRole + 1)
- 
-+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-+#undef QStringToTString
-+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-+#endif
-+
- struct ReplayGainInfoItem
- {
-     QMap<Qmmp::ReplayGainKey, double> info;
-@@ -75,8 +80,12 @@ RGScanDialog::RGScanDialog(QList <PlayLi
-                 ext == "flac" || //native flac
-                 ext == "oga" || //ogg flac
-                 ext == "ogg" ||  //ogg vorbis
-+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-                 ext == "wv" || //wavpack
-                 ext == "m4a") //aac (mp4 container)
-+#else
-+                ext == "wv") //wavpack
-+#endif
-         {
-             paths.append(track->url());
-             QString name = formatter.format(track);
-@@ -368,6 +377,7 @@ void RGScanDialog::writeVorbisComment(Ta
-     }
- }
- 
-+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
- void RGScanDialog::writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item)
- {
-     if(m_ui.trackCheckBox->isChecked())
-@@ -385,6 +395,7 @@ void RGScanDialog::writeMP4Tag(TagLib::M
-                      gainToStringList(item->info[Qmmp::REPLAYGAIN_ALBUM_PEAK]));
-     }
- }
-+#endif
- 
- void RGScanDialog::on_writeButton_clicked()
- {
-@@ -428,11 +439,13 @@ void RGScanDialog::on_writeButton_clicke
-             writeAPETag(file.APETag(true), item);
-             file.save();
-         }
-+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-         else if(ext == "m4a") //MPEG-4 Part 14
-         {
-             TagLib::MP4::File file(qPrintable(item->url));
-             writeMP4Tag(file.tag(), item);
-             file.save();
-         }
-+#endif
-     }
- }
---- a/src/plugins/General/rgscan/rgscandialog.h
-+++ b/src/plugins/General/rgscan/rgscandialog.h
-@@ -48,10 +48,12 @@ namespace TagLib
-     {
-         class XiphComment;
-     }
-+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-     namespace MP4
-     {
-         class Tag;
-     }
-+#endif
- }
- 
- /**
-@@ -81,7 +83,9 @@ private:
-     void writeAPETag(TagLib::APE::Tag *tag, ReplayGainInfoItem *item);
-     void writeID3v2Tag(TagLib::ID3v2::Tag *tag, ReplayGainInfoItem *item);
-     void writeVorbisComment(TagLib::Ogg::XiphComment *tag, ReplayGainInfoItem *item);
-+#if !((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-     void writeMP4Tag(TagLib::MP4::Tag *tag, ReplayGainInfoItem *item);
-+#endif
-     Ui::RGScanDialog m_ui;
-     QList<RGScanner *> m_scanners;
-     QList<ReplayGainInfoItem*> m_replayGainItemList;
---- a/src/plugins/Input/flac/flacmetadatamodel.cpp
-+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
-@@ -26,6 +26,11 @@
- #include <qmmp/metadatamanager.h>
- #include "flacmetadatamodel.h"
- 
-+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-+#undef QStringToTString
-+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-+#endif
-+
- FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
- {
-     m_file = 0;
---- a/src/plugins/Input/opus/opusmetadatamodel.cpp
-+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
-@@ -26,6 +26,11 @@
- #include <taglib/tmap.h>
- #include "opusmetadatamodel.h"
- 
-+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-+#undef QStringToTString
-+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-+#endif
-+
- OpusMetaDataModel::OpusMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
- {
-     m_path = path;
---- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
-+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
-@@ -26,6 +26,11 @@
- #include <taglib/tmap.h>
- #include "vorbismetadatamodel.h"
- 
-+#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 9))
-+#undef QStringToTString
-+#define QStringToTString(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
-+#endif
-+
- VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
- {
-     m_path = path;

qmmp.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Sun Nov 26 12:10:33 UTC 2017 - sor.alexei@meowr.ru
+
+- Update to version 1.2.0:
+  * Add an archive reader plugin (requires TagLib 1.11 or higher).
+  * Add a file writer plugin.
+  * Add an icecast output plugin.
+  * Add a feature to disable notifications when another application 
+    is in the full screen mode.
+  * Add a cover tab to the track details dialogue.
+  * Add a "--volume-status" command-line option.
+  * Add a "--mute-status" command-line option.
+  * Add a feature to change user interface from the command line.
+  * Add the parent directory name to the title formatting fields.
+  * Add cache to the lyrics plugin.
+  * Add a feature to clear the window title when playback is
+    finished.
+  * Add a "Raise" method implementation to the mpris plugin.
+  * Add a mount point list to the file dialogue.
+  * Improve plugin API.
+  * Improve cover cache.
+  * Improve visualisation support.
+  * Improve the aac plugin.
+  * Improve audio format determination in the ffmpeg plugin.
+  * Improve m3u, pls and xspf support.
+  * Improve DirectSound and WASAPI support.
+  * Improve the sndfile plugin.
+  * Improve the mpeg plugin:
+    - add lame header support;
+    - add gapless support;
+    - improve file type determination.
+  * Improve the qsui plugin:
+    - add quick search to the file system browser;
+    - add quick search to the playlist;
+    - add a feature to change toolbar icon size;
+    - add record button;
+    - add cover image alignment;
+    - reduce memory usage;
+    - improve settings.
+  * Fix memory leaks
+  * Add a Finnish translation.
+  * Update Brazilian Portuguese, Czech translation,
+    Chinese Simplified, French, Galician, German, Greek,
+    Indonesian, Polish, Portuguese, Russian, Spanish, Japanese,
+    Ukrainian translations.
+- Drop qmmp-taglib-1.9.patch.
+
 -------------------------------------------------------------------
 Sun Oct 22 22:20:34 UTC 2017 - sor.alexei@meowr.ru
 

qmmp.spec

@@ -20,7 +20,7 @@
 %bcond_with faad
 %bcond_with restricted
 Name:           qmmp
-Version:        1.1.12
+Version:        1.2.0
 Release:        0
 Summary:        Qt-based Multimedia Player
 License:        GPL-2.0+
@@ -32,12 +32,10 @@ Source1:        baselibs.conf
 Patch0:         %{name}-fix_cdda_version.patch
 # PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default.
 Patch1:         %{name}-default-pulse.patch
-# PATCH-FIX-OPENSUSE qmmp-taglib-1.9.patch -- Extend TagLib support to 1.9.
-Patch2:         %{name}-taglib-1.9.patch
 # PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility.
-Patch3:         %{name}-fix-openmpt.patch
+Patch2:         %{name}-fix-openmpt.patch
 # PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5
-Patch4:         %{name}-projectM-qt5.patch
+Patch3:         %{name}-projectM-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
@@ -148,7 +146,6 @@ Development files for libqmmp.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %cmake \