pool/qmmp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 949254 from multimedia:apps

Browse Source 
- Update to version 2.0.3.

OBS-URL: https://build.opensuse.org/request/show/949254
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger 2022-01-26 20:26:58 +00:00 committed by Git OBS Bridge
commit ad5b29d265
7 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf
View File

@ -1 +0,0 @@
libqmmp1

3
qmmp-1.5.1.tar.bz2
View File

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

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

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

30
qmmp-fix-openmpt.patch
View File

@ -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 <QSettings>
#include <math.h>
@ -10,10 +8,8 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/decoder_modplug.cpp
#include <libmodplug/sndfile.h>
#include <qmmp/buffer.h>
#include <qmmp/output.h>
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 <QMessageBox>
#include <QStringList>
@ -22,10 +18,8 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/decodermodplugfactory.cpp
#include <libmodplug/sndfile.h>
#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 <QFile>
#include <stdint.h>
@ -34,15 +28,13 @@ Index: qmmp-1.5.0/src/plugins/Input/modplug/modplugmetadatamodel.cpp
#include <libmodplug/sndfile.h>
#include <libmodplug/modplug.h>
#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 <QSettings>
#include <QDir>
#include <libmodplug/stdafx.h>
-#include <libmodplug/it_defs.h>
#include <libmodplug/sndfile.h>
#include "decoder_modplug.h"
#include "settingsdialog.h"

13
qmmp-fix_cdda_version.patch
View File

@ -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 <QFileInfo>
#include <QDir>
#include <cdio/cdio.h>
-#if LIBCDIO_VERSION_NUM <= 83
+#if LIBCDIO_VERSION_NUM <= 90
#include <cdio/cdda.h>
#else
#include <cdio/paranoia/cdda.h>

27
qmmp.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Sun Jan 23 16:38:24 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
- 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.
- Drop baselibs.conf.
-------------------------------------------------------------------
Mon Jul 12 10:28:10 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>

59
qmmp.spec
View File

@ -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,41 @@
#
%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 +62,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 +91,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 +101,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 +120,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 +131,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 +158,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