Hello community, here is the log from the commit of package qmmp for openSUSE:Factory checked in at 2017-08-13 14:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp (Old) and /work/SRC/openSUSE:Factory/.qmmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp" Sun Aug 13 14:58:33 2017 rev:53 rq:515897 version:1.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp/qmmp.changes 2017-08-06 11:34:30.489886146 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp.new/qmmp.changes 2017-08-13 14:58:37.449555309 +0200 @@ -1,0 +2,5 @@ +Thu Aug 10 12:30:56 UTC 2017 - [email protected] + +- Added qmmp-projectM-qt5.patch to use projectM-qt5 + +------------------------------------------------------------------- New: ---- qmmp-projectM-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp.spec ++++++ --- /var/tmp/diff_new_pack.wjaDGN/_old 2017-08-13 14:58:39.169313959 +0200 +++ /var/tmp/diff_new_pack.wjaDGN/_new 2017-08-13 14:58:39.201309469 +0200 @@ -37,6 +37,8 @@ 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(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 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %cmake \ ++++++ qmmp-projectM-qt5.patch ++++++ 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)
