From f9621904c2723ba7d15ac47f6f9e0800c0ee9182d23e339c6acf4330ed855c5f Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 26 Jan 2022 00:48:28 +0000 Subject: [PATCH 1/2] - Update to version 2.0.3. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=162 --- baselibs.conf | 2 +- qmmp-1.5.1.tar.bz2 | 3 -- qmmp-2.0.3.tar.bz2 | 3 ++ qmmp-fix-openmpt.patch | 30 +++++++------------ qmmp-fix_cdda_version.patch | 13 --------- qmmp.changes | 26 +++++++++++++++++ qmmp.spec | 58 +++++++++++++++++++++---------------- 7 files changed, 74 insertions(+), 61 deletions(-) delete mode 100644 qmmp-1.5.1.tar.bz2 create mode 100644 qmmp-2.0.3.tar.bz2 delete mode 100644 qmmp-fix_cdda_version.patch diff --git a/baselibs.conf b/baselibs.conf index 948024c..afc9471 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libqmmp1 +libqmmp2 diff --git a/qmmp-1.5.1.tar.bz2 b/qmmp-1.5.1.tar.bz2 deleted file mode 100644 index 8b87eae..0000000 --- a/qmmp-1.5.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3dc676039b5f190e6a87377a6b2bd2bcca122d1659b5f22668c7a284bb91f43 -size 1363593 diff --git a/qmmp-2.0.3.tar.bz2 b/qmmp-2.0.3.tar.bz2 new file mode 100644 index 0000000..6eb2fe9 --- /dev/null +++ b/qmmp-2.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0c22071bedfcc44deb37428faeeecafb095b7a0ce28ade8907adb300453542e +size 1389171 diff --git a/qmmp-fix-openmpt.patch b/qmmp-fix-openmpt.patch index a953f22..59828d0 100644 --- a/qmmp-fix-openmpt.patch +++ b/qmmp-fix-openmpt.patch @@ -1,7 +1,5 @@ -Index: qmmp-1.5.0/src/plugins/Input/modplug/decoder_modplug.cpp -=================================================================== ---- qmmp-1.5.0.orig/src/plugins/Input/modplug/decoder_modplug.cpp -+++ qmmp-1.5.0/src/plugins/Input/modplug/decoder_modplug.cpp +--- a/src/plugins/Input/modplug/decoder_modplug.cpp ++++ b/src/plugins/Input/modplug/decoder_modplug.cpp @@ -29,7 +29,6 @@ #include #include @@ -10,10 +8,8 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/decoder_modplug.cpp #include #include #include -Index: qmmp-1.5.0/src/plugins/Input/modplug/decodermodplugfactory.cpp -=================================================================== ---- qmmp-1.5.0.orig/src/plugins/Input/modplug/decodermodplugfactory.cpp -+++ qmmp-1.5.0/src/plugins/Input/modplug/decodermodplugfactory.cpp +--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp ++++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -23,7 +23,6 @@ #include #include @@ -22,10 +18,8 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/decodermodplugfactory.cpp #include #include "settingsdialog.h" #include "modplugmetadatamodel.h" -Index: qmmp-1.5.0/src/plugins/Input/modplug/modplugmetadatamodel.cpp -=================================================================== ---- qmmp-1.5.0.orig/src/plugins/Input/modplug/modplugmetadatamodel.cpp -+++ qmmp-1.5.0/src/plugins/Input/modplug/modplugmetadatamodel.cpp +--- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp ++++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -21,7 +21,6 @@ #include #include @@ -34,15 +28,13 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/modplugmetadatamodel.cpp #include #include #include "archivereader.h" -Index: qmmp-1.5.0/src/plugins/Input/modplug/settingsdialog.cpp -=================================================================== ---- qmmp-1.5.0.orig/src/plugins/Input/modplug/settingsdialog.cpp -+++ qmmp-1.5.0/src/plugins/Input/modplug/settingsdialog.cpp -@@ -22,7 +22,6 @@ +--- a/src/plugins/Input/modplug/settingsdialog.cpp ++++ b/src/plugins/Input/modplug/settingsdialog.cpp +@@ -21,7 +21,6 @@ + #include #include - #include -#include #include - #include "decoder_modplug.h" + #include "settingsdialog.h" diff --git a/qmmp-fix_cdda_version.patch b/qmmp-fix_cdda_version.patch deleted file mode 100644 index f83b9f2..0000000 --- a/qmmp-fix_cdda_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qmmp-1.4.0/src/plugins/Input/cdaudio/decoder_cdaudio.cpp -=================================================================== ---- qmmp-1.4.0.orig/src/plugins/Input/cdaudio/decoder_cdaudio.cpp -+++ qmmp-1.4.0/src/plugins/Input/cdaudio/decoder_cdaudio.cpp -@@ -25,7 +25,7 @@ - #include - #include - #include --#if LIBCDIO_VERSION_NUM <= 83 -+#if LIBCDIO_VERSION_NUM <= 90 - #include - #else - #include diff --git a/qmmp.changes b/qmmp.changes index 530de1a..cc15ac6 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Jan 23 16:38:24 UTC 2022 - Alexei Sorokin + +- Update to version 2.0.3 (changes since 1.5.1): + * Switch to Qt6. + * Use libiconv for charset conversion. + * Fix default settings in the ffmpeg plugin. + * Fix transition between http tracks. + * Improv qsui plugin: + + fix toolbar renaming; + + fix Wayland support; + + fix tab bar context menu. + * Enable QtMultimedia support under Qt 6.2 or higher. + * Remove private API usage Qt 6.2 or higher. + * Fix transport plugins loading. + * Fix volume bar draw in the double size mode. + * Fix symlinks support. + * Fix some issues in the two-panel file dialogue. + * Remove KDE 4 notifications support + * Disable unsupported plugins: taskbar, qtmultimedia. +- Rebase qmmp-fix-openmpt.patch. +- Drop qmmp-fix_cdda_version.patch: no longer applicable. +- Add requirements for libarchive, libshout, Musepack, WildMIDI + and PipeWire support. +- Switch from libmpg123 to MAD. + ------------------------------------------------------------------- Mon Jul 12 10:28:10 UTC 2021 - Luigi Baldoni diff --git a/qmmp.spec b/qmmp.spec index 9fe1fa7..7f02005 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -1,7 +1,7 @@ # # spec file for package qmmp # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,42 +16,42 @@ # -%define sover 1 -%define mver 1.5 +%define sover 2 +%define mver 2.0 %bcond_with faad %bcond_with restricted Name: qmmp -Version: 1.5.1 +Version: 2.0.3 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0-or-later +Group: Productivity/Multimedia/Sound/Players URL: https://qmmp.ylsoftware.com/ Source: https://qmmp.ylsoftware.com/files/%{name}/%{mver}/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -# PATCH-FIX-UPSTREAM qmmp-fix_cdda_version.patch pascal.bleser@opensuse.org -- Fix header detection for cdparanoia cdda.h. -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 +Patch0: %{name}-default-pulse.patch # PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility. -Patch2: %{name}-fix-openmpt.patch +Patch1: %{name}-fix-openmpt.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libmpcdec-devel -BuildRequires: libqt5-qttools-devel >= 5.4 +BuildRequires: musepack-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) >= 5.4 -BuildRequires: pkgconfig(Qt5DBus) >= 5.4 -BuildRequires: pkgconfig(Qt5Multimedia) >= 5.4 -BuildRequires: pkgconfig(Qt5Network) >= 5.4 -BuildRequires: pkgconfig(Qt5OpenGL) >= 5.4 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4 -BuildRequires: pkgconfig(Qt5Xml) >= 5.4 +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Multimedia) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6OpenGLWidgets) +BuildRequires: cmake(Qt6Sql) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(enca) >= 1.9 +BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -63,18 +63,22 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(libmms) BuildRequires: pkgconfig(libmodplug) -BuildRequires: pkgconfig(libmpg123) -BuildRequires: pkgconfig(libprojectM) >= 3.1.0 +BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(libprojectM) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libsidplayfp) -BuildRequires: pkgconfig(opus) >= 1.0.2 -BuildRequires: pkgconfig(opusfile) >= 0.2 +BuildRequires: pkgconfig(libspa-0.2) +BuildRequires: pkgconfig(mad) +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(opusfile) +BuildRequires: pkgconfig(shout) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(soxr) -BuildRequires: pkgconfig(taglib) >= 1.9 +BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(wavpack) +BuildRequires: pkgconfig(wildmidi) Requires: %{name}(%{sover})(Input) Requires: %{name}(%{sover})(Output) Requires: %{name}(%{sover})(Ui) @@ -88,6 +92,7 @@ This program is an audio-player, written with help of Qt library. %package -n lib%{name}%{sover} Summary: Qmmp library +Group: System/Libraries Recommends: lib%{name}-plugins %description -n lib%{name}%{sover} @@ -97,6 +102,7 @@ This package provides the Qmmp library. %package -n lib%{name}-plugins Summary: Plugins for libqmmp +Group: System/Libraries # Suggests instead of Recommends since MPlayer is too big of a dependency. Suggests: lib%{name}-plugin-mplayer Provides: %{name}(%{sover})(Input) @@ -115,6 +121,7 @@ This package provides plugins for libqmmp. %if %{with restricted} %package -n lib%{name}-plugin-mplayer Summary: MPlayer plugin for libqmmp +Group: System/Libraries Requires: MPlayer %description -n lib%{name}-plugin-mplayer @@ -125,6 +132,7 @@ This package provides MPlayer plugin for libqmmp. %package -n lib%{name}-devel Summary: Development files for libqmmp +Group: Development/Libraries/C and C++ Requires: lib%{name}%{sover} = %{version} %description -n lib%{name}-devel @@ -151,7 +159,7 @@ Development files for libqmmp. %install %cmake_install -# Do not install werdly-sized icons. +# Do not install weirdly-sized icons. rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56 %post -n lib%{name}%{sover} -p /sbin/ldconfig From d97777ec6e7d9f05229f7a3dc1c02cfe29ffc208fae8fb37f72163f61be22ff7 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 26 Jan 2022 12:00:05 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=163 --- baselibs.conf | 1 - qmmp.changes | 1 + qmmp.spec | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index afc9471..0000000 --- a/baselibs.conf +++ /dev/null @@ -1 +0,0 @@ -libqmmp2 diff --git a/qmmp.changes b/qmmp.changes index cc15ac6..d634774 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -23,6 +23,7 @@ Sun Jan 23 16:38:24 UTC 2022 - Alexei Sorokin - Add requirements for libarchive, libshout, Musepack, WildMIDI and PipeWire support. - Switch from libmpg123 to MAD. +- Drop baselibs.conf. ------------------------------------------------------------------- Mon Jul 12 10:28:10 UTC 2021 - Luigi Baldoni diff --git a/qmmp.spec b/qmmp.spec index 7f02005..ec62eba 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -28,7 +28,6 @@ License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Players URL: https://qmmp.ylsoftware.com/ Source: https://qmmp.ylsoftware.com/files/%{name}/%{mver}/%{name}-%{version}.tar.bz2 -Source1: baselibs.conf # PATCH-FEATURE-OPENSUSE qmmp-default_pulse.patch reddwarf@opensuse.org -- Use PulseAudio instead of ALSA by default. Patch0: %{name}-default-pulse.patch # PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility.