From 815c48d5974d7ac96bf55186358787e8cd213eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 8 Oct 2019 23:48:33 +0200
Subject: [PATCH] distrho-ports(-extra): rework lv2_ttl_generator sharing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make it work for distrho-ports-extra+lv2-turtle-helper
* Make it less a hack - inspired by gobject-introspection

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../distrho/distrho-ports-extra.bb            |  5 +--
 recipes-musicians/distrho/distrho-ports.bb    | 24 ++++++++------
 ...tem-flags-also-for-lv2_ttl_generator.patch | 31 +++++++++++++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 recipes-musicians/distrho/distrho-ports/0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch

diff --git a/recipes-musicians/distrho/distrho-ports-extra.bb b/recipes-musicians/distrho/distrho-ports-extra.bb
index 6bd46ab..086a96a 100644
--- a/recipes-musicians/distrho/distrho-ports-extra.bb
+++ b/recipes-musicians/distrho/distrho-ports-extra.bb
@@ -34,7 +34,7 @@ DEPENDS += " \
     distrho-ports \
 "
 
-LV2_TTL_GENERATOR = "${B}/libs/lv2_ttl_generator"
+LV2_TTL_GENERATOR = "${STAGING_BINDIR}/lv2_ttl_generator"
 
 do_ttl_sed() {
     # Seems this collection is not ready for public
@@ -42,7 +42,8 @@ do_ttl_sed() {
     # from distrho-ports (hack but we need to patch distrho-ports only)
     rm -f ${S}/libs
     rm -f ${S}/scripts
-    cp -rf ${STAGING_LIBDIR}/distrho-ports-build/* ${S}/
+    mkdir ${S}/scripts
+    cp  -r ${STAGING_BINDIR}/scripts/* ${S}/scripts
     # manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-turtle-helper
     sed -i 's|$GEN ./$FILE|echo "`pwd`/$FILE" >> ${LV2_PLUGIN_INFO_FILE}|g' `find ${S}/scripts -name *.sh`
 }
diff --git a/recipes-musicians/distrho/distrho-ports.bb b/recipes-musicians/distrho/distrho-ports.bb
index 6a8c95c..ed426c0 100644
--- a/recipes-musicians/distrho/distrho-ports.bb
+++ b/recipes-musicians/distrho/distrho-ports.bb
@@ -13,6 +13,7 @@ SRC_URI = " \
     file://0003-Fix-build-with-musl-by-removing-unused-SystemStats-g.patch \
     file://0004-Further-musl-fix-by-removal-of-unused-function.patch \
     file://0005-Fix-build-with-gcc9.patch \
+    file://0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch \
     \
     http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \
     \
@@ -82,23 +83,28 @@ do_install() {
         cp -rf $file ${D}${libdir}/lv2/
     done
 
-    # install scripts for distro-ports-extra (and abuse libdir to ensure is is found in sysroot)
-    install -d ${D}/${libdir}/distrho-ports-build
-    cp -rf ${WORKDIR}/scripts ${D}${libdir}/distrho-ports-build/
-    cp -rf ${S}/libs ${D}${libdir}/distrho-ports-build/
-    rm -f ${D}${libdir}/distrho-ports-build/libs/lv2_ttl_generator
+    # install ttl-generator bindir for distrho-ports-extra
+    install -d ${D}/${bindir}/scripts
+	install -m 755 ${S}/libs/lv2_ttl_generator ${D}/${bindir}
+    cp -r ${WORKDIR}/scripts ${D}/${bindir}/
 }
+# ttl-generator bindir for distrho-ports-extra
+SYSROOT_DIRS_append = " ${bindir}"
 
 PACKAGES =+ "${PN}-presets"
 RDEPENDS_${PN}-presets = "${PN_LV2}"
 
 FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2"
 
-# dummy pack scripts for distrho-ports-extra
-FILES_${PN}-staticdev += " \
-    ${libdir}/distrho-ports-build \
+# dummy pack ttl-generator for distrho-ports-extra
+PACKAGES =+ "${PN}-ttl-generator"
+FILES_${PN}-ttl-generator += " \
+    ${bindir}/lv2_ttl_generator \
+    ${bindir}/scripts \
 "
-RDEPENDS_${PN}-staticdev = "bash perl"
+# ${PN}-ttl-generator is intented for build of distrho-ports-extra and
+# definitely nothing to be installed on target
+INSANE_SKIP_${PN}-ttl-generator = "file-rdeps"
 
 # Have not found what causes stripping - debugging of plugins is unlikely
 INSANE_SKIP_${PN} = "already-stripped"
diff --git a/recipes-musicians/distrho/distrho-ports/0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch b/recipes-musicians/distrho/distrho-ports/0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch
new file mode 100644
index 0000000..97f5646
--- /dev/null
+++ b/recipes-musicians/distrho/distrho-ports/0006-Use-build-system-flags-also-for-lv2_ttl_generator.patch
@@ -0,0 +1,31 @@
+From c02ae0c460eed28f8b1f3c80ff0093f36b27c667 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 8 Oct 2019 22:55:31 +0200
+Subject: [PATCH] Use build system flags also for lv2_ttl_generator
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Short story: it fixes issues using crossbuild environments
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ libs/lv2-ttl-generator/GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/lv2-ttl-generator/GNUmakefile b/libs/lv2-ttl-generator/GNUmakefile
+index dd18570c..6e9166e4 100644
+--- a/libs/lv2-ttl-generator/GNUmakefile
++++ b/libs/lv2-ttl-generator/GNUmakefile
+@@ -6,7 +6,7 @@ build: ../lv2_ttl_generator
+ mingw: ../lv2_ttl_generator.exe
+ 
+ ../lv2_ttl_generator: lv2_ttl_generator.cpp
+-	$(CXX) lv2_ttl_generator.cpp -o ../lv2_ttl_generator -ldl
++	$(CXX) lv2_ttl_generator.cpp $(CXXFLAGS) $(LDFLAGS) -o ../lv2_ttl_generator -ldl
+ 
+ ../lv2_ttl_generator.exe: lv2_ttl_generator.cpp
+ 	$(CXX) lv2_ttl_generator.cpp -o ../lv2_ttl_generator.exe -static
+-- 
+2.21.0
+