SHA256
1
0
forked from pool/qmmp

Accepting request 506722 from multimedia:apps

- build conditional for mad

- 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.
- Add qmmp-fix-openmpt.patch: fix OpenMPT compatibility.

OBS-URL: https://build.opensuse.org/request/show/506722
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2017-06-30 16:42:15 +00:00 committed by Git OBS Bridge
commit 4bc155f1ed
5 changed files with 76 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17bc88d00ea0753e6fc7273592e894320f05cae807f7cc2c6a5351c73217f010
size 1135090

3
qmmp-1.1.9.tar.bz2 Normal file
View File

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

40
qmmp-fix-openmpt.patch Normal file
View File

@ -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 <QSettings>
#include <math.h>
#include <libmodplug/stdafx.h>
-#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -25,7 +25,6 @@
#include <QStringList>
#include <QRegExp>
#include <libmodplug/stdafx.h>
-#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
#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 <QFile>
#include <stdint.h>
#include <libmodplug/stdafx.h>
-#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
#include <libmodplug/modplug.h>
#include "archivereader.h"
--- a/src/plugins/Input/modplug/settingsdialog.cpp
+++ b/src/plugins/Input/modplug/settingsdialog.cpp
@@ -22,7 +22,6 @@
#include <QDir>
#include <libmodplug/stdafx.h>
-#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
#include "decoder_modplug.h"

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
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
- 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.
- Add qmmp-fix-openmpt.patch: fix OpenMPT compatibility.
-------------------------------------------------------------------
Thu Mar 23 11:55:35 UTC 2017 - sor.alexei@meowr.ru

View File

@ -21,7 +21,7 @@
%bcond_with mad
%bcond_with restricted
Name: qmmp
Version: 1.1.8
Version: 1.1.9
Release: 0
Summary: Qt-based Multimedia Player
License: GPL-2.0+
@ -35,6 +35,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++
@ -144,17 +146,18 @@ Development files for libqmmp.
%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
%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