Merge remote-tracking branch 'origin/master' into warrior

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

classes/audio-plugin-common.bbclass

@@ -1,8 +0,0 @@
-# class for audio plugin common settings
-
-# plugin package names
-PN_DSSI = "${PN}-dssi"
-PN_LADSPA = "${PN}-ladspa"
-PN_LV2 = "${PN}-lv2"
-PN_VST = "${PN}-vst"
-

classes/lv2-postinst-helper.bbclass

@@ -14,8 +14,6 @@ LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
 # paths as installed on target a stored in a file called lv2-postinst-manifest
 LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
 
-inherit audio-plugin-common
-
 do_install_append() {
     # remove dummy lv2-turtles again
     cd ${D}/${libdir}/lv2
@@ -25,7 +23,7 @@ do_install_append() {
 
     # create postinst manifest
     install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
-    for sofile in `sort ${LV2-TURTLE-BUILD-DATA} | uniq | awk '{ print $2 }'`; do
+    for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
         sofile=`basename $sofile`
         installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
         echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
@@ -33,16 +31,16 @@ do_install_append() {
 }
 
 
-pkg_postinst_ontarget_${PN_LV2}() {
+pkg_postinst_ontarget_${PN}-lv2() {
     oldpath=`pwd`
     for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
         cd `dirname "$sofile"`
-        lv2-ttl-generator "$sofile" || echo "Error: Turtle files for $sofile could not be created!"
+        lv2-ttl-generator "$sofile"
     done
     cd $oldpath
 }
 
-pkg_prerm_${PN_LV2}() {
+pkg_prerm_${PN}-lv2() {
     for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
         path=`dirname "$sofile"`
         for turtle in `find $path -name '*.ttl'`; do
@@ -51,5 +49,5 @@ pkg_prerm_${PN_LV2}() {
     done
 }
 
-FILES_${PN_LV2} += "${LV2-POSTINST-MANIFEST}"
-RDEPENDS_${PN_LV2} += "lv2-ttl-generator"
+FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}"
+RDEPENDS_${PN}-lv2 += "lv2-ttl-generator"

classes/lv2-turtle-helper.bbclass

@@ -1,143 +0,0 @@
-# Helper class to handle creation of lv2 turtle files
-
-# Turtle files (*.ttl) are created during compile usually. This does not work
-# for us because cross build libraries cannot be opened by build host. To get
-# around we:
-#
-# 1. Adjust build (see do_ttl_sed) so that instead calling LV2_TTL_GENERATOR
-#    the plugin file name is written to LV2_PLUGIN_INFO_FILE
-# 2. Try to generate ttl with the help of qemu. This can faile for various
-#    reasons: SIMD instructions not supported / qemu itself / ...
-#    For files not handled properly we try:
-# 3. Generate ttl-files at first boot / after package was installed
-
-
-# File containing names of plugins to handle in do_compile_append 
-# Line-format expected: <some-path-in-build>/<plugin>.so
-LV2_PLUGIN_INFO_FILE = "${WORKDIR}/lv2-ttl-generator-data"
-LV2_PLUGIN_INFO_FILE_CLEANED = "${LV2_PLUGIN_INFO_FILE}-cleaned"
-
-# File containing names of plugins to handle in do_compile_append 
-# Line-format expected: <path-ontarget>/<plugin>.so
-LV2_PLUGIN_POSTINST_INFO_FILE = "${LV2_PLUGIN_INFO_FILE}-postinst"
-
-# To make ontarget postinst/prerm happen, the names of all plugins with their
-# paths as installed on target a stored in a file called lv2-postinst-manifest
-LV2_POSTINST_MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
-
-# Path to the ttl-generator qemu will use. Since most plugins are based on dpf
-# (added by git-submodule) we can set a default matchin > 80%+
-LV2_TTL_GENERATOR ?= "${S}/dpf/utils/lv2_ttl_generator"
-
-# For some plugins qemu never finishes so we need a blacklist
-LV2_PLUGIN_BLACKLIST_QEMU ?= ""
-
-inherit qemu-ext audio-plugin-common
-
-# override this function and execute sed (or other magic) to adjust Makefiles
-# so that lv2-ttl-generator is not executed but plugin information. Same here:
-# Set default matich many dpf-based plugins
-do_ttl_sed() {
-    sed -i 's|"$GEN" "./$FILE"|echo "`realpath  "./$FILE"`" >> ${LV2_PLUGIN_INFO_FILE}|g' ${S}/dpf/utils/generate-ttl.sh
-}
-
-do_configure_prepend() {
-    # 1st configure?
-    if [ ! -f ${LV2_PLUGIN_INFO_FILE} ]; then
-        do_ttl_sed
-    fi
-}
-
-do_compile_prepend() {
-    # remove plugin-info from previous build
-    rm -f ${LV2_PLUGIN_INFO_FILE}
-    rm -f ${LV2_PLUGIN_POSTINST_INFO_FILE}
-}
-
-do_compile[vardeps] += "LV2_PLUGIN_BLACKLIST_QEMU LV2_TTL_GENERATOR"
-do_compile_append() {
-    rm -f ${LV2_PLUGIN_INFO_FILE_CLEANED}
-    if [ -e ${LV2_PLUGIN_INFO_FILE} ]; then
-        echo "lv2-plugins found - try ttl-generation with '${LV2_TTL_GENERATOR}"
-        # try build ttl-files with quemu
-        for sofile in `sort ${LV2_PLUGIN_INFO_FILE} | uniq`; do
-            echo $sofile >> ${LV2_PLUGIN_INFO_FILE_CLEANED}
-            sobase=`basename $sofile`
-            ttl_failed=""
-            if echo "${LV2_PLUGIN_BLACKLIST_QEMU}" | grep -q "$sobase"; then
-                echo "$sobase found in blacklist - postpone ttl-genaration to ontarget postinst"
-                ttl_failed="true"
-            fi
-            if [ "x${ttl_failed}" = "x" ]; then
-                cd `dirname ${sofile}`
-                echo "QEMU lv2-ttl-generator for ${sofile}..."
-                ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${LV2_TTL_GENERATOR}')} ${sofile} || ttl_failed="true"
-                if [ "x${ttl_failed}" = "x" ]; then
-                    echo "Generation succeeded."
-                else
-                    # If qemu fails: remove generated core files & prepare for postinst fallback
-                    echo "ERROR: for QEMU ${LV2_TTL_GENERATOR} for ${sofile} failed!"
-                    rm -f *.core
-                fi
-            fi
-            if [ "x${ttl_failed}" != "x" ]; then
-                # postpone on target
-                echo `basename $sofile` >> ${LV2_PLUGIN_POSTINST_INFO_FILE}
-            fi
-        done
-    else
-        echo
-        echo "LV2_PLUGIN_INFO_FILE was not created during compilation - check do_ttl_sed() or patch postponing ttl-generation"
-        echo
-        exit -1
-    fi
-}
-do_compile[postfuncs] += "do_ttl_qa"
-python do_ttl_qa() {
-    lv2_plugin_postinst_info_file = d.getVar('LV2_PLUGIN_POSTINST_INFO_FILE')
-    if os.path.isfile(lv2_plugin_postinst_info_file):
-        lv2_plugin_info_file_cleaned = d.getVar('LV2_PLUGIN_INFO_FILE_CLEANED')
-        num_plugins = len(open(lv2_plugin_info_file_cleaned).readlines())
-        num_plugins_postinst = len(open(lv2_plugin_postinst_info_file).readlines())
-        name = d.getVar('PN')
-        if num_plugins == num_plugins_postinst:
-            bb.warn("All LV2-plugins in %s are postponed to post-install! Check log.do_compile for valid LV2_TTL_GENERATOR (%s)" % (name,d.getVar('LV2_TTL_GENERATOR')))
-        else:
-            bb.warn("%i of %i LV2-plugins in %s are postponed to post-install! Check %s and log.do_compile for details" % (num_plugins_postinst, num_plugins, name, lv2_plugin_postinst_info_file))
-}
-
-do_install_append() {
-    # create postinst manifest
-    if [ -e ${LV2_PLUGIN_POSTINST_INFO_FILE} ]; then
-        install -d ${D}`dirname ${LV2_POSTINST_MANIFEST}`
-        for sofile in `cat ${LV2_PLUGIN_POSTINST_INFO_FILE}`; do
-            installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
-            echo $installed >> ${D}${LV2_POSTINST_MANIFEST}
-        done
-    fi
-}
-
-pkg_postinst_ontarget_${PN_LV2}() {
-    if [ -e ${LV2_POSTINST_MANIFEST} ]; then
-        oldpath=`pwd`
-        for sofile in `cat ${LV2_POSTINST_MANIFEST}`; do
-            cd `dirname "$sofile"`
-            lv2-ttl-generator "$sofile" || echo "Error: Turtle files for $sofile could not be created!"
-        done
-        cd $oldpath
-    fi
-}
-
-pkg_prerm_${PN_LV2}() {
-    if [ -e ${LV2_POSTINST_MANIFEST} ]; then
-        for sofile in `cat ${LV2_POSTINST_MANIFEST}`; do
-            path=`dirname "$sofile"`
-            for turtle in `find $path -name '*.ttl'`; do
-                rm $turtle
-            done
-        done
-    fi
-}
-
-FILES_${PN_LV2} += "${LV2_POSTINST_MANIFEST}"
-RDEPENDS_${PN_LV2} += "lv2-ttl-generator"

classes/pack_audio_plugins.bbclass

@@ -1,10 +1,8 @@
 # Auto package audio plugins
 
-inherit audio-plugin-common
+PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst"
 
-PACKAGES =+ "${PN_DSSI} ${PN_LADSPA} ${PN_LV2} ${PN_VST}"
-
-FILES_${PN_DSSI} += "${libdir}/dssi"
-FILES_${PN_LADSPA} += "${libdir}/ladspa"
-FILES_${PN_LV2} += "${libdir}/lv2"
-FILES_${PN_VST} += "${libdir}/vst"
+FILES_${PN}-dssi += "${libdir}/dssi"
+FILES_${PN}-ladspa += "${libdir}/ladspa"
+FILES_${PN}-lv2 += "${libdir}/lv2"
+FILES_${PN}-vst += "${libdir}/vst"

conf/layer.conf

@@ -20,4 +20,4 @@ LAYERDEPENDS_meta-musicians = " \
     meta-python \
     qt5-layer \
 "
-LAYERSERIES_COMPAT_meta-musicians = "thud warrior zeus"
+LAYERSERIES_COMPAT_meta-musicians = "thud warrior"

recipes-graphics/ntk/files/0002-Fix-build-for-python3-only-environments.patch

@@ -1,28 +0,0 @@
-From 7637d0c9c836831eb23af2d72dd8195c65b0aca0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 9 Dec 2019 19:25:10 +0100
-Subject: [PATCH] Fix build for python3-only environments
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- waf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/waf b/waf
-index 061fb98..3208571 100755
---- a/waf
-+++ b/waf
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: latin-1
- # Thomas Nagy, 2005-2018
- #
--- 
-2.21.0
-

recipes-graphics/ntk/ntk_git.bb

@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca"
 SRC_URI = " \
     git://github.com/original-male/${BPN}.git \
     file://0001-wscript-check-compile-instead-of-tun-check-datatype-.patch \
-    file://0002-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "dae177189b12f74ea01ac2389b76326c06d9be78"
+SRCREV = "1e3f5106d404562902bed2983403301db24a3f78"
 S = "${WORKDIR}/git"
 PV_LAST_RELEASE = "1.3.1000"
-PV = "${PV_LAST_RELEASE}+git${SRCPV}"
+PV = "${PV_LAST_RELEASE}"
 
 inherit waf pkgconfig
 

recipes-musicians/amsynth/amsynth_git.bb

@@ -15,6 +15,7 @@ SRCREV = "71544e4991f494f9871e13a50d6cf9217bb86986"
 PV = "1.9.0"
 S = "${WORKDIR}/git"
 
+
 PACKAGECONFIG ??= "alsa jack sndfile lv2"
 
 PACKAGECONFIG[oss] = "--with-oss,--without-oss"
@@ -32,19 +33,19 @@ FILES_${PN}-standalone += " \
     ${bindir} \
 "
 
-FILES_${PN_DSSI} += " \
+FILES_${PN}-dssi += " \
     ${datadir}/appdata/dssi-amsynth-plugin.metainfo.xml \
 "
 
-FILES_${PN_LV2} += " \
+FILES_${PN}-lv2 += " \
     ${datadir}/appdata/lv2-amsynth-plugin.metainfo.xml \
 "
 
-FILES_${PN_VST} += " \
+FILES_${PN}-vst += " \
     ${datadir}/appdata/vst-amsynth-plugin.metainfo.xml \
 "
 
 RDEPENDS_${PN}-standalone += "${PN}"
-RDEPENDS_${PN_DSSI} += "${PN}"
-RDEPENDS_${PN_LV2} += "${PN}"
-RDEPENDS_${PN_VST} += "${PN}"
+RDEPENDS_${PN}-dssi += "${PN}"
+RDEPENDS_${PN}-lv2 += "${PN}"
+RDEPENDS_${PN}-vst += "${PN}"

recipes-musicians/aubio/aubio/0002-Fix-build-for-python3-only-environments.patch

@@ -1,28 +0,0 @@
-From 7637d0c9c836831eb23af2d72dd8195c65b0aca0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 9 Dec 2019 20:25:10 +0100
-Subject: [PATCH] Fix build for python3-only environments
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- waf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/waf b/waf
-index 061fb98..3208571 100755
---- a/waf
-+++ b/waf
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: latin-1
- # Thomas Nagy, 2005-2018
- #
--- 
-2.21.0
-

recipes-musicians/aubio/aubio_0.4.9.bb

@@ -16,7 +16,6 @@ DEPENDS += " \
 SRC_URI = " \
     https://aubio.org/pub/${BPN}-${PV}.tar.bz2 \
     file://0001-do-not-build-tests.patch \
-    file://0002-Fix-build-for-python3-only-environments.patch \
 "
 SRC_URI[md5sum] = "50c9c63b15a2692378af5d602892f16a"
 SRC_URI[sha256sum] = "d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da"

recipes-musicians/distrho/distrho-ports-extra.bb

@@ -20,7 +20,7 @@ PV = "0.0.0+git${SRCPV}"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit lv2-turtle-helper distro_features_check pack_audio_plugins
+inherit lv2-postinst-helper distro_features_check pack_audio_plugins
 
 # distro-ports dependency for special hack script / libs 
 DEPENDS += " \
@@ -34,23 +34,21 @@ DEPENDS += " \
     distrho-ports \
 "
 
-LV2_TTL_GENERATOR = "${STAGING_BINDIR}/lv2_ttl_generator"
-
-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 -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?
+    # reconfigure?
+    if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then
+        # Seems this collection is not ready for public - copy 'shared' from distrho-ports
+        rm -rf ${S}/scripts
+        rm -rf ${S}/libs
+        cp -rf ${STAGING_LIBDIR}/distrho-ports-build/* ${S}/
+	    # manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper
+        sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S}/scripts -name *.sh`
+    else
+        rm -f ${LV2-TURTLE-BUILD-DATA}
+    fi
+
+	cd ${S}
+    # platforms supporting sse2 can override NOOPTIMIZATIONS
     NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
 }
 
@@ -64,8 +62,8 @@ FILES_${PN} += " \
 "
 
 # for common (?) cabbage files
-RDEPENDS_${PN_LV2} += "${PN}"
-RDEPENDS_${PN_VST} += "${PN}"
+RDEPENDS_${PN}-lv2 += "${PN}"
+RDEPENDS_${PN}-vst += "${PN}"
 
 # Have not found what causes stripping - debugging of plugins is unlikely
 INSANE_SKIP_${PN} = "already-stripped"

recipes-musicians/distrho/distrho-ports.bb

@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = " \
 
 SRC_URI = " \
     git://github.com/DISTRHO/DISTRHO-Ports.git \
-    file://0001-Fix-build-with-musl-by-removing-unused-SystemStats-g.patch \
-    file://0002-Further-musl-fix-by-removal-of-unused-function.patch \
-    file://0003-Use-build-system-flags-also-for-lv2_ttl_generator.patch \
+    file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \
+    file://0002-Refine-Plugin-do-not-include-xmmintrin.h.patch \
+    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 \
     \
     http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \
     \
@@ -18,9 +20,9 @@ SRC_URI = " \
     http://linuxsynths.com/VexPatchesDemos/VexPatches02.tar.gz;name=linuxsynths-vex-patches2;subdir=linuxsynths-vex-patches \
 "
 
-SRCREV = "00ad25fd574c1724bbc974308aa5e88306969009"
+SRCREV = "a82fff059baafc03f7c0e8b9a99f383af7bfbd79"
 S = "${WORKDIR}/git"
-PV = "2018-04-16+git${SRCPV}"
+PV = "2018-04-16"
 
 SRC_URI[linuxsynths-obxd-patches1.md5sum] = "32244f847a54a71ee3c25079df5c8b84"
 SRC_URI[linuxsynths-obxd-patches1.sha256sum] = "246fccadd71bb9f0606a95bf7b0aee7807fd3a14f754367425423a51c31e160e"
@@ -32,7 +34,7 @@ SRC_URI[linuxsynths-vex-patches2.sha256sum] = "378cff261dab333c5f29246b6f3f557e0
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit dos2unix lv2-turtle-helper distro_features_check pack_audio_plugins
+inherit dos2unix lv2-postinst-helper distro_features_check pack_audio_plugins
 
 DEPENDS += " \
     premake3-native \
@@ -45,23 +47,18 @@ DEPENDS += " \
     ladspa-sdk \
 "
 
-LV2_TTL_GENERATOR = "${B}/libs/lv2_ttl_generator"
-
-LV2_PLUGIN_BLACKLIST_QEMU = " \
-    drowaudio-tremolo.so \
-    drumsynth.so \
-    eqinox.so \
-    HiReSam.so \
-"
-
-do_ttl_sed() {
-    # keep unmodified scripts for distrho-ports-extra
-    cp -r ${S}/scripts ${WORKDIR}
-    sed -i 's|$GEN ./$FILE|echo "`pwd`/$FILE" >> ${LV2_PLUGIN_INFO_FILE}|g' `find ${S}/scripts -name *.sh`
-}
-
 do_configure() {
-    # platforms supporting sse2 can override NOOPTIMIZATIONS - later todo?
+    # reconfigure?
+    if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then
+        # keep unmodified scripts
+        cp -r ${S}/scripts ${WORKDIR}
+        # manipulate scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper
+        sed -i 's|$GEN ./$FILE|echo "lv2-ttl-generator `pwd`/$FILE" >> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S}/scripts -name *.sh`
+    else
+        rm -f ${LV2-TURTLE-BUILD-DATA}
+    fi
+
+    # platforms supporting sse2 can override this (NOOPTIMIZATIONS)
     NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
 }
 
@@ -80,32 +77,23 @@ do_install() {
         cp -rf $file ${D}${libdir}/lv2/
     done
 
-    # 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}
+    # 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
 }
-# ttl-generator bindir for distrho-ports-extra
-SYSROOT_DIRS_append = " ${bindir}"
 
 PACKAGES =+ "${PN}-presets"
-RDEPENDS_${PN}-presets = "${PN_LV2}"
+RDEPENDS_${PN}-presets = "${PN}-lv2"
 
 FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2"
 
-# dummy pack ttl-generator for distrho-ports-extra
-PACKAGES =+ "${PN}-ttl-generator"
-FILES_${PN}-ttl-generator += " \
-    ${bindir}/lv2_ttl_generator \
-    ${bindir}/scripts \
-    ${libdir}/libs \
+# dummy pack scripts for distrho-ports-extra
+FILES_${PN}-staticdev += " \
+    ${libdir}/distrho-ports-build \
 "
-# ${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"
+RDEPENDS_${PN}-staticdev = "bash perl"
 
 # Have not found what causes stripping - debugging of plugins is unlikely
 INSANE_SKIP_${PN} = "already-stripped"

recipes-musicians/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch

@@ -0,0 +1,57 @@
+From b1b48a24ed4eda34e4dc4d649a1ef030c37694ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 26 Jun 2017 23:12:22 +0200
+Subject: [PATCH] disable pitchedDelay - it uses double precision SSE2 by
+ default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Our build system should setz proper flags.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ ports/Makefile | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/ports/Makefile b/ports/Makefile
+index d87da4af..521d9e1e 100644
+--- a/ports/Makefile
++++ b/ports/Makefile
+@@ -59,7 +59,6 @@ else
+ 	$(MAKE) -C LUFSMeter/LV2-Multi
+ 	$(MAKE) -C luftikus/LV2
+ 	$(MAKE) -C obxd/LV2
+-	$(MAKE) -C pitchedDelay/LV2
+ 	$(MAKE) -C refine/LV2
+ 	$(MAKE) -C stereosourceseparation/LV2
+ 	$(MAKE) -C tal-dub-3/LV2
+@@ -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 refine/VST
+ 	$(MAKE) -C stereosourceseparation/VST
+ 	$(MAKE) -C tal-dub-3/VST
+@@ -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 refine/LV2
+ 	$(MAKE) clean -C stereosourceseparation/LV2
+ 	$(MAKE) clean -C tal-dub-3/LV2
+@@ -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 refine/VST
+ 	$(MAKE) clean -C stereosourceseparation/VST
+ 	$(MAKE) clean -C tal-dub-3/VST
+-- 
+2.14.3
+

recipes-musicians/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch

@@ -0,0 +1,31 @@
+From 8681831fa6fc5e58a7eebfc46bb0a467c8f19dcc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+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
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/DISTRHO/DISTRHO-Ports/pull/31
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ 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
+

recipes-musicians/distrho/distrho-ports/0003-Use-build-system-flags-also-for-lv2_ttl_generator.patch

@@ -1,31 +0,0 @@
-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
-

recipes-musicians/distrho/distrho-ports/0005-Fix-build-with-gcc9.patch

@@ -0,0 +1,163 @@
+From cee14bbe5a46de8cf0941b10686e84c30f7eaf76 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 1 Aug 2019 22:29:06 +0200
+Subject: [PATCH] Fix build with gcc9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ported from [1]
+
+[1] https://github.com/WeAreROLI/JUCE/commit/4e0adb2af8b424c43d22bd431011c9a6c57d36b6
+
+Upstream-Status: Submitted [1]
+
+[2] https://github.com/DISTRHO/DISTRHO-Ports/pull/42
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ .../juce_graphics/colour/juce_PixelFormats.h  | 33 +++-----------
+ .../native/juce_RenderingHelpers.h            | 44 +------------------
+ 2 files changed, 8 insertions(+), 69 deletions(-)
+
+diff --git a/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h b/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
+index cb0867cf..dea97a6b 100644
+--- a/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
++++ b/libs/juce/source/modules/juce_graphics/colour/juce_PixelFormats.h
+@@ -105,22 +105,9 @@ public:
+ 
+     //==============================================================================
+     forcedinline uint8 getAlpha() const noexcept      { return components.a; }
+-    forcedinline uint8 getRed() const noexcept        { return components.r; }
++    forcedinline uint8 getRed()   const noexcept      { return components.r; }
+     forcedinline uint8 getGreen() const noexcept      { return components.g; }
+-    forcedinline uint8 getBlue() const noexcept       { return components.b; }
+-
+-   #if JUCE_GCC
+-    // NB these are here as a workaround because GCC refuses to bind to packed values.
+-    forcedinline uint8& getAlpha() noexcept           { return comps [indexA]; }
+-    forcedinline uint8& getRed() noexcept             { return comps [indexR]; }
+-    forcedinline uint8& getGreen() noexcept           { return comps [indexG]; }
+-    forcedinline uint8& getBlue() noexcept            { return comps [indexB]; }
+-   #else
+-    forcedinline uint8& getAlpha() noexcept           { return components.a; }
+-    forcedinline uint8& getRed() noexcept             { return components.r; }
+-    forcedinline uint8& getGreen() noexcept           { return components.g; }
+-    forcedinline uint8& getBlue() noexcept            { return components.b; }
+-   #endif
++    forcedinline uint8 getBlue()  const noexcept      { return components.b; }
+ 
+     //==============================================================================
+     /** Copies another pixel colour over this one.
+@@ -340,9 +327,6 @@ private:
+     {
+         uint32 internal;
+         Components components;
+-       #if JUCE_GCC
+-        uint8 comps[4];  // helper struct needed because gcc does not allow references to packed union members
+-       #endif
+     };
+ }
+ #ifndef DOXYGEN
+@@ -425,13 +409,9 @@ public:
+ 
+     //==============================================================================
+     forcedinline uint8 getAlpha() const noexcept    { return 0xff; }
+-    forcedinline uint8 getRed() const noexcept      { return r; }
++    forcedinline uint8 getRed()   const noexcept      { return r; }
+     forcedinline uint8 getGreen() const noexcept    { return g; }
+-    forcedinline uint8 getBlue() const noexcept     { return b; }
+-
+-    forcedinline uint8& getRed() noexcept           { return r; }
+-    forcedinline uint8& getGreen() noexcept         { return g; }
+-    forcedinline uint8& getBlue() noexcept          { return b; }
++    forcedinline uint8 getBlue()  const noexcept     { return b; }
+ 
+     //==============================================================================
+     /** Copies another pixel colour over this one.
+@@ -646,11 +626,10 @@ public:
+ 
+     //==============================================================================
+     forcedinline uint8 getAlpha() const noexcept    { return a; }
+-    forcedinline uint8& getAlpha() noexcept         { return a; }
+ 
+-    forcedinline uint8 getRed() const noexcept      { return 0; }
++    forcedinline uint8 getRed()   const noexcept    { return 0; }
+     forcedinline uint8 getGreen() const noexcept    { return 0; }
+-    forcedinline uint8 getBlue() const noexcept     { return 0; }
++    forcedinline uint8 getBlue()  const noexcept    { return 0; }
+ 
+     //==============================================================================
+     /** Copies another pixel colour over this one.
+diff --git a/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h b/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
+index e552758b..6dd943fb 100644
+--- a/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
++++ b/libs/juce/source/modules/juce_graphics/native/juce_RenderingHelpers.h
+@@ -585,10 +585,6 @@ namespace EdgeTableFillers
+             {
+                 areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
+                                             && sourceColour.getGreen() == sourceColour.getBlue();
+-                filler[0].set (sourceColour);
+-                filler[1].set (sourceColour);
+-                filler[2].set (sourceColour);
+-                filler[3].set (sourceColour);
+             }
+             else
+             {
+@@ -644,7 +640,6 @@ namespace EdgeTableFillers
+         const Image::BitmapData& destData;
+         PixelType* linePixels;
+         PixelARGB sourceColour;
+-        PixelRGB filler [4];
+         bool areRGBComponentsEqual;
+ 
+         forcedinline PixelType* getPixel (const int x) const noexcept
+@@ -659,43 +654,8 @@ namespace EdgeTableFillers
+ 
+         forcedinline void replaceLine (PixelRGB* dest, const PixelARGB colour, int width) const noexcept
+         {
+-            if (destData.pixelStride == sizeof (*dest))
+-            {
+-                if (areRGBComponentsEqual)  // if all the component values are the same, we can cheat..
+-                {
+-                    memset (dest, colour.getRed(), (size_t) width * 3);
+-                }
+-                else
+-                {
+-                    if (width >> 5)
+-                    {
+-                        const int* const intFiller = reinterpret_cast<const int*> (filler);
+-
+-                        while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
+-                        {
+-                            dest->set (colour);
+-                            ++dest;
+-                            --width;
+-                        }
+-
+-                        while (width > 4)
+-                        {
+-                            int* d = reinterpret_cast<int*> (dest);
+-                            *d++ = intFiller[0];
+-                            *d++ = intFiller[1];
+-                            *d++ = intFiller[2];
+-                            dest = reinterpret_cast<PixelRGB*> (d);
+-                            width -= 4;
+-                        }
+-                    }
+-
+-                    while (--width >= 0)
+-                    {
+-                        dest->set (colour);
+-                        ++dest;
+-                    }
+-                }
+-            }
++            if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
++                memset ((void*) dest, colour.getRed(), (size_t) width * 3);   // if all the component values are the same, we can cheat..
+             else
+             {
+                 JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
+-- 
+2.21.0
+

recipes-musicians/distrho/dpf-plugins.bb

@@ -4,37 +4,43 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=ec024abddfab2ee463c8c1ad98883d12 \
 "
 
-SRC_URI = "git://github.com/DISTRHO/DPF-Plugins.git"
-SRCREV = "0530b4309bf5f451c3ee00503acc9c997d30353c"
+SRC_URI = " \
+    git://github.com/DISTRHO/DPF-Plugins.git \
+"
+
+SRCREV = "3adff289617ed32f9d0cb679b05e430531cbf0dd"
 S = "${WORKDIR}/git"
-PV = "v1.3"
+PV = "v1.1+git${SRCPV}"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit pkgconfig lv2-turtle-helper pack_audio_plugins distro_features_check 
+inherit qemu-ext distro_features_check pkgconfig pack_audio_plugins
 
-# TODO standalone: *.desktop
+# TODO standalones: DEPEND jack / install / *.desktop
 DEPENDS += " \
     virtual/libgl \
-    cairo \
     ladspa-sdk \
     lv2 \
-    liblo \
-    jack \
     projectm \
 "
 
-EXTRA_OEMAKE += " \
-    NOOPT=true \
-    SKIP_STRIPPING=true \
-"
+do_compile_prepend() {
+    export NOOPT=true
+    rm -f ${WORKDIR}/lv2_ttl_generator-data
+    # 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' ${S}/dpf/utils/generate-ttl.sh
+}
+
+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}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!"
+    done
+}
 
 do_install() {
-    install -d ${D}${bindir}
-    for executable in `find ${S}/bin/ -executable -mindepth 1 -maxdepth 1 -type f ! -name '*.so'`; do
-        install -m 755 $executable ${D}${bindir}
-    done
-
     install -d ${D}${libdir}/ladspa
     for plugin in `find ${S}/bin/ -name *ladspa.so`; do
         install -m 644 $plugin ${D}${libdir}/ladspa/
@@ -55,5 +61,5 @@ do_install() {
     done
 }
 
-PACKAGES =+ "${PN}-standalone"
-FILES_${PN}-standalone = "${bindir}"
+# Have not found what causes stripping - debugging of plugins is unlikely
+INSANE_SKIP_${PN} = "already-stripped"

recipes-musicians/distrho/lv2-ttl-generator.bb

@@ -1,11 +1,11 @@
 SUMMARY = "lv2-ttl-generator-native"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE;md5=87cb0d450c5426796754d1261693dc57 \
+    file://LICENSE;md5=7b4d7947003bd60e5475fc61c6d014da \
 "
 
 SRC_URI = "git://github.com/DISTRHO/DPF.git"
-SRCREV = "14842be64ba309b8717592c5cf461925fa8a98af"
+SRCREV = "70cec6a9d0222b32abdcaec02cd7b01378c4d78b"
 S = "${WORKDIR}/git"
 PV = "0.0.0+git${SRCPV}"
 

recipes-musicians/drobilla/files/0001-Do-not-inject-usr-local-include-to-include-paths.patch

@@ -0,0 +1,31 @@
+From 36b834661ac4169db20c682bddfdcdf96df5a2f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 19 Jan 2019 00:44:13 +0100
+Subject: [PATCH] Do not inject /usr/local/include to include paths
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ waflib/extras/autowaf.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/waflib/extras/autowaf.py b/waflib/extras/autowaf.py
+index feaae3c6..119c95b5 100644
+--- a/waflib/extras/autowaf.py
++++ b/waflib/extras/autowaf.py
+@@ -189,8 +189,6 @@ def check_pkg(conf, name, **args):
+             if 'COMPILER_CXX' in conf.env:
+                 conf.env.append_value('CXXFLAGS', ['-isystem', path])
+ 
+-        conf.env.append_value('CXXFLAGS', ['-isystem', '/usr/local/include'])
+-
+ def normpath(path):
+     if sys.platform == 'win32':
+         return os.path.normpath(path).replace('\\', '/')
+-- 
+2.20.1
+

recipes-musicians/drobilla/files/0001-Fix-build-for-python3-only-environments.patch

@@ -1,25 +0,0 @@
-From 1c871f1154cd67b00f1fc41d49fb94bddbf4b714 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 6 Dec 2019 18:11:09 +0100
-Subject: [PATCH] Fix build for python3-only environments
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks for upgrading waflib
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- waf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/waf b/waf
-index 887215c..2538272 100755
---- a/waf
-+++ b/waf
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Minimal waf script for projects that include waflib directly
- 

recipes-musicians/drobilla/ganv_git.bb

@@ -13,9 +13,9 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    git://git.drobilla.net/ganv.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
+    git://git.drobilla.net/ganv.git;protocol=http \
+    file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
 "
-SRCREV = "87bd186ede49ae3a7e8402b148f1bd26344ce4db"
+SRCREV = "ccc9b971ab206fa3dc32a432a3e76db976192f58"
 S = "${WORKDIR}/git"
-PV = "1.5.4+git${SRCPV}"
+PV = "1.4.2+git${SRCPV}"

recipes-musicians/drobilla/ingen_git.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://drobilla.net/software/ingen"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
-inherit waf pkgconfig gtk-icon-cache pack_audio_plugins python3native
+inherit waf pkgconfig gtk-icon-cache pack_audio_plugins pythonnative
 
 DEPENDS += " \
     boost \
@@ -16,10 +16,10 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    gitsm://github.com/drobilla/ingen.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
+    git://github.com/drobilla/ingen.git \
+    file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
 "
-SRCREV = "36949a845cf79e105445b9bc8656f2560469dc4d"
+SRCREV = "cc3d7ef610e5f93086eb46406cc600ee81a23e98"
 S = "${WORKDIR}/git"
 PV = "0.5.1+git${SRCPV}"
 
@@ -37,7 +37,7 @@ PACKAGECONFIG[doc] = "--docs,,${DOCDEPENDS}"
 
 PACKAGES =+ "${PN}-standalone ${PN}-python"
 
-FILES_SOLIBSDEV = "${libdir}/libingen-*${SOLIBSDEV}"
+FILES_SOLIBSDEV = "${libdir}/libingen${SOLIBSDEV}"
 
 FILES_${PN} += " \
     ${libdir}/libingen_*.so \

recipes-musicians/drobilla/jalv_git.bb

@@ -1,7 +1,7 @@
 SUMMARY = "Jalv is a simple but fully featured LV2 host for Jack"
 HOMEPAGE = "http://drobilla.net/software/jalv"
 LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2b0c9f0c37e43f926aac5d7732f06dfb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb60cfffc455677d4f11cf7f36c12093"
 
 inherit waf pkgconfig gtk-icon-cache
 
@@ -20,12 +20,12 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    gitsm://github.com/drobilla/jalv.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
+    git://github.com/drobilla/jalv.git \
+    file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
 "
-SRCREV = "15f779a8603bc3f020e7000189900c52964771cd"
+SRCREV = "8311df91cc212adf3220acfcb50ab63414fe9dd6"
 S = "${WORKDIR}/git"
-PV = "1.6.4+git${SRCPV}"
+PV = "1.6.0+git${SRCPV}"
 
 FILES_${PN} += " \
     ${libdir}/jack \

recipes-musicians/drobilla/lilv_0.24.4.bb

@@ -0,0 +1,14 @@
+SUMMARY = "C library providing simple use of LV2 plugins"
+HOMEPAGE = "http://drobilla.net/software/lilv"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7aceb3a3edc99517b08f5cdd557e11fb"
+
+inherit waf bash-completion pkgconfig
+
+DEPENDS += "lv2 serd sord sratom"
+
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "fb340958a6df5a683bf25e291493dc4d"
+SRC_URI[sha256sum] = "c33b84b7a6e8e8fffb412fbcd6f69e59ca297ef3e29d829249b4ccc94f634438"
+
+EXTRA_OECONF = "--configdir=${sysconfdir} --dyn-manifest"

recipes-musicians/drobilla/lilv_git.bb

@@ -1,21 +0,0 @@
-SUMMARY = "C library providing simple use of LV2 plugins"
-HOMEPAGE = "http://drobilla.net/software/lilv"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0c6c8928b7dc2190a0aff762ae5a0f64"
-
-inherit waf python3-dir bash-completion pkgconfig
-
-DEPENDS += "lv2 serd sord sratom"
-
-SRC_URI = " \
-    gitsm://github.com/drobilla/lilv.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "425af428afb969ec2562bdf269967778e067384d"
-S = "${WORKDIR}/git"
-PV = "0.24.6"
-EXTRA_OECONF = "--configdir=${sysconfdir} --dyn-manifest"
-
-PACKAGES += "${PN}-python3"
-FILES_${PN}-python3 += "${PYTHON_SITEPACKAGES_DIR}"
-RDEPENDS_${PN}-python3 += "python3-core"

recipes-musicians/drobilla/lv2.inc

@@ -3,12 +3,11 @@ LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0383f162366b0c5a316292759a55d292"
 
 SRC_URI = " \
-    gitsm://github.com/drobilla/lv2.git \
+    git://github.com/drobilla/lv2.git \
     file://0001-Output-more-details-on-import-error-to-catch-missing.patch \
-    file://0001-Fix-build-for-python3-only-environments.patch \
 "
 S = "${WORKDIR}/git"
-SRCREV = "06d3f56a39be35b73b7c687920da871b24913edd"
-PV = "1.17.0+git${SRCPV}"
+SRCREV = "96a6283a5fe023c59113242631f337da5f0eb278"
+PV = "1.14.0+git${SRCPV}"
 
 inherit waf pkgconfig

recipes-musicians/drobilla/mda-lv2_1.2.2.bb

@@ -9,12 +9,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "lv2"
 
-SRC_URI = " \
-    http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRC_URI[md5sum] = "57feb6b58b195f87f8b3e436f3b56076"
-SRC_URI[sha256sum] = "a81a00e19594881174526cd6ee7a3e301236e0ca25191982f5c9af5eb8d96ca8"
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "1962f48c54eafe52a3d2471cd3072aa8"
+SRC_URI[sha256sum] = "a476c31ed9f8b009ebacc32a02d06ba9584c0d0d03f03dd62b1354d10a030442"
 
 EXTRA_OECONF = " \
     --lv2dir=${libdir}/lv2 \

recipes-musicians/drobilla/patchage_git.bb

@@ -13,9 +13,9 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    gitsm://gitlab.com/drobilla/patchage.git;protocol=https \
-    file://0001-Fix-build-for-python3-only-environments.patch \
+     git://git.drobilla.net/patchage.git;protocol=http \
+     file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
 "
-SRCREV = "0a175df57e8d55d67a8b5fe8308f35dd895b91cf"
-PV = "1.0.1+git${SRCPV}"
+SRCREV = "b69a38d171758c6e979d74541fc21d12b7e6abda"
+PV = "1.0.0+git${SRCPV}"
 S = "${WORKDIR}/git"

recipes-musicians/drobilla/raul_git.bb

@@ -6,10 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit waf
 
-SRC_URI = " \
-    gitsm://github.com/drobilla/raul.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "e87bb398f025912fb989a09f1450b838b251aea1"
+SRC_URI = "git://github.com/drobilla/raul.git"
+SRCREV = "5eb7a555de2291f4df8c75ce261c555552725beb"
 S = "${WORKDIR}/git"
-PV = "1.0.0+git${SRCPV}"
+PV = "0.8.10+git${SRCPV}"

recipes-musicians/drobilla/serd_0.30.0.bb

@@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7aceb3a3edc99517b08f5cdd557e11fb"
 
 inherit waf
 
-SRC_URI = " \
-    gitsm://github.com/drobilla/serd.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "2efb107eb4d4381198de51bd4f092ae1ead02e31"
-S = "${WORKDIR}/git"
-PV = "0.30.3+git${SRCPV}"
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "82243362b8b5a47dd46dac7ae893f562"
+SRC_URI[sha256sum] = "6efb0efa5c2155e6bbac941cddeeabb7ed26d70a57d24178894ff169d8f6cefb"

recipes-musicians/drobilla/sord_0.16.2.bb

@@ -7,10 +7,6 @@ inherit waf pkgconfig
 
 DEPENDS += "libpcre serd"
 
-SRC_URI = " \
-    gitsm://github.com/drobilla/sord.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "834610cd3faceff24c083738dbe88a56d412368c"
-S = "${WORKDIR}/git"
-PV = "0.16.4+git${SRCPV}"
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "eb1d1c62ffb5153d5e1f5d12a3b7279b"
+SRC_URI[sha256sum] = "09f51174dd8f3efbd95f44f0bb0b165f08e066e052d40095de59de787987da8d"

recipes-musicians/drobilla/sratom_0.6.2.bb

@@ -7,11 +7,6 @@ inherit waf pkgconfig
 
 DEPENDS += "lv2 serd sord"
 
-SRC_URI = " \
-    gitsm://github.com/drobilla/sratom.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "2a585c391df6d8d9b0c92e850eab891b6a8f74f3"
-S = "${WORKDIR}/git"
-PV = "0.6.4+git${SRCPV}"
-
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "aa3c540032da43cf6cf68f684983d7f5"
+SRC_URI[sha256sum] = "0a514a55d6b6cb7b5d6f32d1dcb78a1e6e54537fa22fce533e4ef6adf240e853"

recipes-musicians/drobilla/suil_0.10.4.bb

@@ -9,12 +9,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "gtk+ gtk+3 qtbase lv2"
 
-SRC_URI = " \
-    gitsm://github.com/drobilla/suil.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "5d45fda230192d47a4afadecdf3dce038b8d6fe9"
-S = "${WORKDIR}/git"
-PV = "0.10.6+git${SRCPV}"
+SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "b5a0ccb70ec0791531ee69f3a5b86ab6"
+SRC_URI[sha256sum] = "a1e9899012790eef8867b5475853d76689b246cca88a99ac0d379a6c0d85c72b"
 
 FILES_${PN} += "${libdir}/suil-0"

recipes-musicians/drumgizmo/drumgizmo.inc

@@ -4,6 +4,6 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 SRC_URI = "http://www.drumgizmo.org/releases/${BPN}-${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "fb2340ab61062e0814f4539657dc14ec"
-SRC_URI[sha256sum] = "67a2d9d4aa11ee92f000cc8a49710408c2328b2581a5339be3cbfe91d99feb2e"
-PV = "0.9.18.1"
+SRC_URI[md5sum] = "370b0931f5ab95952d0b85eea2533837"
+SRC_URI[sha256sum] = "a1a31b2af5544e39e8e19c370fa6fee0a372a14fffa762d4d12debf4e711ec9c"
+PV = "0.9.17"

recipes-musicians/drumgizmo/files/0003-Do-not-create-Manifest.ttl-with-cross-ttlgen.patch

@@ -1,6 +1,6 @@
 From 5e5395fb24a2fac8e5377aba16e5a47ccfba977f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 24 Oct 2019 21:47:59 +0200
+Date: Wed, 31 Jul 2019 20:20:25 +0200
 Subject: [PATCH] Do not create Manifest.ttl with cross ttlgen
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,15 +14,15 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plugin/Makefile.am b/plugin/Makefile.am
-index 6c0d324..5b36f21 100644
+index 7751154..d22f9c5 100644
 --- a/plugin/Makefile.am
 +++ b/plugin/Makefile.am
-@@ -66,7 +66,7 @@ UITYPE=CocoaUI
- endif
+@@ -42,7 +42,7 @@ ttlgen_SOURCES = \
+ 	$(top_srcdir)/plugin/plugingizmo/ttlgen.cc
  
  manifest.ttl : ttlgen drumgizmo.la
--	./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
-+	echo ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
+-	./ttlgen .libs/drumgizmo.so manifest.ttl
++	echo ./ttlgen .libs/drumgizmo.so manifest.ttl
  
  
  #######

recipes-musicians/hydrogen/hydrogen_git.bb

@@ -92,8 +92,8 @@ PV ="1.0.0~beta1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-SRC_URI[drumkit-list.md5sum] = "a690b411370deb00439c1fb9dbbab1f7"
-SRC_URI[drumkit-list.sha256sum] = "c5254e76c2d5d16e4a9674e0f226a3fe49103f9cdc938950598a8b780fd06108"
+SRC_URI[drumkit-list.md5sum] = "d7c54dba04092112fb012c1a0acc6404"
+SRC_URI[drumkit-list.sha256sum] = "c4ddfcff63e57e72ab376a9b85a1fdf7ba47ec244dcca45ab95984adfd585780"
 
 SRC_URI[Audiophob.md5sum] = "24cb2577a447bbd72aab769aacb3e8b4"
 SRC_URI[Audiophob.sha256sum] = "70b71304221a1287f257ed9a03bfb221af6ce335deec3a3385237e6be6fa9e0c"

recipes-musicians/ir.lv2/files/0001-Makefile-Do-not-add-usr-include-to-include-paths.patch

@@ -1,40 +0,0 @@
-From 2cb90fd46943517f271a666f6c258bcea89e82af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 1 Sep 2019 23:39:49 +0200
-Subject: [PATCH] Makefile: Do not add /usr/include to include paths
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 031f865..39ae139 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@ CC ?= gcc
- CXX ?= g++
- 
- # change "-O2 -ffast-math" to "-g -O0" below if you want to debug the plugin
--CPPFLAGS += -Wall -I. -I/usr/include `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -O2 -ffast-math
-+CPPFLAGS += -Wall -I. `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -O2 -ffast-math
- LIBS += -lc -lm -lzita-convolver -lsamplerate -lsndfile `pkg-config --libs gthread-2.0` `pkg-config --libs gtk+-2.0`
- 
- ifeq ($(shell pkg-config --atleast-version='2.16' gtk+-2.0; echo $$?), 1)
-@@ -31,7 +31,7 @@ ifeq ($(shell pkg-config --atleast-version='2.20' gtk+-2.0; echo $$?), 0)
-    CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
- endif
- 
--C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -O2 -ffast-math
-+C4CFLAGS = -Wall -I. `pkg-config --cflags gthread-2.0` -O2 -ffast-math
- C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
- 
- all: ir.so ir_gui.so
--- 
-2.21.0
-

recipes-musicians/ir.lv2/files/0002-Makefile-force-correct-installation.patch

@@ -1,35 +0,0 @@
-From 32881acc0258680b3f61e2e8ea532223eb4db353 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 1 Sep 2019 23:45:26 +0200
-Subject: [PATCH] Makefile: force correct installation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- Makefile | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 031f865..a843428 100644
---- a/Makefile
-+++ b/Makefile
-@@ -7,12 +7,7 @@
- BUNDLE = ir.lv2
- PREFIX ?= /usr
- 
--user = $(shell whoami)
--ifeq ($(user),root)
- INSTDIR ?= $(DESTDIR)$(PREFIX)/lib/lv2
--else 
--INSTDIR ?= ~/.lv2
--endif
- 
- INST_FILES = ir.so ir_gui.so ir.ttl manifest.ttl
- 
--- 
-2.21.0
-

recipes-musicians/ir.lv2/ir.lv2-automatable.bb

@@ -1,10 +0,0 @@
-require ir.lv2.inc
-
-SUMMARY = "IR LV2 convolution reverb (automatable)"
-
-IR_LV2_BRANCH = "automatable"
-SRCREV = "a523bba0f336d26197b271b64799c4f369e487a8"
-PV = "1.3.4+git${SRCPV}"
-
-IR_LV2_VARIANT = "auto"
-IR_LV2_DOAP_EXTENSION = "automatable"

recipes-musicians/ir.lv2/ir.lv2-zero-latency.bb

@@ -1,10 +0,0 @@
-require ir.lv2.inc
-
-SUMMARY = "IR LV2 convolution reverb (zero-latency)"
-
-IR_LV2_BRANCH = "zero-latency"
-SRCREV = "38bf3ec7d370d8234dd55be99c14cf9533b43c60"
-PV = "1.2.4+git${SRCPV}"
-
-IR_LV2_VARIANT = "zero"
-IR_LV2_DOAP_EXTENSION = "zero-latency"

recipes-musicians/ir.lv2/ir.lv2.inc

@@ -1,40 +0,0 @@
-HOMEPAGE = "http://tomszilagyi.github.io/plugins/ir.lv2/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-inherit pkgconfig
-
-DEPENDS += " \
-    gtk+ \
-    lv2 \
-    libsndfile1 \
-    libsamplerate0 \
-    zita-convolver \
-"
-
-SRC_URI = " \
-    git://github.com/tomszilagyi/ir.lv2.git;branch=${IR_LV2_BRANCH} \
-    file://0001-Makefile-Do-not-add-usr-include-to-include-paths.patch \
-    file://0002-Makefile-force-correct-installation.patch \
-"
-S = "${WORKDIR}/git"
-
-LV2_NAME = "http://tomszilagyi.github.io/plugins/lv2/ir"
-IR_LV2_VARIANT ?= ""
-IR_LV2_DOAP_EXTENSION ?= ""
-
-do_compile_prepend() {
-    sed -i 's|${LV2_NAME}|${LV2_NAME}_${IR_LV2_VARIANT}|g' `grep -rl '${LV2_NAME}'`
-    sed -i 's|ir.so|ir_${IR_LV2_VARIANT}.so|g' `grep -rl ir.so`
-    sed -i 's|ir_gui.so|ir_gui_${IR_LV2_VARIANT}.so|g' `grep -rl ir_gui.so`
-}
-
-do_install() {
-    DESTDIR=${D} PREFIX=${prefix} oe_runmake install
-    mv ${D}${libdir}/lv2/ir.lv2 ${D}${libdir}/lv2/ir_${IR_LV2_VARIANT}.lv2
-    mv ${D}${libdir}/lv2/ir_${IR_LV2_VARIANT}.lv2/ir.ttl ${D}${libdir}/lv2/ir_${IR_LV2_VARIANT}.lv2/ir_${IR_LV2_VARIANT}.ttl 
-    sed -i 's|ir.ttl|ir_${IR_LV2_VARIANT}.ttl|g' ${D}${libdir}/lv2/ir_${IR_LV2_VARIANT}.lv2/manifest.ttl
-    sed -i 's|doap:name "IR"|doap:name "IR (${IR_LV2_DOAP_EXTENSION})"|g' ${D}${libdir}/lv2/ir_${IR_LV2_VARIANT}.lv2/ir_${IR_LV2_VARIANT}.ttl
-}
-
-FILES_${PN} += "${libdir}/lv2/"

recipes-musicians/kushview/kushview-element/0001-Fix-build-for-python3-only-environments.patch

@@ -1,28 +0,0 @@
-From 7637d0c9c836831eb23af2d72dd8195c65b0aca0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 9 Dec 2019 20:25:10 +0100
-Subject: [PATCH] Fix build for python3-only environments
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- waf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/waf b/waf
-index 061fb98..3208571 100755
---- a/waf
-+++ b/waf
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: latin-1
- # Thomas Nagy, 2005-2018
- #
--- 
-2.21.0
-

recipes-musicians/kushview/kushview-element_git.bb

@@ -1,39 +0,0 @@
-SUMMARY = "Element Audio Plugin Host"
-HOMEPAGE = "https://kushview.net/element/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-inherit waf pkgconfig distro_features_check
-
-REQUIRED_DISTRO_FEATURE = "x11"
-
-DEPENDS += " \
-    boost \
-    curl \
-    freetype \
-    libxinerama \
-    alsa-lib \
-    lv2 \
-    lilv \
-    suil \
-    ladspa-sdk \
-"
-
-SRC_URI = " \
-    gitsm://github.com/kushview/Element.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "ad065721569ea8174811579fd700b84f802e3ff2"
-PV = "0.42.0"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = " \
-    --prefix=${prefix} \
-    --libdir=${libdir} \
-"
-
-FILES_${PN} += "${datadir}/element"
-
-# TBD - we should send a fix upstream..
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/libelement-0.so"

recipes-musicians/linuxsampler/gigedit/0001-remove-broken-HAS_PANGOMM_CPP11_ENUMS-ifdeffery.patch

@@ -10,20 +10,19 @@ Upstream-Status: pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/gigedit/compat.h | 18 ------------------
- 1 file changed, 18 deletions(-)
+ src/gigedit/compat.h | 17 -----------------
+ 1 file changed, 17 deletions(-)
 
 diff --git a/src/gigedit/compat.h b/src/gigedit/compat.h
-index e03b854..e62c27d 100644
+index 5d34a49..5886bbe 100644
 --- a/src/gigedit/compat.h
 +++ b/src/gigedit/compat.h
-@@ -50,15 +50,6 @@
+@@ -50,14 +50,6 @@
  # include <gtkmmconfig.h>
  #endif
  
--#ifndef HAS_PANGOMM_CPP11_ENUMS
--   // new enums introduced in unstable pangomm 2.41.3, but not in stable 2.42
--# if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && ((PANGOMM_MINOR_VERSION == 41 && PANGOMM_MICRO_VERSION >= 3) || PANGOMM_MINOR_VERSION > 42))
+-#ifndef HAS_PANGOMM_CPP11_ENUMS // pangomm > 2.40 : <- just a "guess"
+-# if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && PANGOMM_MINOR_VERSION > 40)
 -#  define HAS_PANGOMM_CPP11_ENUMS 1
 -# else
 -#  define HAS_PANGOMM_CPP11_ENUMS 0
@@ -33,7 +32,7 @@ index e03b854..e62c27d 100644
  // Gtk::UIManager had been replaced by Gtk::Builder in GTKMM 3 and removed in GTKMM 4
  // Gtk::ActionGroup had been replaced by Gio::ActionGroup in GTKMM 3 and removed in GTKMM 4
  #if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.22 :
-@@ -188,15 +179,6 @@ typedef Gtk::ActionGroup ActionGroup;
+@@ -187,15 +179,6 @@ typedef Gtk::ActionGroup ActionGroup;
  typedef Gtk::Action Action;
  #endif // USE_GLIB_ACTION
  
@@ -50,5 +49,5 @@ index e03b854..e62c27d 100644
  # include <gdkmm/types.h>
  # include <gdkmm/cursor.h>
 -- 
-2.21.0
+2.20.1
 

recipes-musicians/linuxsampler/gigedit/0002-Fix-build-with-gtkmm-3.24.patch

@@ -0,0 +1,292 @@
+From ed3a789f61e547275510082688605193eb4760a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 22 Mar 2019 19:18:44 +0100
+Subject: [PATCH] Fix build with gtkmm 3.24
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Seems the author expected 3.22 being the last of 3.x series
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/gigedit/CombineInstrumentsDialog.cpp |  2 +-
+ src/gigedit/MacroEditor.cpp              |  2 +-
+ src/gigedit/ReferencesView.cpp           |  2 +-
+ src/gigedit/compat.h                     | 26 ++++++++----------------
+ src/gigedit/dimensionmanager.cpp         |  2 +-
+ src/gigedit/dimregionchooser.cpp         |  2 +-
+ src/gigedit/mainwindow.cpp               | 16 +++++++--------
+ src/gigedit/midirules.cpp                |  8 ++++----
+ src/gigedit/regionchooser.cpp            |  4 ++--
+ src/gigedit/scripteditor.cpp             |  2 +-
+ 10 files changed, 28 insertions(+), 38 deletions(-)
+
+diff --git a/src/gigedit/CombineInstrumentsDialog.cpp b/src/gigedit/CombineInstrumentsDialog.cpp
+index 9ba85f0..d3ee379 100644
+--- a/src/gigedit/CombineInstrumentsDialog.cpp
++++ b/src/gigedit/CombineInstrumentsDialog.cpp
+@@ -941,7 +941,7 @@ CombineInstrumentsDialog::CombineInstrumentsDialog(Gtk::Window& parent, gig::Fil
+     }
+ 
+     m_buttonBox.set_layout(Gtk::BUTTONBOX_END);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     m_buttonBox.set_margin(5);
+ #else
+     m_buttonBox.set_border_width(5);
+diff --git a/src/gigedit/MacroEditor.cpp b/src/gigedit/MacroEditor.cpp
+index 75277bf..104a6a1 100644
+--- a/src/gigedit/MacroEditor.cpp
++++ b/src/gigedit/MacroEditor.cpp
+@@ -232,7 +232,7 @@ void MacroEditor::buildTreeView(const Gtk::TreeModel::Row& parentRow, const Seri
+         const Serialization::Member& member = parentObject.members()[iMember];
+         const Serialization::Object& object = m_macro.objectByUID(member.uid());
+         
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+         //HACK: on GTKMM 3.9x append() below requires TreeNodeChildren, parentRow.children() returns TreeNodeConstChildren though, probably going to be fixed before final GTKMM4 release though.
+         const Gtk::TreeNodeConstChildren& children = parentRow.children();
+         Gtk::TreeNodeChildren* const pChildren = (Gtk::TreeNodeChildren* const) &children;
+diff --git a/src/gigedit/ReferencesView.cpp b/src/gigedit/ReferencesView.cpp
+index 2e65bc0..e89fba2 100644
+--- a/src/gigedit/ReferencesView.cpp
++++ b/src/gigedit/ReferencesView.cpp
+@@ -66,7 +66,7 @@ ReferencesView::ReferencesView(Gtk::Window& parent) :
+     );
+ 
+     m_buttonBox.set_layout(Gtk::BUTTONBOX_END);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     m_buttonBox.set_margin(5);
+ #else
+     m_buttonBox.set_border_width(5);
+diff --git a/src/gigedit/compat.h b/src/gigedit/compat.h
+index 5886bbe..52af58e 100644
+--- a/src/gigedit/compat.h
++++ b/src/gigedit/compat.h
+@@ -52,8 +52,8 @@
+ 
+ // Gtk::UIManager had been replaced by Gtk::Builder in GTKMM 3 and removed in GTKMM 4
+ // Gtk::ActionGroup had been replaced by Gio::ActionGroup in GTKMM 3 and removed in GTKMM 4
+-#if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.22 :
+-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if !defined(USE_GTKMM_BUILDER) || !defined(USE_GLIB_ACTION) // gtkmm > 3.24 :
++# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ #  define USE_GTKMM_BUILDER 1
+ #  define USE_GLIB_ACTION 1
+ # else
+@@ -70,8 +70,8 @@
+ # endif
+ #endif
+ 
+-#ifndef HAS_GTKMM_CPP11_ENUMS // gtkmm > 3.22
+-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#ifndef HAS_GTKMM_CPP11_ENUMS // gtkmm > 3.24
++# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ #  define HAS_GTKMM_CPP11_ENUMS 1
+ # else
+ #  define HAS_GTKMM_CPP11_ENUMS 0
+@@ -79,8 +79,8 @@
+ #endif
+ 
+ // alignment.h had been removed in GTKMM 4
+-#ifndef HAS_GTKMM_ALIGNMENT // gtkmm > 3.22 :
+-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#ifndef HAS_GTKMM_ALIGNMENT // gtkmm > 3.24 :
++# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ #  define HAS_GTKMM_ALIGNMENT 0
+ # else
+ #  define HAS_GTKMM_ALIGNMENT 1
+@@ -90,8 +90,8 @@
+ // Gtk::Table had been replaced by Gtk::Grid in GTKMM 3 and removed in GTKMM 4
+ // stock.h had been removed in GTKMM 4
+ // Gtk::VBox, Gtk::HBox and Gtk::HButtonBox had been replaced by Gtk::Box in GTKMM 3 and removed in GTKMM 4
+-#if !defined(USE_GTKMM_GRID) || !defined(HAS_GTKMM_STOCK) || !defined(USE_GTKMM_BOX) || !defined(USE_GTKMM_PANED) // gtkmm > 3.22 :
+-# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if !defined(USE_GTKMM_GRID) || !defined(HAS_GTKMM_STOCK) || !defined(USE_GTKMM_BOX) || !defined(USE_GTKMM_PANED) // gtkmm > 3.24 :
++# if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ #  define USE_GTKMM_GRID 1
+ #  define HAS_GTKMM_STOCK 0
+ #  define USE_GTKMM_BOX 1
+diff --git a/src/gigedit/dimensionmanager.cpp b/src/gigedit/dimensionmanager.cpp
+index 5bc0617..42138a2 100644
+--- a/src/gigedit/dimensionmanager.cpp
++++ b/src/gigedit/dimensionmanager.cpp
+@@ -278,7 +278,7 @@ DimensionManager::DimensionManager() :
+     scrolledWindow.show();
+     vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
+     buttonBox.set_layout(Gtk::BUTTONBOX_END);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     buttonBox.set_margin(5);
+ #else
+     buttonBox.set_border_width(5);
+diff --git a/src/gigedit/dimregionchooser.cpp b/src/gigedit/dimregionchooser.cpp
+index 978c88d..d39a6e9 100644
+--- a/src/gigedit/dimregionchooser.cpp
++++ b/src/gigedit/dimregionchooser.cpp
+@@ -288,7 +288,7 @@ DimRegionChooser::DimRegionChooser(Gtk::Window& window) :
+ #endif // USE_GTKMM_BUILDER
+ 
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ # warning GTKMM4 event registration code missing for dimregionchooser!
+     //add_events(Gdk::EventMask::BUTTON_PRESS_MASK);
+ #else
+diff --git a/src/gigedit/mainwindow.cpp b/src/gigedit/mainwindow.cpp
+index c66b823..dc559d4 100644
+--- a/src/gigedit/mainwindow.cpp
++++ b/src/gigedit/mainwindow.cpp
+@@ -2704,7 +2704,7 @@ PropDialog::PropDialog()
+ #endif
+ 
+     add(vbox);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     table.set_margin(5);
+ #else
+     table.set_border_width(5);
+@@ -2712,7 +2712,7 @@ PropDialog::PropDialog()
+     vbox.add(table);
+     vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
+     buttonBox.set_layout(Gtk::BUTTONBOX_END);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     buttonBox.set_margin(5);
+ #else
+     buttonBox.set_border_width(5);
+@@ -2863,7 +2863,7 @@ InstrumentProps::InstrumentProps() :
+     table.add(eDimensionKeyRangeHigh);
+ 
+     add(vbox);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     table.set_margin(5);
+ #else
+     table.set_border_width(5);
+@@ -2872,7 +2872,7 @@ InstrumentProps::InstrumentProps() :
+     table.show();
+     vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);
+     buttonBox.set_layout(Gtk::BUTTONBOX_END);
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     buttonBox.set_margin(5);
+ #else
+     buttonBox.set_border_width(5);
+@@ -3325,7 +3325,7 @@ void MainWindow::select_instrument(gig::Instrument* instrument) {
+             show_intruments_tab();
+             m_TreeView.get_selection()->unselect_all();
+             
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+             auto iterSel = model->children()[i].get_iter();
+             m_TreeView.get_selection()->select(iterSel);
+ #else
+@@ -3355,7 +3355,7 @@ bool MainWindow::select_dimension_region(gig::DimensionRegion* dimRgn) {
+             // select and show the respective instrument in the list view
+             show_intruments_tab();
+             m_TreeView.get_selection()->unselect_all();
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+             auto iterSel = model->children()[i].get_iter();
+             m_TreeView.get_selection()->select(iterSel);
+ #else
+@@ -3391,7 +3391,7 @@ void MainWindow::select_sample(gig::Sample* sample) {
+             if (rowSample[m_SamplesModel.m_col_sample] == sample) {
+                 show_samples_tab();
+                 m_TreeViewSamples.get_selection()->unselect_all();
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+                 auto iterSel = rowGroup.children()[s].get_iter();
+                 m_TreeViewSamples.get_selection()->select(iterSel);
+ #else
+@@ -4650,7 +4650,7 @@ bool MainWindow::instrument_row_visible(const Gtk::TreeModel::const_iterator& it
+     trim(pattern);
+     if (pattern.empty()) return true;
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     //HACK: on GTKMM4 development branch const_iterator cannot be easily converted to iterator, probably going to be fixed before final GTKMM4 release though.
+     Gtk::TreeModel::Row row = **(Gtk::TreeModel::iterator*)(&iter);
+ #else
+diff --git a/src/gigedit/midirules.cpp b/src/gigedit/midirules.cpp
+index 0f1b041..aee093e 100644
+--- a/src/gigedit/midirules.cpp
++++ b/src/gigedit/midirules.cpp
+@@ -40,7 +40,7 @@ MidiRules::MidiRules() :
+     }
+ 
+     set_title(_("Midi Rules"));
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     set_margin(6);
+ #else
+     set_border_width(6);
+@@ -48,7 +48,7 @@ MidiRules::MidiRules() :
+ 
+     add(vbox);
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     hbox.set_margin(6);
+ #else
+     hbox.set_border_width(6);
+@@ -69,14 +69,14 @@ MidiRules::MidiRules() :
+         sigc::mem_fun(*this, &MidiRules::combo_changed));
+     vbox.pack_start(hbox, Gtk::PACK_SHRINK);
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     box.set_margin(6);
+ #else
+     box.set_border_width(6);
+ #endif
+     vbox.pack_start(box);
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     button_box.set_margin(6);
+ #else
+     button_box.set_border_width(6);
+diff --git a/src/gigedit/regionchooser.cpp b/src/gigedit/regionchooser.cpp
+index f1136eb..3e0f16a 100644
+--- a/src/gigedit/regionchooser.cpp
++++ b/src/gigedit/regionchooser.cpp
+@@ -269,7 +269,7 @@ RegionChooser::RegionChooser() :
+ 
+ #endif // USE_GTKMM_BUILDER
+ 
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+ # warning GTKMM4 event registration code missing for regionchooser!
+     //add_events(Gdk::EventMask::BUTTON_PRESS_MASK);
+ #else
+@@ -354,7 +354,7 @@ bool RegionChooser::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
+ #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
+     const Gdk::Color bg = get_style()->get_bg(Gtk::STATE_NORMAL);
+ #else
+-#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 22)
++#if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
+     GdkRGBA gdkBgRGBA;
+     gtk_style_context_get_background_color(get_style_context()->gobj(), &gdkBgRGBA);
+     const Gdk::RGBA bg = Glib::wrap(&gdkBgRGBA, true);
+diff --git a/src/gigedit/scripteditor.cpp b/src/gigedit/scripteditor.cpp
+index 66268f3..11401d8 100644
+--- a/src/gigedit/scripteditor.cpp
++++ b/src/gigedit/scripteditor.cpp
+@@ -749,7 +749,7 @@ bool ScriptEditor::on_motion_notify_event(GdkEventMotion* e) {
+     //TODO: event throttling would be a good idea here
+     updateIssueTooltip(e);
+ #endif
+-#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 22)
++#if GTKMM_MAJOR_VERSION < 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION <= 24)
+     return ManagedWindow::on_motion_notify_event(e);
+ #else
+     Gdk::EventMotion em = Glib::wrap(e, true);
+-- 
+2.20.1
+

recipes-musicians/linuxsampler/gigedit_1.1.0.bb

@@ -18,11 +18,12 @@ inherit autotools pkgconfig gtk-icon-cache
 SRC_URI = " \
     http://download.linuxsampler.org/packages/${BPN}-${PV}.tar.bz2 \
     file://0001-remove-broken-HAS_PANGOMM_CPP11_ENUMS-ifdeffery.patch \
+    file://0002-Fix-build-with-gtkmm-3.24.patch \
     file://gigedit.png \
     file://gigedit.desktop \
 "
-SRC_URI[md5sum] = "2597cfddbceb28f5e764929e6c9755ab"
-SRC_URI[sha256sum] = "2b77069302f8721fd614ae4e3ca364f1977731deb166bf5af00d389e9908ab21"
+SRC_URI[md5sum] = "1ca041c960d997dd8a58c4072056f165"
+SRC_URI[sha256sum] = "d18abe98d8bc6ec0d1ac8b8b185a25d7e2454225fcb030f80e19099c4262f720"
 
 EXTRA_OEMAKE = "LIBTOOLFLAGS='--tag=CXX'"
 

recipes-musicians/linuxsampler/libgig_4.1.0.bb

@@ -16,8 +16,8 @@ SRC_URI = " \
     http://download.linuxsampler.org/packages/${BPN}-${PV}.tar.bz2 \
     file://0001-Adjust-libdir.patch \
 "
-SRC_URI[md5sum] = "5ab37d9d7532a4cd0ed5508b08b8d1d5"
-SRC_URI[sha256sum] = "16229a46138b101eb9eda042c66d2cd652b1b3c9925a7d9577d52f2282f745ff"
+SRC_URI[md5sum] = "a2ad3f933d13332b7a2ea68de20fa4b7"
+SRC_URI[sha256sum] = "06a280278a323963042acdf13b092644cceb43ef367fcbb9ca7bbedff132bd0b"
 
 do_install_append() {
     mv ${D}${libdir}/${BPN}/* ${D}${libdir}

recipes-musicians/linuxsampler/liblscp/0001-Fix-m4-dir.patch

@@ -1,4 +1,4 @@
-From 272211214c1339aae00b90ad6079721cf176d2dc Mon Sep 17 00:00:00 2001
+From 515602e6aab05efb334ad6ddba787e35a4c27641 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Tue, 19 Mar 2019 00:42:45 +0100
 Subject: [PATCH] Fix m4 dir
@@ -6,15 +6,9 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
 Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
 ---
  Makefile.am  | 2 +-
  configure.ac | 2 +-
@@ -31,7 +25,7 @@ index 2b9751f..6e89bc1 100644
  SUBDIRS = src lscp examples @ac_doxygen@
  
 diff --git a/configure.ac b/configure.ac
-index ccadbcb..5ecbc28 100644
+index 1e06f12..6455671 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,7 +1,7 @@
@@ -41,5 +35,8 @@ index ccadbcb..5ecbc28 100644
 -AC_CONFIG_MACRO_DIR([.m4])
 +AC_CONFIG_MACRO_DIR([m4])
  
- AM_INIT_AUTOMAKE(liblscp, 0.6.0)
+ AM_INIT_AUTOMAKE(liblscp, 0.5.8)
  
+-- 
+2.20.1
+

recipes-musicians/linuxsampler/liblscp_0.5.8.bb

@@ -14,5 +14,5 @@ SRC_URI = " \
     http://download.linuxsampler.org/packages/${BPN}-${PV}.tar.gz \
     file://0001-Fix-m4-dir.patch \
 "
-SRC_URI[md5sum] = "ff0fdf2d8b654fc9bfcd32c63d977cd2"
-SRC_URI[sha256sum] = "b39c78f4be07d4cc6b791d934e6fe58c0a7bc4aa32b6ed5131e303f99bd687e6"
+SRC_URI[md5sum] = "c9ef8ba50765784b544904b854c68c00"
+SRC_URI[sha256sum] = "b611943f2f81fc58ff6852adfb2ee60789becbd3eda7ca65d300d9c0a7538e01"

recipes-musicians/linuxsampler/linuxsampler_2.1.0.bb

@@ -26,8 +26,8 @@ SRC_URI = " \
     file://0004-use-c-11-atomics-when-configured-with-disable-asm.patch \
     file://0005-Adjust-libdir.patch \
 "
-SRC_URI[md5sum] = "8fda14da0ccfc141d5af08daedccaae6"
-SRC_URI[sha256sum] = "20050b22066e9cdbdad34c0470d3c4a47f75e4af620fd98af277f5d2417132be"
+SRC_URI[md5sum] = "c57fbd1310e9189ee72acf81e63bf3d5"
+SRC_URI[sha256sum] = "4e0a49efeae9c26a223094247b7e01108d829a69618492282a203a290fbfbd39"
 
 # arch specific override - default (tested) is ARM -> no assember (ARM assembler is not suppoted)
 USE_ASM = "--disable-asm"
@@ -57,8 +57,8 @@ FILES_${PN}-tools = " \
     ${bindir}/ls_instr_script \
 "
 
-RDEPENDS_${PN_DSSI} += "${PN}"
-RDEPENDS_${PN_LV2} += "${PN}"
-RDEPENDS_${PN_VST} += "${PN}"
+RDEPENDS_${PN}-dssi += "${PN}"
+RDEPENDS_${PN}-lv2 += "${PN}"
+RDEPENDS_${PN}-vst += "${PN}"
 RDEPENDS_${PN}-standalone += "${PN}"
 

recipes-musicians/lmms/lmms.bb

@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-inherit cmake_qt5 distro_features_check pkgconfig mime gtk-icon-cache pkgconfig bash-completion
+inherit cmake_qt5 distro_features_check pkgconfig mime gtk-icon-cache pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-musicians/lmms/lmms.inc

@@ -4,6 +4,6 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2"
-SRCREV = "dbf5f47149fbb7584bf48ce9e767b9e90ee2df7e"
+SRCREV = "8568ae4eacdd3bbdae8e8eaeb1536bebce3cfeeb"
 S = "${WORKDIR}/git"
-PV = "1.2.1+git${SRCPV}"
+PV = "1.2.0+git${SRCPV}"

recipes-musicians/ninjas2/ninjas2.bb

@@ -11,7 +11,7 @@ DEPENDS = " \
     jack \
 "
 
-inherit pkgconfig lv2-turtle-helper distro_features_check pack_audio_plugins
+inherit pkgconfig qemu-ext distro_features_check pack_audio_plugins
 
 SRC_URI = "gitsm://github.com/rghvdberg/ninjas2.git"
 SRCREV = "12aa2f9d150caaf602c2f1a31cb6dd078abddde2"
@@ -20,11 +20,31 @@ PV = "0.1"
 
 REQUIRED_DISTRO_FEATURE = "x11 opengl"
 
+do_configure_prepend() {
+    # reconfigure?
+    if [ ! -f ${WORKDIR}/lv2-ttl-generator-data ] ; then
+        # We cannot run lv2-ttl-generator in cross environment so
+        # manipulate generate-ttl.sh to save lib info in ${WORKDIR}/lv2-ttl-generator-data
+        sed -i 's|"$GEN" "./$FILE"|echo "`realpath  "./$FILE"`" >> ${WORKDIR}/lv2-ttl-generator-data|g' ${S}/dpf/utils/generate-ttl.sh
+     else
+        rm -f ${WORKDIR}/lv2-ttl-generator-data
+     fi
+}
+
 EXTRA_OEMAKE += " \
     NOOPT=true \
     SKIP_STRIPPING=true \
 "
 
+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}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2-ttl-generator for ${sofile}!"
+    done
+}
+
 do_install() {
     install -d ${D}${libdir}/lv2
     for plugindir in `find ${S}/bin/ -maxdepth 1 -name *.lv2`; do

recipes-musicians/noise-repellent/noise-repellent/0001-do-not-pin-sse-flags-they-won-t-work-on-all-arches.patch

@@ -1,39 +0,0 @@
-From 11e8233da08bd812cd49370ca329aaf9f6f797cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 1 Sep 2019 22:00:00 +0200
-Subject: [PATCH] do not pin sse flags - they won't work on all arches
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 679a46c..e2866f4 100755
---- a/meson.build
-+++ b/meson.build
-@@ -17,7 +17,6 @@ nr_dep = [m_dep,fftw_dep,lv2_dep]
- if meson.get_compiler('c').get_id() == 'clang'
-   add_global_arguments('-mrecip', language : 'c')
- endif
--cflags = ['-msse','-msse2','-mfpmath=sse','-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
- 
- #install folder
- install_folder = 'nrepel.lv2'
-@@ -35,7 +34,7 @@ if current_os == 'windows'
- endif
- 
- #build of the shared object
--shared_library(lv2_name,src,name_prefix: '',dependencies: nr_dep,c_args: cflags,install: true,install_dir : install_folder)
-+shared_library(lv2_name,src,name_prefix: '',dependencies: nr_dep,install: true,install_dir : install_folder)
- 
- #Configure manifest ttl in order to replace the correct shared object extension
- manifest_conf = configuration_data()
--- 
-2.21.0
-

recipes-musicians/noise-repellent/noise-repellent_git.bb

@@ -1,29 +0,0 @@
-SUMMARY = "An lv2 plugin for broadband noise reduction"
-HOMEPAGE = "https://github.com/lucianodato/noise-repellent"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-inherit meson gtk-icon-cache
-
-DEPENDS += " \
-    fftw \
-    lv2 \
-"
-
-PV = "0.1.4+git${SRCPV}"
-SRC_URI = " \
-    git://github.com/lucianodato/noise-repellent.git \
-    file://0001-do-not-pin-sse-flags-they-won-t-work-on-all-arches.patch \
-"
-SRCREV = "9efdd0b41ec184a792087c87cbf5382f455e33ec"
-S = "${WORKDIR}/git"
-
-
-do_install_append() {
-    mkdir -p ${D}${libdir}/lv2
-    mv ${D}${prefix}/nrepel.lv2 ${D}${libdir}/lv2/
-}
-
-FILES_${PN} += " \
-    ${libdir}/lv2 \
-"

recipes-musicians/openav/luppp_git.bb

@@ -18,8 +18,8 @@ SRC_URI = " \
     git://github.com/openAVproductions/openAV-Luppp.git \
     file://0001-CMake-Remove-arch-detection-it-detects-build-host.patch \
 "
-SRCREV = "3d3ac0a1743365b958033bdd1625dd19041d2c5f"
-PV = "1.2.1"
+SRCREV = "289313ce132133d5d3c86724a1e3b488260d1728"
+PV = "1.1.1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 do_install_append() {

recipes-musicians/qmmp/qmmp_1.3.3.bb

@@ -34,8 +34,8 @@ SRC_URI = " \
     file://0001-Remove-freebsd-compilation-support.patch \
     file://0002-Hardcode-projectM-configuration-file-location.patch \
 "
-SRC_URI[md5sum] = "d08b4c397821990faeaba6cfc1342cbd"
-SRC_URI[sha256sum] = "e07d9026e5d0c53bf1a057974088363929a06f4e3785447956879b204c7d3b49"
+SRC_URI[md5sum] = "dcac0cb5817330804290584164958067"
+SRC_URI[sha256sum] = "471c93cdd15f635893c00db72865e5d475eaf85b0f00cf15c550cfb51f9ee79c"
 
 inherit cmake_qt5
 

recipes-musicians/rncbc/drumkv1.bb

@@ -18,10 +18,11 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0002-Remove-extra-rpath.patch \
 "
-PV = "0.9.11"
-SRC_URI[md5sum] = "b6bfd03d70f10dc96341c534590e9658"
-SRC_URI[sha256sum] = "a78da0dd73df549a1add4ae96120958491b27fbbc3c99b6628bf025a4eb0d2f2"
+PV = "0.9.9"
+SRC_URI[md5sum] = "2a2c6287685a3f9f2c317e597c0a9681"
+SRC_URI[sha256sum] = "03a59ce0785dd4a763747bea8dbdef6ba8b7fb2bc878fae3718c3fd95c124a0b"
 
 SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e"
 

recipes-musicians/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 15 insertions(+), 28 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a6156ef..f99502d 100644
+index f791a1d..1d46860 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -266,23 +266,9 @@ if test -x $ac_qtchooser; then
+@@ -265,23 +265,9 @@ if test -x $ac_qtchooser; then
     export QT_SELECT=5
  fi
  
@@ -45,7 +45,7 @@ index a6156ef..f99502d 100644
  
  if test "x$ac_qmake" = "xno"; then
     AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
-@@ -297,13 +283,6 @@ if test -d $ac_qt_install_path; then
+@@ -296,13 +282,6 @@ if test -d $ac_qt_install_path; then
     ac_path="$ac_qt_install_path:$ac_path"
  fi
  
@@ -59,7 +59,7 @@ index a6156ef..f99502d 100644
  AC_SUBST(ac_qmake)
  
  AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [
-@@ -339,14 +318,18 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
+@@ -338,28 +317,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
  ])
  
  # Check for Qt moc utility.
@@ -80,8 +80,7 @@ index a6156ef..f99502d 100644
  if test "x$ac_uic" = "xno"; then
     AC_MSG_ERROR([uic $ac_errmsg])
  fi
-@@ -354,7 +337,9 @@ AC_SUBST(ac_uic)
- 
+ AC_SUBST(ac_uic)
  
  # Check for Qt lupdate utility.
 -AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
@@ -89,9 +88,8 @@ index a6156ef..f99502d 100644
 +  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
 +  [ac_lupdate="$withval"], [ac_lupdate="no"])
  if test "x$ac_lupdate" = "xno"; then
-    AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path)
-    if test "x$ac_cv_lupdate" = "xno"; then
-@@ -366,7 +351,9 @@ fi
+    AC_MSG_ERROR([lupdate $ac_errmsg])
+ fi
  AC_SUBST(ac_lupdate)
  
  # Check for Qt lrelease utility.
@@ -99,9 +97,9 @@ index a6156ef..f99502d 100644
 +AC_ARG_WITH(lrelease,
 +  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
 +  [ac_lrelease="$withval"], [ac_lrelease="no"])
- if test "x$ac_lrelease" = "xno"; then
-    AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path)
-    if test "x$ac_cv_lrelease" = "xno"; then
+ if test "x$ac_release" = "xno"; then
+    AC_MSG_ERROR([lrelease $ac_errmsg])
+ fi
 -- 
-2.21.0
+2.14.5
 

recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch

@@ -0,0 +1,70 @@
+From 45215d29d71a54e79230454d698346299a9182df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 28 Oct 2018 20:51:23 +0100
+Subject: [PATCH] Remove extra rpath
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/src_jack.pro  | 2 +-
+ src/src_lv2.pro   | 2 +-
+ src/src_lv2ui.pro | 2 +-
+ src/src_ui.pro    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/src_jack.pro b/src/src_jack.pro
+index 4aa3349..d9d4415 100644
+--- a/src/src_jack.pro
++++ b/src/src_jack.pro
+@@ -75,7 +75,7 @@ unix {
+ 	mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
+ 	mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
+ 
+-	LIBS += -l$${NAME} -l$${NAME}_ui -Wl,-rpath,$${LIBDIR}
++	LIBS += -l$${NAME} -l$${NAME}_ui
+ }
+ 
+ QT += widgets xml
+diff --git a/src/src_lv2.pro b/src/src_lv2.pro
+index 069e1ee..6eb8485 100644
+--- a/src/src_lv2.pro
++++ b/src/src_lv2.pro
+@@ -59,7 +59,7 @@ unix {
+ 
+ 	QMAKE_CLEAN += $${TARGET_LV2}.so
+ 
+-	LIBS += -l$${NAME} -Wl,-rpath,$${LIBDIR}
++	LIBS += -l$${NAME}
+ }
+ 
+ QT -= gui
+diff --git a/src/src_lv2ui.pro b/src/src_lv2ui.pro
+index 50f5798..7b0bad4 100644
+--- a/src/src_lv2ui.pro
++++ b/src/src_lv2ui.pro
+@@ -59,7 +59,7 @@ unix {
+ 
+ 	QMAKE_CLEAN += $${TARGET_LV2UI}.so
+ 
+-	LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2
++	LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2
+ }
+ 
+ QT += widgets xml
+diff --git a/src/src_ui.pro b/src/src_ui.pro
+index 081e3af..132d5b4 100644
+--- a/src/src_ui.pro
++++ b/src/src_ui.pro
+@@ -69,7 +69,7 @@ unix {
+ 
+ 	target.path = $${LIBDIR}
+ 
+-	LIBS += -l$${NAME} -Wl,-rpath,$${LIBDIR}
++	LIBS += -l$${NAME}
+ }
+ 
+ QT += widgets xml

recipes-musicians/rncbc/padthv1.bb

@@ -23,11 +23,12 @@ SRC_URI = " \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     \
     ${FFTWSINGLEPATCH} \
+    file://0002-Remove-extra-rpath.patch \
     file://padthv1.conf \
 "
-PV = "0.9.11"
-SRC_URI[md5sum] = "c620734d31cabb7bea3bdcd23081d2ab"
-SRC_URI[sha256sum] = "cf1cddee41e84abbdab52fd92d676df39499568acc36eccb01aa6399a3e7ce0b"
+PV = "0.9.9"
+SRC_URI[md5sum] = "b5e9a7554c9db4849d181e58133756bf"
+SRC_URI[sha256sum] = "ab97223ef7b83e04a87e8fc433a273ba72f33d564b1e656c606e0fc5bbb6aa2b"
 
 SRC_URI[linuxsynths-padthv1-presets.md5sum] = "951484ad2fe404d233a704d444147827"
 SRC_URI[linuxsynths-padthv1-presets.sha256sum] = "ad9eadc707784b6931955b1fc63308b9e5dc59d24903e6405e9d34d30794fd0b"

recipes-musicians/rncbc/qjackctl.bb

@@ -20,9 +20,9 @@ SRC_URI = " \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://QjackCtl.conf \
 "
-SRC_URI[md5sum] = "96f9547d61bf963704df988a5074bda0"
-SRC_URI[sha256sum] = "9dd5ee9a7f0a2d1d530b10652e09972732dc210239b7c082be816f0e7bdfadcd"
-PV = "0.6.0"
+SRC_URI[md5sum] = "11c5c8d89066de04064a2f8f409adeea"
+SRC_URI[sha256sum] = "f3fa7b3c1e28d56632de10c32e978a54f94c29b0239e2b6b2622d4a49ae65ee9"
+PV = "0.5.9"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/qmidictl.bb

@@ -16,9 +16,9 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
-SRC_URI[md5sum] = "6ca36714245a0f60aa9d5198795e1bd8"
-SRC_URI[sha256sum] = "6b79f55dc47217af77012e94ab44ca93786d04ee70bdccc13f09e64a0409f89c"
-PV = "0.6.0"
+SRC_URI[md5sum] = "250e46093f4d48356a85c74ee0f5e3fd"
+SRC_URI[sha256sum] = "8b296042b5faf7ca636850303fbd52b1622cd5380d757170aeda9f866e3dd2c5"
+PV = "0.5.5"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/qmidictl/0001-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -0,0 +1,118 @@
+From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 18 Jan 2018 00:42:33 +0100
+Subject: [PATCH] find native qt build tools by configure options - auto
+ detection does not 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>
+---
+ configure.ac | 55 +++++++++++++++----------------------------------------
+ 1 file changed, 15 insertions(+), 40 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 60673c2..9f48fdd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,36 +180,10 @@ done
+ # A common error message:
+ ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+ 
+-# Check for proper qmake path/version alternatives.
+-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
++AC_ARG_WITH(qmake,
++  AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]),
++  [ac_qmake="$withval"], [ac_qmake="no"])
+ 
+-if test "x$ac_qmake" = "xno"; then
+-   if test "x$ac_qt4" = "xyes"; then
+-      AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
+-      ac_qmake=$ac_cv_qmake
+-   else
+-      AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-      ac_qmake=$ac_cv_qmake
+-   fi
+-fi
+-
+-# Check for proper Qt major version.
+-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
+-   ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)
+-   ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
+-])
+-ac_qt_version_major=$ac_cv_qt_version_major
+-if test "x$ac_qt4" = "xyes"; then
+-   if test $ac_qt_version_major -ne 4; then
+-      AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
+-      ac_qmake=$ac_cv_qmake
+-   fi
+-else
+-   if test $ac_qt_version_major -ne 5; then
+-      AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-      ac_qmake=$ac_cv_qmake
+-   fi
+-fi
+ 
+ if test "x$ac_qmake" = "xno"; then
+    if test "x$ac_qt4" = "xyes"; then
+@@ -228,13 +202,6 @@ if test -d $ac_qt_install_path; then
+    ac_path="$ac_qt_install_path:$ac_path"
+ fi
+ 
+-# Check it again, now with updated PATH, just in case...
+-AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path)
+-ac_qmake=$ac_cv_qmake
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake $ac_errmsg])
+-fi
+-
+ AC_SUBST(ac_qmake)
+ 
+ AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [
+@@ -284,28 +251,36 @@ else
+ fi
+ 
+ # Check for Qt moc utility.
+-AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
++AC_ARG_WITH(moc,
++  AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]),
++  [ac_moc="$withval"], [ac_moc="no"])
+ if test "x$ac_moc" = "xno"; then
+    AC_MSG_ERROR([moc $ac_errmsg])
+ fi
+ AC_SUBST(ac_moc)
+ 
+ # Check for Qt uic utility.
+-AC_PATH_TOOL(ac_uic, uic, [no], $ac_path)
++AC_ARG_WITH(uic,
++  AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]),
++  [ac_uic="$withval"], [ac_uic="no"])
+ if test "x$ac_uic" = "xno"; then
+    AC_MSG_ERROR([uic $ac_errmsg])
+ fi
+ AC_SUBST(ac_uic)
+ 
+ # Check for Qt lupdate utility.
+-AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
++AC_ARG_WITH(lupdate,
++  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
++  [ac_lupdate="$withval"], [ac_lupdate="no"])
+ if test "x$ac_lupdate" = "xno"; then
+    AC_MSG_ERROR([lupdate $ac_errmsg])
+ fi
+ AC_SUBST(ac_lupdate)
+ 
+ # Check for Qt lrelease utility.
+-AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
++AC_ARG_WITH(lrelease,
++  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
++  [ac_lrelease="$withval"], [ac_lrelease="no"])
+ if test "x$ac_release" = "xno"; then
+    AC_MSG_ERROR([lrelease $ac_errmsg])
+ fi
+-- 
+2.14.3
+

recipes-musicians/rncbc/qmidinet.bb

@@ -17,9 +17,9 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
-SRC_URI[md5sum] = "af0c84228de51cd7695fd3526b6463c4"
-SRC_URI[sha256sum] = "166c5634cf8aee55c5688f6f1012adc1a19f157eefbb50b330a26786d4980f1e"
-PV = "0.6.0"
+SRC_URI[md5sum] = "97df629d58c9ff2ec7fccc15299f83ca"
+SRC_URI[sha256sum] = "3e7530c8e6317f4adff5466a628c90ce76a89d5961b6740e34f33c122004e22b"
+PV = "0.5.5"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -0,0 +1,92 @@
+From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 12 Mar 2019 23:03:13 +0100
+Subject: [PATCH] find native qt build tools by configure options - auto
+ detection does not work
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 40 +++++++++++++++-------------------------
+ 1 file changed, 15 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7d88bd..b5e0b5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,27 +176,9 @@ done
+ # A common error message:
+ ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+ 
+-# Check for proper qmake path/version alternatives.
+-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
+-if test "x$ac_qmake" = "xno"; then
+-   AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-   ac_qmake=$ac_cv_qmake
+-fi
+-
+-# Check for proper Qt major version.
+-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
+-   ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)
+-   ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
+-])
+-ac_qt_version_major=$ac_cv_qt_version_major
+-if test $ac_qt_version_major -ne 5; then
+-	AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-	ac_qmake=$ac_cv_qmake
+-fi
+-
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
+-fi
++AC_ARG_WITH(qmake,
++  AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]),
++  [ac_qmake="$withval"], [ac_qmake="no"])
+ 
+ # Check for proper Qt install path.
+ AC_CACHE_CHECK([for Qt install path], [ac_cv_qt_install_path], [
+@@ -249,28 +231,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
+ ])
+ 
+ # Check for Qt moc utility.
+-AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
++AC_ARG_WITH(moc,
++  AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]),
++  [ac_moc="$withval"], [ac_moc="no"])
+ if test "x$ac_moc" = "xno"; then
+    AC_MSG_ERROR([moc $ac_errmsg])
+ fi
+ AC_SUBST(ac_moc)
+ 
+ # Check for Qt uic utility.
+-AC_PATH_TOOL(ac_uic, uic, [no], $ac_path)
++AC_ARG_WITH(uic,
++  AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]),
++  [ac_uic="$withval"], [ac_uic="no"])
+ if test "x$ac_uic" = "xno"; then
+    AC_MSG_ERROR([uic $ac_errmsg])
+ fi
+ AC_SUBST(ac_uic)
+ 
+ # Check for Qt lupdate utility.
+-AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
++AC_ARG_WITH(lupdate,
++  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
++  [ac_lupdate="$withval"], [ac_lupdate="no"])
+ if test "x$ac_lupdate" = "xno"; then
+    AC_MSG_ERROR([lupdate $ac_errmsg])
+ fi
+ AC_SUBST(ac_lupdate)
+ 
+ # Check for Qt lrelease utility.
+-AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
++AC_ARG_WITH(lrelease,
++  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
++  [ac_lrelease="$withval"], [ac_lrelease="no"])
+ if test "x$ac_release" = "xno"; then
+    AC_MSG_ERROR([lrelease $ac_errmsg])
+ fi
+-- 
+2.20.1
+

recipes-musicians/rncbc/qsampler.bb

@@ -18,9 +18,9 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
-SRC_URI[md5sum] = "5546e605a9a4b00eab98108298d26fbe"
-SRC_URI[sha256sum] = "03f2d4e1a19f0aeb520841b5c3e0c464d9ed68409837fbb4d976c3639a9730cf"
-PV = "0.6.0"
+SRC_URI[md5sum] = "169401d29fb3b3d438dce5bb094efe08"
+SRC_URI[sha256sum] = "7a41f9a168dc8a316520377aea28b040de0fd54217b9b71d9f4c56a9fcafa253"
+PV = "0.5.6"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/qsampler/0001-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -0,0 +1,92 @@
+From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 12 Mar 2019 23:03:13 +0100
+Subject: [PATCH] find native qt build tools by configure options - auto
+ detection does not work
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 40 +++++++++++++++-------------------------
+ 1 file changed, 15 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7d88bd..b5e0b5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,27 +176,9 @@ done
+ # A common error message:
+ ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+ 
+-# Check for proper qmake path/version alternatives.
+-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
+-if test "x$ac_qmake" = "xno"; then
+-   AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-   ac_qmake=$ac_cv_qmake
+-fi
+-
+-# Check for proper Qt major version.
+-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
+-   ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)
+-   ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
+-])
+-ac_qt_version_major=$ac_cv_qt_version_major
+-if test $ac_qt_version_major -ne 5; then
+-	AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-	ac_qmake=$ac_cv_qmake
+-fi
+-
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
+-fi
++AC_ARG_WITH(qmake,
++  AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]),
++  [ac_qmake="$withval"], [ac_qmake="no"])
+ 
+ # Check for proper Qt install path.
+ AC_CACHE_CHECK([for Qt install path], [ac_cv_qt_install_path], [
+@@ -249,28 +231,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
+ ])
+ 
+ # Check for Qt moc utility.
+-AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
++AC_ARG_WITH(moc,
++  AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]),
++  [ac_moc="$withval"], [ac_moc="no"])
+ if test "x$ac_moc" = "xno"; then
+    AC_MSG_ERROR([moc $ac_errmsg])
+ fi
+ AC_SUBST(ac_moc)
+ 
+ # Check for Qt uic utility.
+-AC_PATH_TOOL(ac_uic, uic, [no], $ac_path)
++AC_ARG_WITH(uic,
++  AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]),
++  [ac_uic="$withval"], [ac_uic="no"])
+ if test "x$ac_uic" = "xno"; then
+    AC_MSG_ERROR([uic $ac_errmsg])
+ fi
+ AC_SUBST(ac_uic)
+ 
+ # Check for Qt lupdate utility.
+-AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
++AC_ARG_WITH(lupdate,
++  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
++  [ac_lupdate="$withval"], [ac_lupdate="no"])
+ if test "x$ac_lupdate" = "xno"; then
+    AC_MSG_ERROR([lupdate $ac_errmsg])
+ fi
+ AC_SUBST(ac_lupdate)
+ 
+ # Check for Qt lrelease utility.
+-AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
++AC_ARG_WITH(lrelease,
++  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
++  [ac_lrelease="$withval"], [ac_lrelease="no"])
+ if test "x$ac_release" = "xno"; then
+    AC_MSG_ERROR([lrelease $ac_errmsg])
+ fi
+-- 
+2.20.1
+

recipes-musicians/rncbc/qsynth.bb

@@ -19,9 +19,9 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
 "
-SRC_URI[md5sum] = "69820bc7af1a74deffe2039a5ea9adb6"
-SRC_URI[sha256sum] = "322a0097b6a74e8ebaf590f76b6acda4489d9ee7c612b97bffbac4e5b1047b9c"
-PV = "0.6.0"
+SRC_URI[md5sum] = "48928ca8c87b5c9fd2e7315f47aca2a8"
+SRC_URI[sha256sum] = "86eef57606423f4a369d130c3e222d7f847ba1c57d2e7eefb4c0c8a7102735a2"
+PV = "0.5.7"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/qtractor.bb

@@ -28,8 +28,8 @@ SRC_URI = " \
     \
     file://Qtractor.conf \
 "
-SRCREV = "49cad4d83b6ef7c678d864b62c116acb69ba0440"
-PV = "0.9.11+git${SRCPV}"
+SRCREV = "51459c9f414927b26c8d4644c356886281f199a7"
+PV = "0.9.9+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " \

recipes-musicians/rncbc/samplv1.bb

@@ -16,10 +16,11 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0002-Remove-extra-rpath.patch \
 "
-PV = "0.9.11"
-SRC_URI[md5sum] = "1d848f6b0a4fab0ee66a4c1b4f09a564"
-SRC_URI[sha256sum] = "c2c9362cce875f2dcf1c74d632cf5f5476585402f6764aea026063bef744fa9f"
+PV = "0.9.9"
+SRC_URI[md5sum] = "9b714da7c227db24c80d301120aeb46f"
+SRC_URI[sha256sum] = "889a9c46e15629f388fee6e598ea4fcbcd5cd18566f78efcf92cd4bfc0e2c1f8"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \

recipes-musicians/rncbc/synthv1.bb

@@ -18,12 +18,13 @@ SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/autostatic/autostatic-synthv1-presets/autostatic-synthv1-presets1.tar.gz;name=autostatic-synthv1-presets1 \
     http://linuxsynths.com/Synthv1PatchesDemos/Synthv1Patches06.tar.gz;name=linuxsynths-synthv1-presets;subdir=linuxsynths-synthv1-presets \
     file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
+    file://0002-Remove-extra-rpath.patch \
     \
     file://synthv1.conf \
 "
-PV = "0.9.11"
-SRC_URI[md5sum] = "b8167809c3d762bed5282c5e5d5fac93"
-SRC_URI[sha256sum] = "f5510ae43659d37c73c604def672ee81821b4ced9b13649adecfb7a4d816d384"
+PV = "0.9.9"
+SRC_URI[md5sum] = "b8cecc8d545ba60a26f3c2fc95a1e7c9"
+SRC_URI[sha256sum] = "22a7ee77d6e865e6aabeebd69a431b12ec3a758d538ff9e7c90e93f33eae6a33"
 
 SRC_URI[autostatic-synthv1-presets1.md5sum] = "02210e5576310554cfe316fb72e88b74"
 SRC_URI[autostatic-synthv1-presets1.sha256sum] = "587ac8cb4cb645fc71603d1b4b351b24f3e4d9f15a53aca59c0f30cc9f66e253"

recipes-musicians/stk/files/0001-avoid-usr-usr-paths.patch

@@ -1,6 +1,6 @@
 From 9e17bf3e93be8492682f253a8cb07394d8e5ff6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 6 Sep 2019 00:12:45 +0200
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 8 Jan 2017 01:24:21 +0100
 Subject: [PATCH] avoid /usr/usr paths
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -8,13 +8,13 @@ Content-Transfer-Encoding: 8bit
 
 Upstream-Status: Pending
 
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  src/Makefile.in | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 6588033..d7f4ade 100644
+index 739fa74..5657364 100755
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -93,13 +93,13 @@ $(SHAREDLIB) : $(OBJECTS)
@@ -22,9 +22,9 @@ index 6588033..d7f4ade 100644
  
  install-headers:
 -	install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
--	cp -R ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
+-	cp -r ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk
 +	install -d $(DESTDIR)$(INCLUDEDIR)/stk
-+	cp -R ../include/*.h $(DESTDIR)$(INCLUDEDIR)/stk
++	cp -r ../include/*.h $(DESTDIR)$(INCLUDEDIR)/stk
  
  install: $(SHAREDLIB) install-headers
 -	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
@@ -37,5 +37,5 @@ index 6588033..d7f4ade 100644
  
  $(OBJECTS) : Stk.h
 -- 
-2.20.1
+2.5.5
 

recipes-musicians/stk/stk_4.5.1.bb

@@ -1,14 +1,14 @@
 SUMMARY = "The Synthesis ToolKit in C++"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=db6cb276e2d0659d53f51cbd97807afc"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a5f6d67a6d869bcfa305225149e2b4fb"
 
 SRC_URI = " \
     http://ccrma.stanford.edu/software/stk/release/${BPN}-${PV}.tar.gz \
     file://0001-avoid-usr-usr-paths.patch \
     file://0002-configure.ac-fix-shared-library-name.patch \
 "
-SRC_URI[md5sum] = "4a07cd00bf264fa8488ba0fce9a59a3f"
-SRC_URI[sha256sum] = "e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101"
+SRC_URI[md5sum] = "87e1b1a24ec09f81321c01f2cdea513d"
+SRC_URI[sha256sum] = "3466860901a181120d3bd0407e4aeb5ab24127a4350c314af106778c1db88594"
 
 inherit autotools-brokensep pkgconfig
 

recipes-musicians/string-machine/string-machine_git.bb

@@ -1,32 +0,0 @@
-SUMMARY = "A virtual-analog string ensemble synthesize"
-HOMEPAGE = "https://github.com/jpcima/string-machine"
-LICENSE = "BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
-
-DEPENDS += " \
-    virtual/libx11 \
-    virtual/libgl \
-    boost \
-    cairo \
-"
-
-inherit pkgconfig distro_features_check lv2-turtle-helper pack_audio_plugins
-
-REQUIRED_DISTRO_FEATURE = "x11"
-
-SRC_URI = " \
-    gitsm://github.com/jpcima/string-machine.git \
-"
-SRCREV = "5e8ad47d03adafa3f7ec5746025482b50d93c4ca"
-S = "${WORKDIR}/git"
-PV = "0.1.1+git${SRCPV}"
-
-EXTRA_OEMAKE += " \
-    PREFIX=${prefix} \
-    NOOPT=true \
-    SKIP_STRIPPING=true \
-"
-
-do_install() {
-    oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install
-}

recipes-musicians/wolf-shaper/wolf-shaper_git.bb

@@ -9,22 +9,35 @@ DEPENDS = " \
     lv2 \
 "
 
-inherit pkgconfig lv2-turtle-helper pack_audio_plugins
+inherit pkgconfig qemu-ext pack_audio_plugins
 
 SRC_URI = "gitsm://github.com/pdesaulniers/wolf-shaper.git"
 SRCREV = "d0b46c9ece642488efed3cd255df22516966b334"
 S = "${WORKDIR}/git"
 PV = "0.1.7"
 
-EXTRA_OEMAKE += " \
-    PREFIX=${prefix} \
+export PREFIX="${prefix}"
+
+do_compile() {
+    rm -f ${WORKDIR}/lv2_ttl_generator-data
+    # 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' ${S}/dpf/utils/generate-ttl.sh
+
     NOOPT=true \
     SKIP_STRIPPING=true \
     BUILD_VST2=true \
     BUILD_LV2=true \
     BUILD_DSSI=true \
     BUILD_JACK=true \
-"
+    oe_runmake
+
+    # 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}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!"
+    done
+}
 
 do_install() {
     oe_runmake DESTDIR=${D} PREFIX=${prefix} install

recipes-musicians/wolf-spectrum/wolf-spectrum.bb

@@ -8,21 +8,34 @@ DEPENDS = " \
     lv2 \
 "
 
-inherit pkgconfig lv2-turtle-helper pack_audio_plugins
+inherit pkgconfig qemu-ext pack_audio_plugins
 
 SRC_URI = "gitsm://github.com/pdesaulniers/wolf-spectrum.git"
 SRCREV = "87d7aca59e295141a1e8019788267d3ef6d6cae7"
 S = "${WORKDIR}/git"
 PV = "1.0.0"
 
-EXTRA_OEMAKE += " \
-    PREFIX=${prefix} \
+export PREFIX="${prefix}"
+
+do_compile() {
+    rm -f ${WORKDIR}/lv2_ttl_generator-data
+    # 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' ${S}/dpf/utils/generate-ttl.sh
+
     NOOPT=true \
     SKIP_STRIPPING=true \
     BUILD_VST2=true \
     BUILD_LV2=true \
     BUILD_JACK=true \
-"
+    oe_runmake
+
+    # 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}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!"
+    done
+}
 
 do_install() {
     oe_runmake DESTDIR=${D} PREFIX=${prefix} install

recipes-musicians/ykchorus/ykchorus_git.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/SpotlightKid/ykchorus"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=02ad2afd072e9ce4a370bedb49e2b075"
 
-inherit pkgconfig gtk-icon-cache lv2-turtle-helper pack_audio_plugins
+inherit pkgconfig gtk-icon-cache qemu-ext pack_audio_plugins
 
 DEPENDS += " \
     liblo \
@@ -16,11 +16,23 @@ SRCREV = "a6b1027e327f5118bbe48ae01e9fa58e14f93479"
 PV = "0.2.2+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE += " \
+do_compile() {
+    rm -f ${WORKDIR}/lv2_ttl_generator-data
+    # 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' ${S}/dpf/utils/generate-ttl.sh
+
     PREFIX=${prefix} \
     NOOPT=true \
     SKIP_STRIPPING=true \
-"
+    oe_runmake
+
+    # 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}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!"
+    done
+}
 
 do_install() {
     oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install

recipes-musicians/yoshimi/yoshimi.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://yoshimi.sourceforge.net/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c5f39c482ca5ca058c1ebd39612cf98"
 
-inherit cmake pkgconfig gtk-icon-cache distro_features_check
+inherit cmake qemu-ext pkgconfig gtk-icon-cache distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -21,10 +21,10 @@ DEPENDS += " \
     libxft \
 "
 
-PV = "1.6.0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/1.6/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "5e6b1611a3a946360292b30234a910ca"
-SRC_URI[sha256sum] = "a0288d528e2394dc1959d7b2a17f9d986bd66b68c78c5a5db87e1c6caf2e8c2d"
+PV = "1.5.11"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/1.5/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "18036c2a802e2df53600a2cdce903720"
+SRC_URI[sha256sum] = "f96420a1158afd6995781be30c1caa725b47c7d00f14aea5ea1c059a9e6e22cf"
 
 OECMAKE_SOURCEPATH = "${S}/src"
 

recipes-musicians/zam-plugins/zam-plugins_git.bb

@@ -16,22 +16,34 @@ DEPENDS += " \
     zita-convolver \
 "
 
-inherit pkgconfig lv2-turtle-helper distro_features_check pack_audio_plugins
+inherit pkgconfig lv2-postinst-helper distro_features_check pack_audio_plugins
 
 REQUIRED_DISTRO_FEATURE = "x11"
 
 SRC_URI = " \
     gitsm://github.com/zamaudio/${BPN}.git \
 "
-SRCREV = "d211bff779cd6dd2d24a8106bea944da4d1bd195"
+SRCREV = "af338057e42dd5d07cba1889bfc74eda517c6147"
 S = "${WORKDIR}/git"
-PV = "3.11+git${SRCPV}"
+PV = "3.11"
 
 EXTRA_OEMAKE += " \
     NOOPT=true \
     SKIP_STRIPPING=true \
 "
 
+do_configure_prepend() {
+    # reconfigure?
+    if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then
+        # We cannot run lv2-ttl-generator in cross environment so
+        # manipulate generate-ttl.sh to save lib info in ${LV2-TURTLE-BUILD-DATA}
+        sed -i 's|"$GEN" "./$FILE"|echo "dummy-first-col `realpath  "./$FILE"`" >> ${LV2-TURTLE-BUILD-DATA}|g' ${S}/dpf/utils/generate-ttl.sh
+     else
+        rm -f ${LV2-TURTLE-BUILD-DATA}
+     fi
+}
+
+
 do_install() {
     ${MAKE} DESTDIR=${D} PREFIX= LIBDIR=${libdir} BINDIR=${bindir} install
 }

recipes-musicians/zyn/zyn.inc

@@ -66,8 +66,8 @@ FILES_${PN}-standalone = " \
     ${bindir}/zynaddsubfx \
 "
 
-RDEPENDS_${PN_DSSI} += "${PN}"
-RDEPENDS_${PN_LV2} += "${PN}"
-RDEPENDS_${PN_VST} += "${PN}"
+RDEPENDS_${PN}-dssi += "${PN}"
+RDEPENDS_${PN}-lv2 += "${PN}"
+RDEPENDS_${PN}-vst += "${PN}"
 RDEPENDS_${PN}-standalone += "${PN}"
 

recipes-support/packagegroups/musicians-world.bb

@@ -26,7 +26,7 @@ RDEPENDS_${PN} += " \
     \
     distrho-ports-lv2 distrho-ports-presets distrho-ports-vst \
     distrho-ports-extra-lv2 distrho-ports-extra-vst \
-    dpf-plugins-ladspa dpf-plugins-lv2 dpf-plugins-vst dpf-plugins-standalone \
+    dpf-plugins-ladspa dpf-plugins-lv2 dpf-plugins-vst \
     lv2-ttl-generator \
     \
     \
@@ -59,7 +59,6 @@ RDEPENDS_${PN} += " \
     helm-standalone helm-lv2 helm-vst \
     hydrogen hydrogen-drumkits \
     infamousplugins \
-    ir.lv2-automatable ir.lv2-zero-latency \
     \
     \
     clthreads \
@@ -68,7 +67,6 @@ RDEPENDS_${PN} += " \
     zita-resampler \
     \
     \
-    kushview-element \
     ladspa-sdk \
     liblo \
     libmp4v2 \
@@ -86,9 +84,9 @@ RDEPENDS_${PN} += " \
     lrdf \
     lsp-plugins-standalone lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst \
     mixxx \
+    muse \
     nekobee \
     ninjas2-standalone ninjas2-lv2 ninjas2-vst \
-    noise-repellent \
     non \
     \
     \
@@ -137,7 +135,6 @@ RDEPENDS_${PN} += " \
     \
     soundtouch \
     stk \
-    string-machine-lv2 string-machine-vst \
     supercollider \
     triceratops-lv2 \
     vamp-plugin-sdk \