From 9425fc084c8b13ef3b6dc1124ff98e0cebfcb682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 20 Sep 2018 23:05:36 +0200
Subject: [PATCH] carla: enhancements and cleanups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hey Filipe: Among many other impressing roles you are a Makefile wizard!

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-to-find-Qt5-host-bins-it-won-t-work.patch | 30 +++++++++++++++++++
 .../recipes-multimedia/carla/carla_git.bb     | 14 +++++----
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch

diff --git a/recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch b/recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch
new file mode 100644
index 00000000..81a45c12
--- /dev/null
+++ b/recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch
@@ -0,0 +1,30 @@
+From 079d1a1b34394b76d23ce7d92254cb785333d3e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 20 Sep 2018 22:44:48 +0200
+Subject: [PATCH] Do not try to find Qt5 host bins - it won't work
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ source/Makefile.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/source/Makefile.mk b/source/Makefile.mk
+index 688dca20..07afc7a2 100644
+--- a/source/Makefile.mk
++++ b/source/Makefile.mk
+@@ -253,7 +253,6 @@ endif
+ endif
+ 
+ ifeq ($(HAVE_QT5),true)
+-QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
+ MOC_QT5 ?= $(QT5_HOSTBINS)/moc
+ RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
+ UIC_QT5 ?= $(QT5_HOSTBINS)/uic
+-- 
+2.14.4
+
diff --git a/recipes-misc/recipes-multimedia/carla/carla_git.bb b/recipes-misc/recipes-multimedia/carla/carla_git.bb
index 9e00cb49..88130c94 100644
--- a/recipes-misc/recipes-multimedia/carla/carla_git.bb
+++ b/recipes-misc/recipes-multimedia/carla/carla_git.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
 SRC_URI = " \
     git://github.com/falkTX/Carla.git \
     file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \
+    file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \
 "
 SRCREV = "430740a896d8f7546e02b524302e2cfda4509ff9"
 S = "${WORKDIR}/git"
@@ -20,13 +21,12 @@ inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check
 
 DEPENDS += " \
     python3-pyqt5-native \
-    freetype \
-    libpng \
+    qtbase-native \
+    qtbase \
     gtk+ \
     gtk+3 \
     liblo \
     pulseaudio \
-    file \
     fluidsynth \
     libsndfile1 \
 "
@@ -41,8 +41,11 @@ EXTRA_OEMAKE += " \
     SKIP_STRIPPING=true \
 "
 
-# required???
-LDFLAGS += "-lpng"
+export QT5_HOSTBINS="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
+
+do_configure() {
+    oe_runmake features
+}
 
 do_compile_append() {
     cd ${S}/bin
@@ -52,7 +55,6 @@ do_compile_append() {
 FILES_${PN} += " \
     ${datadir}/icons \
     ${datadir}/mime \
-    ${libdir}/python3 \
     ${libdir}/lv2 \
     ${libdir}/vst \
 "