Accepting request 535609 from multimedia:apps
OBS-URL: https://build.opensuse.org/request/show/535609 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qmmp?expand=0&rev=55
This commit is contained in:
commit
12d40c89c5
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a
|
|
||||||
size 1142444
|
|
3
qmmp-1.1.11.tar.bz2
Normal file
3
qmmp-1.1.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b351a8cf2e82db79a6a29b887e60e1e3e3a1d93654dca48fc3f508d5ec874cc8
|
||||||
|
size 1147455
|
@ -1,8 +1,6 @@
|
|||||||
Index: qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt
|
--- a/src/plugins/Visual/projectm/CMakeLists.txt
|
||||||
===================================================================
|
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
|
||||||
--- qmmp-1.1.9.orig/src/plugins/Visual/projectm/CMakeLists.txt
|
@@ -9,14 +9,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
|
||||||
+++ qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt
|
|
||||||
@@ -14,14 +14,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
|
|
||||||
# projectM
|
# projectM
|
||||||
MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
|
MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
|
||||||
IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
|
IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
|
||||||
@ -18,11 +16,9 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt
|
|||||||
+ PATHS "/usr/share/projectM-qt5/" "/usr/local/share/projectM/")
|
+ PATHS "/usr/share/projectM-qt5/" "/usr/local/share/projectM/")
|
||||||
|
|
||||||
IF(PROJECTM_CONFIG)
|
IF(PROJECTM_CONFIG)
|
||||||
ADD_DEFINITIONS(-DPROJECTM_CONFIG=\\\"${PROJECTM_CONFIG}\\\")
|
SET(libprojectm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\")
|
||||||
Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp
|
--- a/src/plugins/Visual/projectm/projectmplugin.cpp
|
||||||
===================================================================
|
+++ b/src/plugins/Visual/projectm/projectmplugin.cpp
|
||||||
--- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmplugin.cpp
|
|
||||||
+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp
|
|
||||||
@@ -28,7 +28,7 @@
|
@@ -28,7 +28,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@ -32,23 +28,8 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmplugin.cpp
|
|||||||
#include <qmmp/buffer.h>
|
#include <qmmp/buffer.h>
|
||||||
#include <qmmp/output.h>
|
#include <qmmp/output.h>
|
||||||
#include "projectmwidget.h"
|
#include "projectmwidget.h"
|
||||||
Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwrapper.h
|
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
|
||||||
===================================================================
|
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
|
||||||
--- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmwrapper.h
|
|
||||||
+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmwrapper.h
|
|
||||||
@@ -22,7 +22,7 @@
|
|
||||||
#define PROJECTMWRAPPER_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
-#include <libprojectM/projectM.hpp>
|
|
||||||
+#include <libprojectM-qt5/projectM.hpp>
|
|
||||||
|
|
||||||
class ProjectMWrapper : public QObject, public projectM
|
|
||||||
{
|
|
||||||
Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qmmp-1.1.9.orig/src/plugins/Visual/projectm/projectmwidget.cpp
|
|
||||||
+++ qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp
|
|
||||||
@@ -35,7 +35,7 @@
|
@@ -35,7 +35,7 @@
|
||||||
#include "projectmwidget.h"
|
#include "projectmwidget.h"
|
||||||
|
|
||||||
@ -58,3 +39,14 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
|
ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
|
||||||
|
--- a/src/plugins/Visual/projectm/projectmwrapper.h
|
||||||
|
+++ b/src/plugins/Visual/projectm/projectmwrapper.h
|
||||||
|
@@ -22,7 +22,7 @@
|
||||||
|
#define PROJECTMWRAPPER_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
-#include <libprojectM/projectM.hpp>
|
||||||
|
+#include <libprojectM-qt5/projectM.hpp>
|
||||||
|
|
||||||
|
class ProjectMWrapper : public QObject, public projectM
|
||||||
|
{
|
||||||
|
20
qmmp.changes
20
qmmp.changes
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 20 22:29:23 UTC 2017 - sor.alexei@meowr.ru
|
||||||
|
|
||||||
|
- Update to version 1.1.11:
|
||||||
|
* Add AAC mime types to the qmmp.desktop.
|
||||||
|
* Add album artist support in the cue parsers.
|
||||||
|
* Using game name as album tag in the gme plugin.
|
||||||
|
* Fix seeking in the mpris plugin.
|
||||||
|
* Fix an issue with untracked property in the mpris plugin.
|
||||||
|
* Fix a possible segmentation fault.
|
||||||
|
* Fix cmake warnings.
|
||||||
|
* Fix cmake 3.10 support.
|
||||||
|
* Fix file size calculation in the ffmpeg plugin.
|
||||||
|
* Fix a possible segmentation fault in the ffmpeg plugin.
|
||||||
|
* Fix saving of the equaliser "auto" mode option.
|
||||||
|
* Fix control socket permissions.
|
||||||
|
* Fix rusxmms support.
|
||||||
|
* Update Spanish, Portuguese, Greek translations.
|
||||||
|
- Rebase qmmp-projectM-qt5.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 25 06:10:58 UTC 2017 - olaf@aepfle.de
|
Fri Aug 25 06:10:58 UTC 2017 - olaf@aepfle.de
|
||||||
|
|
||||||
|
16
qmmp.spec
16
qmmp.spec
@ -20,7 +20,7 @@
|
|||||||
%bcond_with faad
|
%bcond_with faad
|
||||||
%bcond_with restricted
|
%bcond_with restricted
|
||||||
Name: qmmp
|
Name: qmmp
|
||||||
Version: 1.1.10
|
Version: 1.1.11
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt-based Multimedia Player
|
Summary: Qt-based Multimedia Player
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
@ -39,7 +39,6 @@ Patch3: %{name}-fix-openmpt.patch
|
|||||||
# PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5
|
# PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5
|
||||||
Patch4: %{name}-projectM-qt5.patch
|
Patch4: %{name}-projectM-qt5.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: desktop-file-utils
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: hicolor-icon-theme
|
BuildRequires: hicolor-icon-theme
|
||||||
BuildRequires: libmpcdec-devel
|
BuildRequires: libmpcdec-devel
|
||||||
@ -83,6 +82,9 @@ BuildRequires: pkgconfig(wavpack)
|
|||||||
Requires: %{name}(%{sover})(Input)
|
Requires: %{name}(%{sover})(Input)
|
||||||
Requires: %{name}(%{sover})(Output)
|
Requires: %{name}(%{sover})(Output)
|
||||||
Requires: %{name}(%{sover})(Ui)
|
Requires: %{name}(%{sover})(Ui)
|
||||||
|
%if 0%{?suse_version} <= 1320
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
%endif
|
||||||
%if %{with faad}
|
%if %{with faad}
|
||||||
BuildRequires: libfaad-devel
|
BuildRequires: libfaad-devel
|
||||||
%endif
|
%endif
|
||||||
@ -164,6 +166,11 @@ make %{?_smp_mflags} V=1
|
|||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
|
||||||
|
%post -n lib%{name}%{sover} -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun -n lib%{name}%{sover} -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%if 0%{?suse_version} <= 1320
|
||||||
%post
|
%post
|
||||||
%desktop_database_post
|
%desktop_database_post
|
||||||
%icon_theme_cache_post
|
%icon_theme_cache_post
|
||||||
@ -172,15 +179,12 @@ make %{?_smp_mflags} V=1
|
|||||||
%desktop_database_postun
|
%desktop_database_postun
|
||||||
%icon_theme_cache_postun
|
%icon_theme_cache_postun
|
||||||
|
|
||||||
%post -n lib%{name}%{sover} -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -n lib%{name}%{sover} -p /sbin/ldconfig
|
|
||||||
|
|
||||||
%post -n lib%{name}-plugins
|
%post -n lib%{name}-plugins
|
||||||
%desktop_database_post
|
%desktop_database_post
|
||||||
|
|
||||||
%postun -n lib%{name}-plugins
|
%postun -n lib%{name}-plugins
|
||||||
%desktop_database_postun
|
%desktop_database_postun
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS ChangeLog COPYING README
|
%doc AUTHORS ChangeLog COPYING README
|
||||||
|
Loading…
Reference in New Issue
Block a user