carla: Build carla application properly - not plugins only
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -11,6 +11,7 @@ SRC_URI = " \
|
||||
file://0001-Use-fluid-instead-of-ntk-fluid.patch \
|
||||
file://0002-do-not-try-to-cross-run-carla-lv2-export.patch \
|
||||
file://0003-Don-t-disable-EXPERIMENTAL_PLUGINS.patch \
|
||||
file://0004-do-not-autodetect-pyqt-it-won-t-work-in-oe.patch \
|
||||
"
|
||||
SRCREV = "4a1e17888fc9abb0a4ea4a83d8f7020a5eabda1c"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -18,7 +19,7 @@ PV = "1.9.7b+git${SRCPV}"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check
|
||||
inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check mime gtk-icon-cache
|
||||
|
||||
# Notes on fltk-native / ntk
|
||||
# Ntk is a fork of fltk using cairo. Ntk cannot be build native easily without
|
||||
@@ -26,6 +27,7 @@ inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check
|
||||
|
||||
DEPENDS += " \
|
||||
fltk-native \
|
||||
python3-pyqt5-native \
|
||||
ntk \
|
||||
gtk+ \
|
||||
gtk+3 \
|
||||
@@ -47,6 +49,9 @@ EXTRA_OEMAKE += " \
|
||||
PREFIX=${prefix} \
|
||||
NOOPT=true \
|
||||
EXPERIMENTAL_PLUGINS=true \
|
||||
HAVE_PYQT=true \
|
||||
HAVE_PYQT4=false \
|
||||
HAVE_PYQT5=true \
|
||||
"
|
||||
|
||||
LDFLAGS += "-lpng"
|
||||
@@ -57,9 +62,13 @@ do_compile_append() {
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/mime \
|
||||
${libdir}/python3 \
|
||||
${libdir}/lv2 \
|
||||
${libdir}/vst \
|
||||
"
|
||||
|
||||
INSANE_SKIP_${PN} = "dev-so already-stripped"
|
||||
|
||||
RDEPENDS_${PN} += "python3-pyqt5 bash"
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 875457d88e933109393fc24b41338d7f301d771d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 3 Aug 2017 12:16:16 +0200
|
||||
Subject: [PATCH] do not autodetect pyqt - it won't work in oe
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [oe-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
source/Makefile.mk | 20 --------------------
|
||||
1 file changed, 20 deletions(-)
|
||||
|
||||
diff --git a/source/Makefile.mk b/source/Makefile.mk
|
||||
index 5db2b76..1190f25 100644
|
||||
--- a/source/Makefile.mk
|
||||
+++ b/source/Makefile.mk
|
||||
@@ -256,26 +256,6 @@ HAVE_QT=true
|
||||
endif
|
||||
|
||||
# --------------------------------------------------------------
|
||||
-# Set PyQt tools
|
||||
-
|
||||
-PYUIC4 ?= /usr/bin/pyuic4
|
||||
-PYUIC5 ?= /usr/bin/pyuic5
|
||||
-
|
||||
-ifneq (,$(wildcard $(PYUIC4)))
|
||||
-HAVE_PYQT=true
|
||||
-HAVE_PYQT4=true
|
||||
-else
|
||||
-HAVE_PYQT4=false
|
||||
-endif
|
||||
-
|
||||
-ifneq (,$(wildcard $(PYUIC5)))
|
||||
-HAVE_PYQT=true
|
||||
-HAVE_PYQT5=true
|
||||
-else
|
||||
-HAVE_PYQT5=false
|
||||
-endif
|
||||
-
|
||||
-# --------------------------------------------------------------
|
||||
# Set default Qt used in frontend
|
||||
|
||||
ifeq ($(HAVE_PYQT4),true)
|
||||
--
|
||||
2.9.4
|
||||
|
||||
Reference in New Issue
Block a user