From 0c4c09912a609408a30bf5794b3cab03ea52fae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 12 Oct 2019 14:31:42 +0200
Subject: [PATCH] distrho-ports(extra): Fix nasty file sharing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Seems I forgot to run cleannstate when testing transition to lv2-turtle-helper.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-musicians/distrho/distrho-ports-extra.bb | 9 +++++----
 recipes-musicians/distrho/distrho-ports.bb       | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/recipes-musicians/distrho/distrho-ports-extra.bb b/recipes-musicians/distrho/distrho-ports-extra.bb
index 086a96a..64dbf8c 100644
--- a/recipes-musicians/distrho/distrho-ports-extra.bb
+++ b/recipes-musicians/distrho/distrho-ports-extra.bb
@@ -40,15 +40,16 @@ do_ttl_sed() {
     # Seems this collection is not ready for public
     # scripts/libs are (broken) symlinks to /usr/src/distrho) - copy 'shared'
     # from distrho-ports (hack but we need to patch distrho-ports only)
-    rm -f ${S}/libs
-    rm -f ${S}/scripts
-    mkdir ${S}/scripts
-    cp  -r ${STAGING_BINDIR}/scripts/* ${S}/scripts
+    rm -rf ${S}/libs
+    rm -rf ${S}/scripts
+    cp  -r ${STAGING_BINDIR}/scripts ${S}
+    cp  -r ${STAGING_LIBDIR}/libs ${S}
     # 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`
 }
 
 do_configure() {
+    cd ${S}
     # platforms supporting sse2 can override NOOPTIMIZATIONS - later todo?
     NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
 }
diff --git a/recipes-musicians/distrho/distrho-ports.bb b/recipes-musicians/distrho/distrho-ports.bb
index ed3cefb..6842fda 100644
--- a/recipes-musicians/distrho/distrho-ports.bb
+++ b/recipes-musicians/distrho/distrho-ports.bb
@@ -83,7 +83,10 @@ do_install() {
     # install ttl-generator bindir for distrho-ports-extra
     install -d ${D}/${bindir}/scripts
 	install -m 755 ${S}/libs/lv2_ttl_generator ${D}/${bindir}
+    rm ${S}/libs/lv2_ttl_generator
     cp -r ${WORKDIR}/scripts ${D}/${bindir}/
+    cp -r ${S}/libs ${D}/${libdir}/
+    mv ${D}/${libdir}/libs/*.a ${D}/${libdir}
 }
 # ttl-generator bindir for distrho-ports-extra
 SYSROOT_DIRS_append = " ${bindir}"
@@ -98,6 +101,7 @@ PACKAGES =+ "${PN}-ttl-generator"
 FILES_${PN}-ttl-generator += " \
     ${bindir}/lv2_ttl_generator \
     ${bindir}/scripts \
+    ${libdir}/libs \
 "
 # ${PN}-ttl-generator is intented for build of distrho-ports-extra and
 # definitely nothing to be installed on target