61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
|
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_
|
||
|
|
# projectM
|
||
|
|
MESSAGE(STATUS "Found OpenGL implementation: ${Qt5Gui_OPENGL_IMPLEMENTATION}")
|
||
|
|
IF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
|
||
|
|
- pkg_search_module(PROJECTM libprojectM>=2.0.0)
|
||
|
|
+ pkg_search_module(PROJECTM libprojectM-qt5>=2.0.0)
|
||
|
|
ADD_DEFINITIONS(${PROJECTM_CFLAGS})
|
||
|
|
ELSE(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
|
||
|
|
MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
|
||
|
|
ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
|
||
|
|
|
||
|
|
find_file(PROJECTM_CONFIG config.inp
|
||
|
|
- PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
|
||
|
|
+ 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
|
||
|
|
@@ -28,7 +28,7 @@
|
||
|
|
#include <math.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <locale.h>
|
||
|
|
-#include <libprojectM/projectM.hpp>
|
||
|
|
+#include <libprojectM-qt5/projectM.hpp>
|
||
|
|
#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
|
||
|
|
@@ -35,7 +35,7 @@
|
||
|
|
#include "projectmwidget.h"
|
||
|
|
|
||
|
|
#ifndef PROJECTM_CONFIG
|
||
|
|
-#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
|
||
|
|
+#define PROJECTM_CONFIG "/usr/share/projectM-qt5/config.inp"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
|