zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtractor: update to latest git / remove applied patch

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-06-05 18:57:01 +02:00
parent 4c59527af7
commit 9eb4e85df5
2 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
recipes-misc/recipes-multimedia/rncbc/qtractor/0004-Add-include-to-fix-build-with-Qt-5.11.patch
View File

@@ -1,52 +0,0 @@
From a6cf64a6e5ca10f67c85a475345810ee10653830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 3 Jun 2018 21:46:26 +0200
Subject: [PATCH] Add include to fix build with Qt 5.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
While at it use preferred <> instread of "".
Fixes:
| In file included from ../../recipe-sysroot/usr/include/qt5/QtGui/qwindowdefs.h:44:0,
| from ../../recipe-sysroot/usr/include/qt5/QtWidgets/qwidget.h:44,
| from ../../recipe-sysroot/usr/include/qt5/QtWidgets/qframe.h:44,
| from ../../recipe-sysroot/usr/include/qt5/QtWidgets/QFrame:1,
| from qtractorMeter.h:25,
| from qtractorMeter.cpp:23:
| ../../recipe-sysroot/usr/include/qt5/QtCore/qobjectdefs.h: In instantiation of 'struct QtPrivate::HasQ_OBJECT_Macro<QAction>':
| ../../recipe-sysroot/usr/include/qt5/QtCore/qobject.h:502:5: required from 'T qobject_cast(QObject*) [with T = QAction*]'
| qtractorMeter.cpp:431:42: required from here
| ../../recipe-sysroot/usr/include/qt5/QtCore/qobjectdefs.h:622:37: error: incomplete type 'QAction' used in nested name specifier
| enum { Value = sizeof(test(&Object::qt_metacall)) == sizeof(int) };
| ^~~~~~~
| ...
Upstream-Status: Submitted [1]
[1] https://github.com/rncbc/qtractor/pull/157
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/qtractorMidiImportForm.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qtractorMidiImportForm.cpp b/src/qtractorMidiImportForm.cpp
index e04efb51..b22557f8 100644
--- a/src/qtractorMidiImportForm.cpp
+++ b/src/qtractorMidiImportForm.cpp
@@ -28,7 +28,8 @@
#include "qtractorFiles.h"
#include "qtractorCommand.h"
#include "qtractorInstrument.h"
-#include "QPushButton"
+#include <QPushButton>
+#include <QButtonGroup>
//----------------------------------------------------------------------
--
2.14.3

3
recipes-misc/recipes-multimedia/rncbc/qtractor_0.9.1.bb
View File

@@ -24,10 +24,9 @@ SRC_URI = " \
file://0001-do-nor-try-run-for-float-sse-detection.patch \
file://0002-do-nor-try-run-for-suil-libs-detection.patch \
file://0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \
file://0004-Add-include-to-fix-build-with-Qt-5.11.patch \
file://Qtractor.conf \
"
SRCREV = "4b8b5d943892e2d7bc9fa8c9e2108a0638814a2d"
SRCREV = "a6cf64a6e5ca10f67c85a475345810ee10653830"
PV = "0.9.1+git${SRCPV}"
S = "${WORKDIR}/git"