From a71f8b9d5c5a2638fd88b693abf241f86b9247aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 14 Apr 2018 20:08:03 +0200 Subject: [PATCH] qmmp: Find projectM configuration file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...projectM-configuration-file-location.patch | 34 +++++++++++++++++++ .../recipes-multimedia/qmmp/qmmp_1.2.0.bb | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch diff --git a/recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch b/recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch new file mode 100644 index 00000000..860859df --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch @@ -0,0 +1,34 @@ +From d0591ebca09921ed7bfd67f224015ced4bc7a9f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 14 Apr 2018 19:12:49 +0200 +Subject: [PATCH] Hardcode projectM configuration file location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A bit of a hack but other attempts failed + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Andreas Müller +--- + src/plugins/Visual/projectm/projectmwidget.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp +index 7f7fcc4..12d2595 100644 +--- a/src/plugins/Visual/projectm/projectmwidget.cpp ++++ b/src/plugins/Visual/projectm/projectmwidget.cpp +@@ -33,9 +33,7 @@ + #include "projectmwrapper.h" + #include "projectmwidget.h" + +-#ifndef PROJECTM_CONFIG + #define PROJECTM_CONFIG "/usr/share/projectM/config.inp" +-#endif + + ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent) + : QOpenGLWidget(parent) +-- +2.14.3 + diff --git a/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.0.bb b/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.0.bb index 4dff17aa..3591fd1e 100644 --- a/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.0.bb +++ b/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.0.bb @@ -2,6 +2,9 @@ SUMMARY = "Qt5 based audio-player" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +# Note: to support projectm, qtbase must be configured with desktop gl / gles +# won't work + DEPENDS += " \ qttools-native \ qtbase \ @@ -27,6 +30,7 @@ DEPENDS += " \ SRC_URI = " \ http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \ file://0001-Remove-freebsd-compilation-support.patch \ + file://0002-Hardcode-projectM-configuration-file-location.patch \ " SRC_URI[md5sum] = "cc3468fe610412e2db5113d8ce0a379e" SRC_URI[sha256sum] = "8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e"