diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb index a34022d9..d970ad5c 100644 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb @@ -10,11 +10,6 @@ SRC_URI = " \ git://github.com/DISTRHO/DISTRHO-Ports.git \ file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \ file://0002-Refine-Plugin-do-not-include-xmmintrin.h.patch \ - file://0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch \ - file://0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch \ - file://0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch \ - file://0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch \ - file://0007-do-not-build-dexed-LV2-plugin-lv2_ttl_generator-bloc.patch \ \ http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \ \ @@ -36,7 +31,7 @@ SRC_URI[linuxsynths-vex-patches2.sha256sum] = "378cff261dab333c5f29246b6f3f557e0 REQUIRED_DISTRO_FEATURES = "x11" -inherit qemu-ext distro_features_check +inherit lv2-postinst-helper distro_features_check DEPENDS += " \ premake3-native \ @@ -48,11 +43,14 @@ DEPENDS += " \ ladspa-sdk \ " -CLEANBROKEN = "1" - do_configure_prepend() { - # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu - sed -i 's|$GEN ./$FILE|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' `find ${S} -name *.sh` + # reconfigure? + if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then + # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu + sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S} -name *.sh` + else + rm -f ${LV2-TURTLE-BUILD-DATA} + fi } # platforms supporting sse2 can override this @@ -60,20 +58,9 @@ do_configure() { NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux } -do_compile_append() { - # build ttl-files must be done in quemu - for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do - cd `dirname ${sofile}` - echo "QEMU lv2_ttl_generator for ${sofile}..." - ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/libs/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!" - done -} - do_install() { install -d ${D}${libdir} cp -r ${S}/bin/* ${D}${libdir} - # don't install crash data - rm `find ${D}${libdir} -name *.core` || true # presets install -d ${D}${libdir}/lv2 diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch deleted file mode 100644 index f2c50a75..00000000 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4e0fa02741751d9416afa0afcedb28b9194d4c0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 27 Jun 2017 23:22:16 +0200 -Subject: [PATCH] do not build equinox LV2-plugin - lv2_ttl_generator blocks - forever -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - ports/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ports/Makefile b/ports/Makefile -index d87da4af..4cdc7674 100644 ---- a/ports/Makefile -+++ b/ports/Makefile -@@ -50,7 +50,7 @@ else - $(MAKE) -C drowaudio-tremolo/LV2 - $(MAKE) -C drumsynth/LV2 - $(MAKE) -C easySSP/LV2 -- $(MAKE) -C eqinox/LV2 -+# $(MAKE) -C eqinox/LV2 - $(MAKE) -C HiReSam/LV2 - # $(MAKE) -C juce-demo-host/LV2 - $(MAKE) -C juce-demo-plugin/LV2 --- -2.14.3 - diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch deleted file mode 100644 index c837d056..00000000 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a3248f97e6b354a1042f21ba289411ad53603d17 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 28 Jun 2017 01:51:21 +0200 -Subject: [PATCH] do not build drowaudio-tremolo LV2-plugin - lv2_ttl_generator - blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - ports/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ports/Makefile b/ports/Makefile -index 750f323..df34f8f 100644 ---- a/ports/Makefile -+++ b/ports/Makefile -@@ -26,7 +26,7 @@ lv2: libs - $(MAKE) -C drowaudio-distortionshaper/LV2 - $(MAKE) -C drowaudio-flanger/LV2 - $(MAKE) -C drowaudio-reverb/LV2 -- $(MAKE) -C drowaudio-tremolo/LV2 -+# $(MAKE) -C drowaudio-tremolo/LV2 - $(MAKE) -C drumsynth/LV2 - $(MAKE) -C easySSP/LV2 - # $(MAKE) -C eqinox/LV2 --- -2.9.4 - diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch deleted file mode 100644 index a8951d40..00000000 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 75f84a92ed744af96da3fd8949e35edf1ddd9cc2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 28 Jun 2017 02:06:50 +0200 -Subject: [PATCH] do not build drumsynth LV2-plugin - lv2_ttl_generator blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - ports/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ports/Makefile b/ports/Makefile -index 441a66e..114ee5f 100644 ---- a/ports/Makefile -+++ b/ports/Makefile -@@ -27,7 +27,7 @@ lv2: libs - $(MAKE) -C drowaudio-flanger/LV2 - $(MAKE) -C drowaudio-reverb/LV2 - # $(MAKE) -C drowaudio-tremolo/LV2 -- $(MAKE) -C drumsynth/LV2 -+# $(MAKE) -C drumsynth/LV2 - $(MAKE) -C easySSP/LV2 - # $(MAKE) -C eqinox/LV2 - $(MAKE) -C HiReSam/LV2 diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch deleted file mode 100644 index ca5785ab..00000000 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From da09f0307d08242d5dfdb738e6ea51876ac1da58 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 30 Dec 2017 00:08:07 +0100 -Subject: [PATCH] do not build HiReSam LV2-plugin - lv2_ttl_generator blocks - forever -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - ports/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ports/Makefile b/ports/Makefile -index 751158c3..59966e48 100644 ---- a/ports/Makefile -+++ b/ports/Makefile -@@ -51,7 +51,7 @@ else - # $(MAKE) -C drumsynth/LV2 - $(MAKE) -C easySSP/LV2 - # $(MAKE) -C eqinox/LV2 -- $(MAKE) -C HiReSam/LV2 -+# $(MAKE) -C HiReSam/LV2 - # $(MAKE) -C juce-demo-host/LV2 - $(MAKE) -C juce-demo-plugin/LV2 - $(MAKE) -C klangfalter/LV2 --- -2.14.3 - diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0007-do-not-build-dexed-LV2-plugin-lv2_ttl_generator-bloc.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0007-do-not-build-dexed-LV2-plugin-lv2_ttl_generator-bloc.patch deleted file mode 100644 index 662cb59e..00000000 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0007-do-not-build-dexed-LV2-plugin-lv2_ttl_generator-bloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4aaf0c498a8d7b132bb4e5216b28955dcbd515a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 21 Mar 2018 14:26:26 +0100 -Subject: [PATCH] do not build dexed LV2-plugin - lv2_ttl_generator blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - ports/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ports/Makefile b/ports/Makefile -index 59966e48..6ad528fa 100644 ---- a/ports/Makefile -+++ b/ports/Makefile -@@ -42,7 +42,7 @@ ifeq ($(LINUX_EMBED),true) - else - $(MAKE) -C arctican-function/LV2 - $(MAKE) -C arctican-pilgrim/LV2 -- $(MAKE) -C dexed/LV2 -+# $(MAKE) -C dexed/LV2 - $(MAKE) -C drowaudio-distortion/LV2 - $(MAKE) -C drowaudio-distortionshaper/LV2 - $(MAKE) -C drowaudio-flanger/LV2 --- -2.14.3 -