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

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=107

Browse Source
This commit is contained in:
Alexei Sorokin 2017-10-20 22:48:32 +00:00 committed by Git OBS Bridge
parent 90d1b3218a
commit bf5b60292b
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
qmmp-projectM-qt5.patch
View File

@ -1,8 +1,6 @@
Index: qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt
===================================================================
--- qmmp-1.1.9.orig/src/plugins/Visual/projectm/CMakeLists.txt
+++ qmmp-1.1.9/src/plugins/Visual/projectm/CMakeLists.txt
@@ -14,14 +14,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
--- a/src/plugins/Visual/projectm/CMakeLists.txt
+++ b/src/plugins/Visual/projectm/CMakeLists.txt
@@ -9,14 +9,14 @@ link_directories(${CMAKE_CURRENT_BINARY_
# projectM
MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
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/")
IF(PROJECTM_CONFIG)
ADD_DEFINITIONS(-DPROJECTM_CONFIG=\\\"${PROJECTM_CONFIG}\\\")
Index: qmmp-1.1.9/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
SET(libprojectm_DEFINES PROJECTM_CONFIG=\"${PROJECTM_CONFIG}\")
--- a/src/plugins/Visual/projectm/projectmplugin.cpp
+++ b/src/plugins/Visual/projectm/projectmplugin.cpp
@@ -28,7 +28,7 @@
#include <math.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/output.h>
#include "projectmwidget.h"
Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwrapper.h
===================================================================
--- 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
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -35,7 +35,7 @@
#include "projectmwidget.h"
@ -58,3 +39,14 @@ Index: qmmp-1.1.9/src/plugins/Visual/projectm/projectmwidget.cpp
#endif
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
{

1
qmmp.changes
View File

@ -16,6 +16,7 @@ Fri Oct 20 22:29:23 UTC 2017 - sor.alexei@meowr.ru
* 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