From d28897a749d13fdf1f765e1e6448a18e0475deccf1b15771ba09ff6656477f1b Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 11 May 2017 11:11:16 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=95 --- qmmp.changes | 6 ++++++ qmmp.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qmmp.changes b/qmmp.changes index cb3e678..83b3754 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 11 09:27:18 UTC 2017 - sor.alexei@meowr.ru + +- Enable building with libmad for newer openSUSE releases even + outside of Packman. + ------------------------------------------------------------------- Thu Mar 23 11:55:35 UTC 2017 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index 07dce66..cadce13 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -18,7 +18,6 @@ %define sover 1 %bcond_with faad -%bcond_with mad %bcond_with restricted Name: qmmp Version: 1.1.8 @@ -82,7 +81,7 @@ Requires: %{name}(%{sover})(Ui) %if %{with faad} BuildRequires: libfaad-devel %endif -%if %{with mad} +%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 || %{with restricted} BuildRequires: pkgconfig(mad) %endif From 00a6c86a2e2a5df145a176103630639f5f1e49aa1494db7a406198d44b830562 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 3 Jun 2017 11:50:28 +0000 Subject: [PATCH 2/4] - Update to version 1.1.9. OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=96 --- qmmp-1.1.8.tar.bz2 | 3 --- qmmp-1.1.9.tar.bz2 | 3 +++ qmmp.changes | 14 +++++++++++++- qmmp.spec | 12 ++++++------ 4 files changed, 22 insertions(+), 10 deletions(-) delete mode 100644 qmmp-1.1.8.tar.bz2 create mode 100644 qmmp-1.1.9.tar.bz2 diff --git a/qmmp-1.1.8.tar.bz2 b/qmmp-1.1.8.tar.bz2 deleted file mode 100644 index 7ace731..0000000 --- a/qmmp-1.1.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17bc88d00ea0753e6fc7273592e894320f05cae807f7cc2c6a5351c73217f010 -size 1135090 diff --git a/qmmp-1.1.9.tar.bz2 b/qmmp-1.1.9.tar.bz2 new file mode 100644 index 0000000..947d170 --- /dev/null +++ b/qmmp-1.1.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e25bfc0fb4182793df81c6ec222d553183ccd3f61e5919d217c9c5d788f3df2e +size 1136753 diff --git a/qmmp.changes b/qmmp.changes index 83b3754..069e438 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,6 +1,18 @@ ------------------------------------------------------------------- -Thu May 11 09:27:18 UTC 2017 - sor.alexei@meowr.ru +Sat Jun 3 11:48:21 UTC 2017 - sor.alexei@meowr.ru +- Update to version 1.1.9: + * Use relative skin path for configuration portability. + * Improve WASAPI support. + * Fix cursors support in the skinned user interface. + * Fix freezing when using DirectSound output. + * Fix an issue with the "jump to track" dialogue when single + click activation is enabled. + * Fix tray icon tooltip. + * Fix FLAC bitrate calculation. + * Fix segmentation fault in the ffmpeg plugin. + * Fix documentation. + * Update French and Russian translations. - Enable building with libmad for newer openSUSE releases even outside of Packman. diff --git a/qmmp.spec b/qmmp.spec index cadce13..d9c53c7 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -20,7 +20,7 @@ %bcond_with faad %bcond_with restricted Name: qmmp -Version: 1.1.8 +Version: 1.1.9 Release: 0 Summary: Qt-based Multimedia Player License: GPL-2.0+ @@ -146,14 +146,14 @@ Development files for libqmmp. %build %cmake \ - -DCMAKE_MODULE_LINKER_FLAGS="" \ + -DCMAKE_MODULE_LINKER_FLAGS="" \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -DLIB_DIR=%{_lib} \ + -DLIB_DIR=%{_lib} \ %if %{without restricted} - -DUSE_MPLAYER=OFF \ + -DUSE_MPLAYER=OFF \ %endif - -DUSE_HAL=OFF \ - -DUSE_OSS=OFF \ + -DUSE_HAL=OFF \ + -DUSE_OSS=OFF \ -DUSE_OSS4=OFF make %{?_smp_mflags} V=1 From 6a8963679123654349866edf0a2210e616e0a56aadd29c8ad4b3e55f8a0067f2 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 3 Jun 2017 16:06:12 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=97 --- qmmp-fix-openmpt.patch | 40 ++++++++++++++++++++++++++++++++++++++++ qmmp.changes | 1 + qmmp.spec | 3 +++ 3 files changed, 44 insertions(+) create mode 100644 qmmp-fix-openmpt.patch diff --git a/qmmp-fix-openmpt.patch b/qmmp-fix-openmpt.patch new file mode 100644 index 0000000..fdb0317 --- /dev/null +++ b/qmmp-fix-openmpt.patch @@ -0,0 +1,40 @@ +--- a/src/plugins/Input/modplug/decoder_modplug.cpp ++++ b/src/plugins/Input/modplug/decoder_modplug.cpp +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp ++++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include "settingsdialog.h" + #include "modplugmetadatamodel.h" +--- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp ++++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp +@@ -21,7 +21,6 @@ + #include + #include + #include +-#include + #include + #include + #include "archivereader.h" +--- a/src/plugins/Input/modplug/settingsdialog.cpp ++++ b/src/plugins/Input/modplug/settingsdialog.cpp +@@ -22,7 +22,6 @@ + #include + + #include +-#include + #include + + #include "decoder_modplug.h" diff --git a/qmmp.changes b/qmmp.changes index 069e438..f01a6cc 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -15,6 +15,7 @@ Sat Jun 3 11:48:21 UTC 2017 - sor.alexei@meowr.ru * Update French and Russian translations. - Enable building with libmad for newer openSUSE releases even outside of Packman. +- Add qmmp-fix-openmpt.patch: fix OpenMPT compatibility. ------------------------------------------------------------------- Thu Mar 23 11:55:35 UTC 2017 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index d9c53c7..2290d34 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -34,6 +34,8 @@ Patch0: %{name}-fix_cdda_version.patch 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 BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -143,6 +145,7 @@ Development files for libqmmp. %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %cmake \ From be1d872430709e39b7abfaf82b6e96f78b6ed4b1e62061a3806e284c7b184a35 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 27 Jun 2017 21:37:00 +0000 Subject: [PATCH 4/4] - build conditional for mad OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=98 --- qmmp.changes | 5 +++++ qmmp.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qmmp.changes b/qmmp.changes index f01a6cc..3f95002 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 27 21:36:34 UTC 2017 - olaf@aepfle.de + +- build conditional for mad + ------------------------------------------------------------------- Sat Jun 3 11:48:21 UTC 2017 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index 2290d34..b043ab5 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -18,6 +18,7 @@ %define sover 1 %bcond_with faad +%bcond_with mad %bcond_with restricted Name: qmmp Version: 1.1.9 @@ -83,7 +84,7 @@ Requires: %{name}(%{sover})(Ui) %if %{with faad} BuildRequires: libfaad-devel %endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 || %{with restricted} +%if %{with mad} BuildRequires: pkgconfig(mad) %endif