From e440d09cbf7640484d7be4502c3e31191092d5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 30 Dec 2017 00:35:04 +0100 Subject: [PATCH] distrho-ports: update to git HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../distrho/distrho-ports.bb | 10 +-- ...elay-it-uses-double-precision-SSE2-b.patch | 28 ++++---- ...ne-Plugin-do-not-include-xmmintrin.h.patch | 27 +++++++ ...nox-LV2-plugin-lv2_ttl_generator-bl.patch} | 8 +-- ...audio-tremolo-LV2-plugin-lv2_ttl_ge.patch} | 0 ...synth-LV2-plugin-lv2_ttl_generator-.patch} | 0 ...eSam-LV2-plugin-lv2_ttl_generator-bl.patch | 32 +++++++++ .../recipes-multimedia/distrho/nekobi.bb | 70 +++++++++++++++++++ 8 files changed, 151 insertions(+), 24 deletions(-) rename recipes-misc/recipes-multimedia/distrho/{files => distrho-ports}/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch (74%) create mode 100644 recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch rename recipes-misc/recipes-multimedia/distrho/{files/0002-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch => distrho-ports/0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch} (89%) rename recipes-misc/recipes-multimedia/distrho/{files/0003-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch => distrho-ports/0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch} (100%) rename recipes-misc/recipes-multimedia/distrho/{files/0004-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch => distrho-ports/0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch} (100%) create mode 100644 recipes-misc/recipes-multimedia/distrho/distrho-ports/0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch create mode 100644 recipes-misc/recipes-multimedia/distrho/nekobi.bb diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb index 3d37e340..df183a64 100644 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb @@ -9,12 +9,14 @@ LIC_FILES_CHKSUM = " \ SRC_URI = " \ git://github.com/DISTRHO/DISTRHO-Ports.git \ file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \ - file://0002-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch \ - file://0003-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch \ - file://0004-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.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 \ " -SRCREV = "bef9436de38794dd2de24d404785089f33e6df8a" +SRCREV = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9" S = "${WORKDIR}/git" PV = "0.0.0+git${SRCPV}" diff --git a/recipes-misc/recipes-multimedia/distrho/files/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch similarity index 74% rename from recipes-misc/recipes-multimedia/distrho/files/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch rename to recipes-misc/recipes-multimedia/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch index d5a2ff82..91dc3016 100644 --- a/recipes-misc/recipes-multimedia/distrho/files/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch @@ -13,49 +13,45 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - ports/Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + ports/Makefile | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/ports/Makefile b/ports/Makefile -index 5794d18..f81013c 100644 +index d87da4af..521d9e1e 100644 --- a/ports/Makefile +++ b/ports/Makefile -@@ -37,7 +37,7 @@ lv2: libs +@@ -59,7 +59,6 @@ else $(MAKE) -C LUFSMeter/LV2-Multi $(MAKE) -C luftikus/LV2 $(MAKE) -C obxd/LV2 - $(MAKE) -C pitchedDelay/LV2 -+# $(MAKE) -C pitchedDelay/LV2 + $(MAKE) -C refine/LV2 $(MAKE) -C stereosourceseparation/LV2 $(MAKE) -C tal-dub-3/LV2 - $(MAKE) -C tal-filter/LV2 -@@ -73,7 +73,7 @@ vst: libs +@@ -98,7 +97,6 @@ vst: libs $(MAKE) -C LUFSMeter/VST-Multi $(MAKE) -C luftikus/VST $(MAKE) -C obxd/VST - $(MAKE) -C pitchedDelay/VST -+# $(MAKE) -C pitchedDelay/VST + $(MAKE) -C refine/VST $(MAKE) -C stereosourceseparation/VST $(MAKE) -C tal-dub-3/VST - $(MAKE) -C tal-filter/VST -@@ -109,7 +109,7 @@ clean: +@@ -136,7 +134,6 @@ clean: $(MAKE) clean -C LUFSMeter/LV2-Multi $(MAKE) clean -C luftikus/LV2 $(MAKE) clean -C obxd/LV2 - $(MAKE) clean -C pitchedDelay/LV2 -+# $(MAKE) clean -C pitchedDelay/LV2 + $(MAKE) clean -C refine/LV2 $(MAKE) clean -C stereosourceseparation/LV2 $(MAKE) clean -C tal-dub-3/LV2 - $(MAKE) clean -C tal-filter/LV2 -@@ -141,7 +141,7 @@ clean: +@@ -170,7 +167,6 @@ clean: $(MAKE) clean -C LUFSMeter/VST-Multi $(MAKE) clean -C luftikus/VST $(MAKE) clean -C obxd/VST - $(MAKE) clean -C pitchedDelay/VST -+# $(MAKE) clean -C pitchedDelay/VST + $(MAKE) clean -C refine/VST $(MAKE) clean -C stereosourceseparation/VST $(MAKE) clean -C tal-dub-3/VST - $(MAKE) clean -C tal-filter/VST -- -2.9.4 +2.14.3 diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch new file mode 100644 index 00000000..eea981ae --- /dev/null +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch @@ -0,0 +1,27 @@ +From 8681831fa6fc5e58a7eebfc46bb0a467c8f19dcc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 29 Dec 2017 23:36:46 +0100 +Subject: [PATCH] Refine-Plugin: do not include "xmmintrin.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + ports/refine/source/PluginProcessor.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ports/refine/source/PluginProcessor.cpp b/ports/refine/source/PluginProcessor.cpp +index 6c9e6182..ab50a6ad 100644 +--- a/ports/refine/source/PluginProcessor.cpp ++++ b/ports/refine/source/PluginProcessor.cpp +@@ -1,6 +1,5 @@ + #include "PluginProcessor.h" + #include "PluginEditor.h" +-#include "xmmintrin.h" + + ReFinedAudioProcessor::ReFinedAudioProcessor() + { +-- +2.14.3 + diff --git a/recipes-misc/recipes-multimedia/distrho/files/0002-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 similarity index 89% rename from recipes-misc/recipes-multimedia/distrho/files/0002-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch rename to recipes-misc/recipes-multimedia/distrho/distrho-ports/0003-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch index 9a193028..f2c50a75 100644 --- a/recipes-misc/recipes-multimedia/distrho/files/0002-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 @@ -15,18 +15,18 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/Makefile b/ports/Makefile -index f81013c..750f323 100644 +index d87da4af..4cdc7674 100644 --- a/ports/Makefile +++ b/ports/Makefile -@@ -29,7 +29,7 @@ lv2: libs +@@ -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 - $(MAKE) -C klangfalter/LV2 -- -2.9.4 +2.14.3 diff --git a/recipes-misc/recipes-multimedia/distrho/files/0003-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 similarity index 100% rename from recipes-misc/recipes-multimedia/distrho/files/0003-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch rename to recipes-misc/recipes-multimedia/distrho/distrho-ports/0004-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch diff --git a/recipes-misc/recipes-multimedia/distrho/files/0004-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 similarity index 100% rename from recipes-misc/recipes-multimedia/distrho/files/0004-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch rename to recipes-misc/recipes-multimedia/distrho/distrho-ports/0005-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch 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 new file mode 100644 index 00000000..ca5785ab --- /dev/null +++ b/recipes-misc/recipes-multimedia/distrho/distrho-ports/0006-do-not-build-HiReSam-LV2-plugin-lv2_ttl_generator-bl.patch @@ -0,0 +1,32 @@ +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/nekobi.bb b/recipes-misc/recipes-multimedia/distrho/nekobi.bb new file mode 100644 index 00000000..3d37e340 --- /dev/null +++ b/recipes-misc/recipes-multimedia/distrho/nekobi.bb @@ -0,0 +1,70 @@ +SUMMARY = "Collection of synthesizers and plugins" +HOMEPAGE = "http://distrho.sourceforge.net/ports" +LICENSE = "GPLv2 & LGPLv3" +LIC_FILES_CHKSUM = " \ + file://doc/GPL.txt;md5=4641e94ec96f98fabc56ff9cc48be14b \ + file://doc/LGPL.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +SRC_URI = " \ + git://github.com/DISTRHO/DISTRHO-Ports.git \ + file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \ + file://0002-do-not-build-equinox-LV2-plugin-lv2_ttl_generator-bl.patch \ + file://0003-do-not-build-drowaudio-tremolo-LV2-plugin-lv2_ttl_ge.patch \ + file://0004-do-not-build-drumsynth-LV2-plugin-lv2_ttl_generator-.patch \ +" + +SRCREV = "bef9436de38794dd2de24d404785089f33e6df8a" +S = "${WORKDIR}/git" +PV = "0.0.0+git${SRCPV}" + +REQUIRED_DISTRO_FEATURES = "x11" + +inherit qemu-ext distro_features_check + +DEPENDS += "\ + premake3-native \ + alsa-lib \ + libx11 \ + libxext \ + libxcursor \ + freetype \ + 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` +} + +# platforms supporting sse2 can override this +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 +} + +FILES_${PN} += " \ + ${libdir}/lv2 \ + ${libdir}/vst \ +" + +# Have not found what causes stripping - debugging of plugins is unlikely +INSANE_SKIP_${PN} = "already-stripped" +