diff --git a/qmmp-projectM-qt5.patch b/qmmp-projectM-qt5.patch new file mode 100644 index 0000000..8222f47 --- /dev/null +++ b/qmmp-projectM-qt5.patch @@ -0,0 +1,60 @@ +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 + #include + #include +-#include ++#include + #include + #include + #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 +-#include ++#include + + 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) diff --git a/qmmp.changes b/qmmp.changes index 8edcba6..34b3c93 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 10 12:30:56 UTC 2017 - aloisio@gmx.com + +- Added qmmp-projectM-qt5.patch to use projectM-qt5 + ------------------------------------------------------------------- Fri Aug 4 22:28:24 UTC 2017 - sor.alexei@meowr.ru diff --git a/qmmp.spec b/qmmp.spec index 9ace208..91496f5 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -37,6 +37,8 @@ Patch1: %{name}-default-pulse.patch Patch2: %{name}-taglib-1.9.patch # PATCH-FIX-OPENSUSE qmmp-fix-openmpt.patch -- Fix OpenMPT compatibility. Patch3: %{name}-fix-openmpt.patch +# PATCH-FIX-OPENSUSE qmmp-projectM-qt5.patch -- links to projectM-qt5 +Patch4: %{name}-projectM-qt5.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -67,7 +69,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(libmms) BuildRequires: pkgconfig(libmodplug) -BuildRequires: pkgconfig(libprojectM) +BuildRequires: pkgconfig(libprojectM-qt5) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(libsidplayfp) @@ -147,6 +149,7 @@ Development files for libqmmp. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %cmake \