distrho-ports: upgrade 2018-04-16+ -> 2020-07-14+

Give up musl patches: they don't apply due to juce upgrade

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

README.md

@@ -4,7 +4,7 @@ OE layer for digital audio workstations and plugins
 
 Layer dependencies:
 ----------------------
-see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers
+see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
 
 
 Contributing
@@ -14,11 +14,14 @@ Contributing
 
 Policies
 --------
-* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
+* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-musicians/issues).
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
-  * Use 4 spaces for indention always
+  * Use 4 spaces for indentation always (shell and python code)
   * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
   * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
+* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
+  [appends](appends).
+  Pull requests removing appends for sake of magic 'compliant' scripts  are not accepted.
 
 
 Maintainers

appends/meta-qt5/qtbase-native_%.bbappend

@@ -0,0 +1,2 @@
+PACKAGECONFIG_append = " gui imageformats"
+

classes/audio-plugin-common.bbclass

@@ -0,0 +1,9 @@
+# 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"
+PN_VST3 = "${PN}-vst3"
+

classes/lv2-postinst-helper.bbclass

@@ -1,53 +0,0 @@
-# Helper class to handle ontarget-postinst creation of lv2 turtle files
-
-# File created during compile usually. To create this file makefiles have to be
-# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
-# is expected with the following format
-# lv2-ttl-generator <path>/plugin.so
-LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
-
-# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
-# To delete them automatically (see below) the contain a dummy string:
-LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
-
-# 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"
-
-do_install_append() {
-    # remove dummy lv2-turtles again
-    cd ${D}/${libdir}/lv2
-    for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
-        rm $tfile
-    done
-
-    # create postinst manifest
-    install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
-    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}
-    done
-}
-
-
-pkg_postinst_ontarget_${PN}-lv2() {
-    oldpath=`pwd`
-    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
-        cd `dirname "$sofile"`
-        lv2-ttl-generator "$sofile"
-    done
-    cd $oldpath
-}
-
-pkg_prerm_${PN}-lv2() {
-    for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
-        path=`dirname "$sofile"`
-        for turtle in `find $path -name '*.ttl'`; do
-            rm $turtle
-        done
-    done
-}
-
-FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}"
-RDEPENDS_${PN}-lv2 += "lv2-ttl-generator"

classes/lv2-turtle-helper.bbclass

@@ -0,0 +1,143 @@
+# 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"
+
+inherit qemu-ext-musicians 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_TTL_GENERATOR"
+do_compile_append() {
+    rm -f ${LV2_PLUGIN_INFO_FILE_CLEANED}
+    if [ -e ${LV2_PLUGIN_INFO_FILE} ]; then
+        echo
+        echo "---------- start of lv2 ttl generation ----------"
+        echo "lv2-plugins found - try ttl-generation with LV2_TTL_GENERATOR: '${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 [ "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="$?"
+                if [ "x${ttl_failed}" = "x" ]; then
+                    echo "Generation succeeded."
+                else
+                    if [ "x${ttl_failed}" = "x124" ]; then
+                        echo "ERROR: ttl-generation for `basename ${sofile}` timed out!"
+                    else
+                        echo "ERROR: ttl-generation for `basename ${sofile}` failed!"
+                        echo "LV2_TTL_GENERATOR set correctly - check few lines above?"
+                        # qemu failed: remove generated core files
+                        rm -f *.core
+                    fi
+                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,8 +1,11 @@
 # Auto package audio plugins
 
-PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst"
+inherit audio-plugin-common
 
-FILES_${PN}-dssi += "${libdir}/dssi"
-FILES_${PN}-ladspa += "${libdir}/ladspa"
-FILES_${PN}-lv2 += "${libdir}/lv2"
-FILES_${PN}-vst += "${libdir}/vst"
+PACKAGES =+ "${PN_DSSI} ${PN_LADSPA} ${PN_LV2} ${PN_VST} ${PN_VST3}"
+
+FILES_${PN_DSSI} += "${libdir}/dssi"
+FILES_${PN_LADSPA} += "${libdir}/ladspa"
+FILES_${PN_LV2} += "${libdir}/lv2"
+FILES_${PN_VST} += "${libdir}/vst"
+FILES_${PN_VST3} += "${libdir}/vst3"

classes/qemu-ext-musicians.bbclass

@@ -1,6 +1,6 @@
 inherit qemu
 
-DEPENDS += "qemu-native"
+DEPENDS_append = " qemu-native qemu-with-timeout-native coreutils-native"
 
 # This is an extended/modified qemu.bbclass tailored four our needs:
 #
@@ -11,12 +11,16 @@ DEPENDS += "qemu-native"
 #   not yet installed.
 # * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
 #   an absolute path.
+# * To catch infine qemu runs we make use of qemu-with-timeout-native which
+#   hand timeouts as errors
 
 def qemu_run_binary_local(data, rootfs_path, binary):
     libdir = rootfs_path + data.getVar("libdir")
     base_libdir = rootfs_path + data.getVar("base_libdir")
     extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR")
+
     if extra_libdir:
-        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
+        cmdline = qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
     else:
-        return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary
+        cmdline = qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary
+    return cmdline.replace(qemu_target_binary(data), qemu_target_binary(data) + '-timeout')

conf/layer.conf

@@ -4,7 +4,7 @@ BBPATH .= ":${LAYERDIR}"
 # recipes
 BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb"
 # appends
-BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
+BBFILES += "${LAYERDIR}/appends/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "meta-musicians"
 BBFILE_PATTERN_meta-musicians := "^${LAYERDIR}/"
@@ -20,4 +20,4 @@ LAYERDEPENDS_meta-musicians = " \
     meta-python \
     qt5-layer \
 "
-LAYERSERIES_COMPAT_meta-musicians = "thud warrior"
+LAYERSERIES_COMPAT_meta-musicians = "zeus dunfell"

recipes-devtools/premake/premake3_3.7.bb

@@ -5,9 +5,7 @@ HOMEPAGE = "http://premake.github.io/"
 
 DEPENDS = "lua-native"
 
-SRC_URI = " \
-    http://downloads.sourceforge.net/project/premake/Premake/${PV}/premake-src-${PV}.zip \
-"
+SRC_URI = "http://downloads.sourceforge.net/project/premake/Premake/${PV}/premake-src-${PV}.zip"
 SRC_URI[md5sum] = "8d30dc5bbc52aad81abb1509c1dd7d8f"
 SRC_URI[sha256sum] = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5"
 S = "${WORKDIR}/Premake-${PV}"

recipes-devtools/premake/premake4_4.3.bb

@@ -1,10 +1,8 @@
 SUMMARY = "A simple build configuration and project generation tool using lua"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6f3a39cc652afb51d2f2bc39b67e308f"
 HOMEPAGE = "http://premake.github.io/"
 
-#    https://downloads.sourceforge.net/project/premake/Premake/4.3/premake-4.3-src.zip
-
 SRC_URI = " \
     http://downloads.sourceforge.net/project/premake/Premake/${PV}/premake-${PV}-src.zip \
     file://0001-Premake4.make-keep-more-of-our-build-defaults.patch \

recipes-devtools/premake/premake5_5.0.0.bb

@@ -0,0 +1,25 @@
+SUMMARY = "A simple build configuration and project generation tool using lua"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4d2a821a590b53e6ca55241102be4dbe"
+HOMEPAGE = "http://premake.github.io/"
+
+SRC_URI = " \
+    https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-src.zip \
+"
+SRC_URI[md5sum] = "f26699599c53865f7b154e9ed22a0ba4"
+SRC_URI[sha256sum] = "7c9fa4488156625c819dd03f2b48bfd4712fbfabdc2b5768e8c7f52dd7d16608"
+S = "${WORKDIR}/premake-${PV}-alpha14"
+
+BBCLASSEXTEND = "native"
+
+do_compile_prepend() {
+    cd ${S}/build/gmake.unix
+    export config=debug
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${S}/bin/debug/premake5 ${D}${bindir}
+}
+
+

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

@@ -0,0 +1,28 @@
+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,11 +6,12 @@ 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 = "1e3f5106d404562902bed2983403301db24a3f78"
+SRCREV = "dae177189b12f74ea01ac2389b76326c06d9be78"
 S = "${WORKDIR}/git"
 PV_LAST_RELEASE = "1.3.1000"
-PV = "${PV_LAST_RELEASE}"
+PV = "${PV_LAST_RELEASE}+git${SRCPV}"
 
 inherit waf pkgconfig
 

recipes-gstreamer/gstreamer-0.10/gst-plugins-package.inc

@@ -0,0 +1,56 @@
+PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
+PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
+
+python split_gstreamer10_packages () {
+    gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
+    postinst = d.getVar('plugin_postinst')
+    glibdir = d.getVar('libdir')
+
+    do_split_packages(d, glibdir, r'^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
+    do_split_packages(d, gst_libdir, r'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
+    do_split_packages(d, glibdir+'/girepository-1.0', r'Gst(.*)-1.0\.typelib$', d.expand('${PN}-%s-typelib'), 'GStreamer typelib file for %s', postinst=postinst, extra_depends='')
+    do_split_packages(d, gst_libdir, r'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends='${PN}-dev')
+    do_split_packages(d, gst_libdir, r'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends='${PN}-staticdev')
+}
+
+python set_metapkg_rdepends () {
+    import os
+    import oe.utils
+
+    pn = d.getVar('PN')
+    metapkg =  pn + '-meta'
+    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
+    d.setVar('FILES_' + metapkg, "")
+    blacklist = [ pn, pn + '-meta' ]
+    metapkg_rdepends = []
+    pkgdest = d.getVar('PKGDEST')
+    for pkg in oe.utils.packages_filter_out_system(d):
+        if pkg not in blacklist and pkg not in metapkg_rdepends:
+            # See if the package is empty by looking at the contents of its PKGDEST subdirectory. 
+            # If this subdirectory is empty, then the package is.
+            # Empty packages do not get added to the meta package's RDEPENDS
+            pkgdir = os.path.join(pkgdest, pkg)
+            if os.path.exists(pkgdir):
+                dir_contents = os.listdir(pkgdir) or []
+            else:
+                dir_contents = []
+            is_empty = len(dir_contents) == 0
+            if not is_empty:
+                metapkg_rdepends.append(pkg)
+    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
+    d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
+}
+
+# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
+# so we need them even when empty (like in gst-plugins-good case)
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dev = "1"
+ALLOW_EMPTY_${PN}-staticdev = "1"
+
+PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
+
+FILES_${PN} = ""
+FILES_${PN}-apps = "${bindir}"
+FILES_${PN}-glib = "${datadir}/glib-2.0"
+
+RRECOMMENDS_${PN} += "${PN}-meta"

recipes-gstreamer/gstreamer-0.10/gst-plugins.inc

@@ -14,7 +14,7 @@ EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples"
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
 LIBV = "0.10"
-require recipes-multimedia/gstreamer/gst-plugins-package.inc
+require gst-plugins-package.inc
 
 PACKAGES_DYNAMIC += "^${PN}-.*"
 

recipes-musicians/amsynth/amsynth.bb

@@ -11,18 +11,16 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/amsynth/amsynth.git;branch=develop"
-SRCREV = "71544e4991f494f9871e13a50d6cf9217bb86986"
-PV = "1.9.0"
+SRCREV = "3994bc3edfd606b5965f0bacdf128a664a78b86a"
+PV = "1.10.0"
 S = "${WORKDIR}/git"
 
-
-PACKAGECONFIG ??= "alsa jack sndfile lv2"
+PACKAGECONFIG ??= "alsa jack lv2"
 
 PACKAGECONFIG[oss] = "--with-oss,--without-oss"
 PACKAGECONFIG[alsa] = "--with-alsa,--without-alsa,alsa-lib"
 PACKAGECONFIG[dssi] = "--with-dssi,--without-dssi,dssi liblo"
 PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack"
-PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1"
 PACKAGECONFIG[lv2] = "--with-lv2,--without-lv2,lv2"
 
 PACKAGES =+ "${PN}-standalone"
@@ -33,19 +31,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/ardour/ardour5/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch

@@ -10,12 +10,14 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Inappropriate [cross specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+
 ---
- tools/autowaf.py                                   |    1 +
- wscript                                            |   26 -
+ tools/autowaf.py |  1 +
+ wscript          | 26 --------------------------
+ 2 files changed, 1 insertion(+), 26 deletions(-)
 
 diff --git a/tools/autowaf.py b/tools/autowaf.py
-index f82b80a..626e951 100644
+index 375dc5909..bb7714335 100644
 --- a/tools/autowaf.py
 +++ b/tools/autowaf.py
 @@ -93,6 +93,7 @@ def copyfile (task):
@@ -27,10 +29,10 @@ index f82b80a..626e951 100644
      if sys.platform == "darwin":
          includes = '/opt/local/include'
 diff --git a/wscript b/wscript
-index a7dd5e2..35acc51 100644
+index 9fd84bb2c..d4178cb36 100644
 --- a/wscript
 +++ b/wscript
-@@ -440,31 +440,6 @@ int main() { return 0; }''',
+@@ -476,31 +476,6 @@ int main() { return 0; }''',
  
          compiler_flags.append ("-DARCH_X86")
  
@@ -62,14 +64,11 @@ index a7dd5e2..35acc51 100644
  
          if (conf.env['build_target'] == 'mingw'):
              if (re.search ("(x86_64|AMD64)", cpu) != None):
-@@ -965,7 +940,6 @@ def configure(conf):
-             else:
-                 conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
+@@ -1034,7 +1009,6 @@ def configure(conf):
+                         fragment = "#include <dlfcn.h>\n int main(void) { dlopen (\"\", 0); return 0;}\n",
+                         linkflags='-ldl', uselib_store='DL', execute = False)
          conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
 -                  execute = "1",
                    mandatory = True,
                    msg = 'Checking for boost library >= 1.39',
                    okmsg = 'ok',
--- 
-2.9.3
-

recipes-musicians/ardour/ardour5/0006-Find-fmt-binding-in-out-of-tree-building.patch

@@ -0,0 +1,33 @@
+From de5b65e6e5c558237fbdcfb4c6a284bc17a6054e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 25 Jan 2020 22:11:56 +0100
+Subject: [PATCH] Find fmt-binding in out-of-tree building
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/Ardour/ardour/pull/465
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ gtk2_ardour/wscript | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
+index beb5b196b8..ed1d5631dd 100644
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -852,7 +852,7 @@ def build(bld):
+     # NATIVE ARDOUR BINDING FILES
+     # explicitly state the use of perl here so that it works on windows too
+     #
+-    a_rule = 'perl ../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC[0].abspath()} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] )
++    a_rule = 'perl %s/tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC[0].abspath()} >${TGT}' % (bld.top_dir, sys.platform, bld.env['WINDOWS_KEY'] )
+     for b in [ 'ardour' ] :
+         obj = bld(
+             target = b + '.keys',
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0001-Towards-waf-python-2-3-support.patch

@@ -0,0 +1,859 @@
+From 2e9ac80e998bc79d5ef9029415008198b22168dc Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Mon, 20 Jan 2020 23:08:11 +0100
+Subject: [PATCH 1/8] Towards waf python 2+3 support
+
+Upstream-Status: Backport [1]
+
+[1] https://github.com/Ardour/ardour/commit/2e9ac80e998bc79d5ef9029415008198b22168dc
+
+---
+ gtk2_ardour/wscript                      |  32 +-
+ libs/ardour/wscript                      |   2 +-
+ libs/pbd/wscript                         |  17 +-
+ libs/plugins/a-comp.lv2/wscript          |  13 +-
+ libs/plugins/a-delay.lv2/wscript         |  14 +-
+ libs/plugins/a-eq.lv2/wscript            |  14 +-
+ libs/plugins/a-fluidsynth.lv2/wscript    |  16 +-
+ libs/plugins/a-reverb.lv2/wscript        |  14 +-
+ libs/plugins/reasonablesynth.lv2/wscript |  14 +-
+ libs/ptformat/wscript                    |   1 +
+ libs/surfaces/osc/wscript                |   2 +-
+ libs/surfaces/push2/wscript              |  24 +-
+ libs/surfaces/wiimote/wscript            |   2 +-
+ libs/widgets/wscript                     |   2 +-
+ session_utils/wscript                    |   2 +-
+ tools/bb/wscript                         |  15 +-
+ tools/luadevel/wscript                   |   2 +-
+ tools/misc.py                            | 355 +++++++++++++++++++++++
+ wscript                                  |  10 +-
+ 19 files changed, 457 insertions(+), 94 deletions(-)
+ create mode 100644 tools/misc.py
+
+diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
+index d3824a0a63..beb5b196b8 100644
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -369,20 +369,15 @@ def configure(conf):
+ 
+ 
+     if sys.platform == 'darwin':
+-        retval = conf.run_c_code (code='#include <AppKit/NSWindow.h>\n\
+-        int main(void) { (void) NSWindowWillStartLiveResizeNotification; return 0; }\n',
+-                                  env = conf.env.derive (),
+-                                  features = [ 'c' ],
+-                                  compiler = 'cc',
+-                                  compile_filename='test.m',
+-                                  mandatory = False,
+-            )
+-
+-        if retval == 0:
+-            autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'ok')
+-            conf.define ('HAVE_COCOA_LIVE_RESIZING', 1)
+-        else:
+-            autowaf.display_msg (conf, 'Checking for Cocoa live resizing constants', 'too old - AU plugin windows will be fixed size')
++        conf.check(
++                msg              ='Checking for Cocoa live resizing constants',
++                fragment         = '#include <AppKit/NSWindow.h>\n int main(void) { (void) NSWindowWillStartLiveResizeNotification; return 0; }\n',
++                define_name      = 'HAVE_COCOA_LIVE_RESIZING',
++                uselib_store     = 'COCOA_LIVE_RESIZING',
++                compiler         = 'cc',
++                compile_filename = 'test.m',
++                execute          = True,
++                mandatory        = False)
+ 
+     conf.write_config_header('gtk2ardour-config.h', remove=False)
+ 
+@@ -475,7 +470,6 @@ def build(bld):
+         obj.source    = list(gtk2_ardour_sources)
+         obj.target    = 'luadoc'
+         obj.includes  = ['.', '../libs']
+-        obj.ldflags   = ['-no-undefined']
+         obj.use       = [
+                 'libpbd',
+                 'libardour',
+@@ -515,7 +509,6 @@ def build(bld):
+ #        obj.source    = [ 'ardour_button.cc', 'ui_config.cc', 'tooltips.cc' ]
+ #        obj.target    = 'canvas_test'
+ #        obj.includes  = ['.', '../libs']
+-#        obj.ldflags   = ['-no-undefined']
+ #        obj.use       = [
+ #                'libpbd',
+ #                'libardour',
+@@ -586,9 +579,8 @@ def build(bld):
+             obj = bld (features = 'cxx c cxxprogram')
+         # operate on copy to avoid adding sources twice
+         obj.source    = list(gtk2_ardour_sources)
+-        obj.target = 'ardour-' + str (bld.env['VERSION'])
+-        obj.includes = ['.']
+-        obj.ldflags = ['-no-undefined']
++        obj.target    = 'ardour-' + str (bld.env['VERSION'])
++        obj.includes  = ['.']
+ 
+         if bld.is_defined('WINDOWS_VST_SUPPORT'):
+         # Windows VST support mingw
+@@ -617,7 +609,7 @@ def build(bld):
+         ]
+     obj.install_path = bld.env['DLLDIR']
+     obj.linkflags    = ''
+-    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML '
++    obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB XML LILV'
+ 
+     if sys.platform == 'darwin':
+         obj.uselib += ' AUDIOUNITS OSX '
+diff --git a/libs/ardour/wscript b/libs/ardour/wscript
+index 7148a26042..8a65daaaf0 100644
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -474,7 +474,7 @@ def build(bld):
+             avx_cxxflags = list(bld.env['CXXFLAGS'])
+             avx_cxxflags.append (bld.env['compiler_flags_dict']['avx'])
+             avx_cxxflags.append (bld.env['compiler_flags_dict']['pic'])
+-            bld(features = 'cxx',
++            bld(features = 'cxx cxxstlib asm',
+                 source   = avx_sources,
+                 cxxflags = avx_cxxflags,
+                 includes = [ '.' ],
+diff --git a/libs/pbd/wscript b/libs/pbd/wscript
+index 29d82edcb4..8dffb71dd7 100644
+--- a/libs/pbd/wscript
++++ b/libs/pbd/wscript
+@@ -108,12 +108,21 @@ def configure(conf):
+     autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True)
+     autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True)
+ 
+-    conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False)
+     conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False)
+     conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
+     if not Options.options.ppc:
+-        conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False)
+-    conf.check(function_name='localtime_r', header_name='time.h', define_name='HAVE_LOCALTIME_R',mandatory=False)
++        conf.check_cc(
++                msg="Checking for function 'posix_memalign' in stdlib.h",
++                fragment = "#define _XOPEN_SOURCE 600\n #include <stdlib.h>\n int main(void) { return posix_memalign (0, 64, 1); }\n",
++                define_name='HAVE_POSIX_MEMALIGN', execute = False, mandatory=False)
++    conf.check_cc(
++            msg="Checking for function 'getmntent' in mntent.h",
++            fragment = "#include <mntent.h>\n int main(void) { return (int)getmntent(0); }\n",
++            define_name='HAVE_GETMNTENT', execute = False, mandatory=False)
++    conf.check_cc(
++            msg="Checking for function 'localtime_r' in time.h",
++            fragment = "#include <time.h>\n int main(void) { return localtime_r(NULL, NULL); }\n",
++            define_name='HAVE_LOCALTIME_R', execute = False, mandatory=False)
+ 
+     # Boost headers
+     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
+@@ -161,7 +170,7 @@ def build(bld):
+     obj.includes     = ['.']
+     obj.name         = 'libpbd'
+     obj.target       = 'pbd'
+-    obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM ARCHIVE CURL'
++    obj.uselib       = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM ARCHIVE CURL XML'
+     if sys.platform == 'darwin':
+         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
+         if 'cocoa_open_uri.mm' not in obj.source:
+diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
+index f0ebb1d33d..99d7bb03f1 100644
+--- a/libs/plugins/a-comp.lv2/wscript
++++ b/libs/plugins/a-comp.lv2/wscript
+@@ -25,15 +25,16 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']:
+             bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript
+index 666ef0d5ab..2af05ff137 100644
+--- a/libs/plugins/a-delay.lv2/wscript
++++ b/libs/plugins/a-delay.lv2/wscript
+@@ -25,15 +25,15 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-delay.ttl', 'presets.ttl']:
+-            bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript
+index 0610ba2eea..e36a804f7f 100644
+--- a/libs/plugins/a-eq.lv2/wscript
++++ b/libs/plugins/a-eq.lv2/wscript
+@@ -25,15 +25,15 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-eq.ttl']:
+-            bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
+index af6fcf08a8..3a093259d6 100644
+--- a/libs/plugins/a-fluidsynth.lv2/wscript
++++ b/libs/plugins/a-fluidsynth.lv2/wscript
+@@ -24,15 +24,15 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-fluidsynth.ttl']:
+-            bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'cxx cshlib',
+@@ -42,7 +42,7 @@ def build(bld):
+                   includes     = [ '../../ardour' ],
+                   target       = '../../LV2/%s/a-fluidsynth' % bundle,
+                   install_path = '${LV2DIR}/%s' % bundle,
+-                  uselib       = ['LIBFLUIDSYNTH'],
++                  uselib       = ['LIBFLUIDSYNTH', 'GLIB'],
+                   use          = ['LV2_1_0_0']
+                   )
+ 
+diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript
+index 35601f2179..3eb5ce10bc 100644
+--- a/libs/plugins/a-reverb.lv2/wscript
++++ b/libs/plugins/a-reverb.lv2/wscript
+@@ -24,15 +24,15 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-reverb.ttl']:
+-            bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript
+index cedda4c308..0eb5c55a04 100644
+--- a/libs/plugins/reasonablesynth.lv2/wscript
++++ b/libs/plugins/reasonablesynth.lv2/wscript
+@@ -24,15 +24,15 @@ def build(bld):
+     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
+     module_ext = module_pat[module_pat.rfind('.'):]
+ 
+-    if bld.is_defined ('HAVE_LV2'):
++    if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'reasonablesynth.ttl']:
+-            bld(features     = 'subst',
+-                source       = i + '.in',
+-                target       = '../../LV2/%s/%s' % (bundle, i),
+-                install_path = '${LV2DIR}/%s' % bundle,
+-                chmod        = Utils.O644,
+-                LIB_EXT      = module_ext)
++            obj = bld(features='subst')
++            obj.source = i + '.in'
++            obj.target = '../../LV2/%s/%s' % (bundle, i)
++            obj.install_path = '${LV2DIR}/%s' % bundle
++            obj.chmod = Utils.O644
++            obj.dict = {'LIB_EXT': module_ext}
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript
+index 4d381234fe..8dc9ff7430 100644
+--- a/libs/ptformat/wscript
++++ b/libs/ptformat/wscript
+@@ -35,6 +35,7 @@ def build(bld):
+     obj.name         = 'libptformat'
+     obj.target       = 'ptformat'
+     obj.use          = 'libardour'
++    obj.uselib       = 'GLIBMM'
+     autowaf.ensure_visible_symbols (obj, True)
+     obj.vnum         = LIBPTFORMAT_LIB_VERSION
+     obj.install_path = bld.env['LIBDIR']
+diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
+index 4d0dba6750..5bbe7d3946 100644
+--- a/libs/surfaces/osc/wscript
++++ b/libs/surfaces/osc/wscript
+@@ -30,7 +30,7 @@ def build(bld):
+     obj.includes     = ['.', './osc']
+     obj.name         = 'libardour_osc'
+     obj.target       = 'ardour_osc'
+-    obj.uselib       = 'LO GTKMM GTK GDK'
++    obj.uselib       = 'LO GTKMM GTK GDK XML'
+     obj.use          = 'libardour libardour_cp libgtkmm2ext libpbd'
+     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
+ 
+diff --git a/libs/surfaces/push2/wscript b/libs/surfaces/push2/wscript
+index 9c75f9d69f..f7a5134153 100644
+--- a/libs/surfaces/push2/wscript
++++ b/libs/surfaces/push2/wscript
+@@ -21,28 +21,28 @@ def build(bld):
+             push2.cc
+             buttons.cc
+             canvas.cc
+-	    interface.cc
++            interface.cc
+             midi_byte_array.cc
+             leds.cc
+             level_meter.cc
+-	    gui.cc
+-	    knob.cc
+-	    layout.cc
+-	    menu.cc
+-	    mix.cc
+-	    scale.cc
+-	    splash.cc
+-	    track_mix.cc
+-	    utils.cc
++            gui.cc
++            knob.cc
++            layout.cc
++            menu.cc
++            mix.cc
++            scale.cc
++            splash.cc
++            track_mix.cc
++            utils.cc
+     '''
+     obj.export_includes = ['.']
+     obj.defines      = [ 'PACKAGE="ardour_push2"' ]
+     obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
+     obj.defines     += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ]
+-    obj.includes     = [ '.', './push2']
++    obj.includes     = ['.', './push2']
+     obj.name         = 'libardour_push2'
+     obj.target       = 'ardour_push2'
+-    obj.uselib       = 'CAIROMM PANGOMM USB GTKMM SIGCPP'
++    obj.uselib       = 'CAIROMM PANGOMM USB GTKMM SIGCPP XML'
+     obj.use          = 'libardour libardour_cp libgtkmm2ext libpbd libevoral libcanvas libtimecode'
+     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
+ 
+diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
+index 03d01635a1..d38296f37f 100644
+--- a/libs/surfaces/wiimote/wscript
++++ b/libs/surfaces/wiimote/wscript
+@@ -24,7 +24,7 @@ def build(bld):
+     obj.includes     = ['.', '../libs']
+     obj.name         = 'libardour_wiimote'
+     obj.target       = 'ardour_wiimote'
+-    obj.uselib       = 'GTKMM CWIID'
++    obj.uselib       = 'GTKMM CWIID XML'
+     obj.use          = 'libardour libardour_cp libgtkmm2ext'
+     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
+ 
+diff --git a/libs/widgets/wscript b/libs/widgets/wscript
+index 0559abe4dc..2216c38348 100644
+--- a/libs/widgets/wscript
++++ b/libs/widgets/wscript
+@@ -76,7 +76,7 @@ def build(bld):
+         obj.defines      = [ ]
+ 
+     obj.export_includes = ['.']
+-    obj.includes     = ['.']
++    obj.includes     = ['.'] + bld.env['INCLUDES_GLIB']
+     obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST XML'
+     obj.use          = [ 'libpbd', 'libgtkmm2ext' ]
+     obj.name         = 'libwidgets'
+diff --git a/session_utils/wscript b/session_utils/wscript
+index 5fe9445426..a98694f3d6 100644
+--- a/session_utils/wscript
++++ b/session_utils/wscript
+@@ -86,7 +86,7 @@ def build(bld):
+     utils = bld.path.ant_glob('*.cc', excl=['example.cc', 'common.cc'])
+ 
+     for util in utils:
+-        fn = str(util)[:-3]
++        fn = os.path.splitext(os.path.basename(str(util)))[0]
+         build_ardour_util(bld, fn)
+         if bld.env['build_target'] != 'mingw':
+             bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh')
+diff --git a/tools/bb/wscript b/tools/bb/wscript
+index e419fa2465..3e9fd8d2d7 100644
+--- a/tools/bb/wscript
++++ b/tools/bb/wscript
+@@ -12,14 +12,13 @@ def configure(ctx):
+         pass
+ 
+ def build(bld):
+-	obj = bld (features = 'cxx c cxxprogram')
+-	obj.install_path = None
+-	obj.source    = [ 'bb.cc', 'gui.cc', 'misc.cc' ]
+-	obj.target    = 'bb'
+-	obj.includes  = ['.', '../libs']
+-	obj.ldflags   = ['-no-undefined']
+-	obj.use       = [ 'libardour', 'libevoral', ]
+-	obj.uselib    = ' JACK GTKMM '
++        obj = bld (features = 'cxx c cxxprogram')
++        obj.install_path = None
++        obj.source    = [ 'bb.cc', 'gui.cc', 'misc.cc' ]
++        obj.target    = 'bb'
++        obj.includes  = ['.', '../libs']
++        obj.use       = [ 'libardour', 'libevoral', ]
++        obj.uselib    = 'JACK GTKMM XML'
+ 
+         wrapper_subst_dict = {
+             'INSTALL_PREFIX' : bld.env['PREFIX'],
+diff --git a/tools/luadevel/wscript b/tools/luadevel/wscript
+index 3190380091..03889c72d7 100755
+--- a/tools/luadevel/wscript
++++ b/tools/luadevel/wscript
+@@ -18,7 +18,7 @@ def options(opt):
+ def configure(conf):
+     conf.load('misc')
+     conf.load('compiler_cxx')
+-    conf.check_cc(function_name='readline',
++    conf.check_cc(
+             header_name='stdio.h readline/readline.h',
+             lib='readline',
+             uselib_store='READLINE',
+diff --git a/tools/misc.py b/tools/misc.py
+new file mode 100644
+index 0000000000..b82cdb63ba
+--- /dev/null
++++ b/tools/misc.py
+@@ -0,0 +1,355 @@
++#!/usr/bin/env python
++# encoding: utf-8
++# Thomas Nagy, 2006-2010 (ita)
++
++"""
++This tool is totally deprecated
++
++Try using:
++	.pc.in files for .pc files
++	the feature intltool_in - see demos/intltool
++	make-like rules
++"""
++
++import shutil, re, os
++from waflib import TaskGen, Node, Task, Utils, Build, Errors
++from waflib.TaskGen import feature, after_method, before_method
++from waflib.Logs import debug
++
++def copy_attrs(orig, dest, names, only_if_set=False):
++	"""
++	copy class attributes from an object to another
++	"""
++	for a in Utils.to_list(names):
++		u = getattr(orig, a, ())
++		if u or not only_if_set:
++			setattr(dest, a, u)
++
++def copy_func(tsk):
++	"Make a file copy. This might be used to make other kinds of file processing (even calling a compiler is possible)"
++	env = tsk.env
++	infile = tsk.inputs[0].abspath()
++	outfile = tsk.outputs[0].abspath()
++	try:
++		shutil.copy2(infile, outfile)
++	except (OSError, IOError):
++		return 1
++	else:
++		if tsk.chmod: os.chmod(outfile, tsk.chmod)
++		return 0
++
++def action_process_file_func(tsk):
++	"Ask the function attached to the task to process it"
++	if not tsk.fun: raise Errors.WafError('task must have a function attached to it for copy_func to work!')
++	return tsk.fun(tsk)
++
++@feature('cmd')
++def apply_cmd(self):
++	"call a command everytime"
++	if not self.fun: raise Errors.WafError('cmdobj needs a function!')
++	tsk = Task.TaskBase()
++	tsk.fun = self.fun
++	tsk.env = self.env
++	self.tasks.append(tsk)
++	tsk.install_path = self.install_path
++
++@feature('copy')
++@before_method('process_source')
++def apply_copy(self):
++	Utils.def_attrs(self, fun=copy_func)
++	self.default_install_path = 0
++
++	lst = self.to_list(self.source)
++	self.meths.remove('process_source')
++
++	for filename in lst:
++		node = self.path.find_resource(filename)
++		if not node: raise Errors.WafError('cannot find input file %s for processing' % filename)
++
++		target = self.target
++		if not target or len(lst)>1: target = node.name
++
++		# TODO the file path may be incorrect
++		newnode = self.path.find_or_declare(target)
++
++		tsk = self.create_task('copy', node, newnode)
++		tsk.fun = self.fun
++		tsk.chmod = getattr(self, 'chmod', Utils.O644)
++
++		if not tsk.env:
++			tsk.debug()
++			raise Errors.WafError('task without an environment')
++
++####################
++## command-output ####
++####################
++
++class cmd_arg(object):
++	"""command-output arguments for representing files or folders"""
++	def __init__(self, name, template='%s'):
++		self.name = name
++		self.template = template
++		self.node = None
++
++class input_file(cmd_arg):
++	def find_node(self, base_path):
++		assert isinstance(base_path, Node.Node)
++		self.node = base_path.find_resource(self.name)
++		if self.node is None:
++			raise Errors.WafError("Input file %s not found in " % (self.name, base_path))
++
++	def get_path(self, env, absolute):
++		if absolute:
++			return self.template % self.node.abspath()
++		else:
++			return self.template % self.node.srcpath()
++
++class output_file(cmd_arg):
++	def find_node(self, base_path):
++		assert isinstance(base_path, Node.Node)
++		self.node = base_path.find_or_declare(self.name)
++		if self.node is None:
++			raise Errors.WafError("Output file %s not found in " % (self.name, base_path))
++
++	def get_path(self, env, absolute):
++		if absolute:
++			return self.template % self.node.abspath()
++		else:
++			return self.template % self.node.bldpath()
++
++class cmd_dir_arg(cmd_arg):
++	def find_node(self, base_path):
++		assert isinstance(base_path, Node.Node)
++		self.node = base_path.find_dir(self.name)
++		if self.node is None:
++			raise Errors.WafError("Directory %s not found in " % (self.name, base_path))
++
++class input_dir(cmd_dir_arg):
++	def get_path(self, dummy_env, dummy_absolute):
++		return self.template % self.node.abspath()
++
++class output_dir(cmd_dir_arg):
++	def get_path(self, env, dummy_absolute):
++		return self.template % self.node.abspath()
++
++
++class command_output(Task.Task):
++	color = "BLUE"
++	def __init__(self, env, command, command_node, command_args, stdin, stdout, cwd, os_env, stderr):
++		Task.Task.__init__(self, env=env)
++		assert isinstance(command, (str, Node.Node))
++		self.command = command
++		self.command_args = command_args
++		self.stdin = stdin
++		self.stdout = stdout
++		self.cwd = cwd
++		self.os_env = os_env
++		self.stderr = stderr
++
++		if command_node is not None: self.dep_nodes = [command_node]
++		self.dep_vars = [] # additional environment variables to look
++
++	def run(self):
++		task = self
++		#assert len(task.inputs) > 0
++
++		def input_path(node, template):
++			if task.cwd is None:
++				return template % node.bldpath()
++			else:
++				return template % node.abspath()
++		def output_path(node, template):
++			fun = node.abspath
++			if task.cwd is None: fun = node.bldpath
++			return template % fun()
++
++		if isinstance(task.command, Node.Node):
++			argv = [input_path(task.command, '%s')]
++		else:
++			argv = [task.command]
++
++		for arg in task.command_args:
++			if isinstance(arg, str):
++				argv.append(arg)
++			else:
++				assert isinstance(arg, cmd_arg)
++				argv.append(arg.get_path(task.env, (task.cwd is not None)))
++
++		if task.stdin:
++			stdin = open(input_path(task.stdin, '%s'))
++		else:
++			stdin = None
++
++		if task.stdout:
++			stdout = open(output_path(task.stdout, '%s'), "w")
++		else:
++			stdout = None
++
++		if task.stderr:
++			stderr = open(output_path(task.stderr, '%s'), "w")
++		else:
++			stderr = None
++
++		if task.cwd is None:
++			cwd = ('None (actually %r)' % os.getcwd())
++		else:
++			cwd = repr(task.cwd)
++		debug("command-output: cwd=%s, stdin=%r, stdout=%r, argv=%r" %
++			     (cwd, stdin, stdout, argv))
++
++		if task.os_env is None:
++			os_env = os.environ
++		else:
++			os_env = task.os_env
++		command = Utils.subprocess.Popen(argv, stdin=stdin, stdout=stdout, stderr=stderr, cwd=task.cwd, env=os_env)
++		return command.wait()
++
++@feature('command-output')
++def init_cmd_output(self):
++	Utils.def_attrs(self,
++		stdin = None,
++		stdout = None,
++		stderr = None,
++		# the command to execute
++		command = None,
++
++		# whether it is an external command; otherwise it is assumed
++		# to be an executable binary or script that lives in the
++		# source or build tree.
++		command_is_external = False,
++
++		# extra parameters (argv) to pass to the command (excluding
++		# the command itself)
++		argv = [],
++
++		# dependencies to other objects -> this is probably not what you want (ita)
++		# values must be 'task_gen' instances (not names!)
++		dependencies = [],
++
++		# dependencies on env variable contents
++		dep_vars = [],
++
++		# input files that are implicit, i.e. they are not
++		# stdin, nor are they mentioned explicitly in argv
++		hidden_inputs = [],
++
++		# output files that are implicit, i.e. they are not
++		# stdout, nor are they mentioned explicitly in argv
++		hidden_outputs = [],
++
++		# change the subprocess to this cwd (must use obj.input_dir() or output_dir() here)
++		cwd = None,
++
++		# OS environment variables to pass to the subprocess
++		# if None, use the default environment variables unchanged
++		os_env = None)
++
++@feature('command-output')
++@after_method('init_cmd_output')
++def apply_cmd_output(self):
++	if self.command is None:
++		raise Errors.WafError("command-output missing command")
++	if self.command_is_external:
++		cmd = self.command
++		cmd_node = None
++	else:
++		cmd_node = self.path.find_resource(self.command)
++		assert cmd_node is not None, ('''Could not find command '%s' in source tree.
++Hint: if this is an external command,
++use command_is_external=True''') % (self.command,)
++		cmd = cmd_node
++
++	if self.cwd is None:
++		cwd = None
++	else:
++		assert isinstance(cwd, CmdDirArg)
++		self.cwd.find_node(self.path)
++
++	args = []
++	inputs = []
++	outputs = []
++
++	for arg in self.argv:
++		if isinstance(arg, cmd_arg):
++			arg.find_node(self.path)
++			if isinstance(arg, input_file):
++				inputs.append(arg.node)
++			if isinstance(arg, output_file):
++				outputs.append(arg.node)
++
++	if self.stdout is None:
++		stdout = None
++	else:
++		assert isinstance(self.stdout, str)
++		stdout = self.path.find_or_declare(self.stdout)
++		if stdout is None:
++			raise Errors.WafError("File %s not found" % (self.stdout,))
++		outputs.append(stdout)
++
++	if self.stderr is None:
++		stderr = None
++	else:
++		assert isinstance(self.stderr, str)
++		stderr = self.path.find_or_declare(self.stderr)
++		if stderr is None:
++			raise Errors.WafError("File %s not found" % (self.stderr,))
++		outputs.append(stderr)
++
++	if self.stdin is None:
++		stdin = None
++	else:
++		assert isinstance(self.stdin, str)
++		stdin = self.path.find_resource(self.stdin)
++		if stdin is None:
++			raise Errors.WafError("File %s not found" % (self.stdin,))
++		inputs.append(stdin)
++
++	for hidden_input in self.to_list(self.hidden_inputs):
++		node = self.path.find_resource(hidden_input)
++		if node is None:
++			raise Errors.WafError("File %s not found in dir %s" % (hidden_input, self.path))
++		inputs.append(node)
++
++	for hidden_output in self.to_list(self.hidden_outputs):
++		node = self.path.find_or_declare(hidden_output)
++		if node is None:
++			raise Errors.WafError("File %s not found in dir %s" % (hidden_output, self.path))
++		outputs.append(node)
++
++	if not (inputs or getattr(self, 'no_inputs', None)):
++		raise Errors.WafError('command-output objects must have at least one input file or give self.no_inputs')
++	if not (outputs or getattr(self, 'no_outputs', None)):
++		raise Errors.WafError('command-output objects must have at least one output file or give self.no_outputs')
++
++	cwd = self.bld.variant_dir
++	task = command_output(self.env, cmd, cmd_node, self.argv, stdin, stdout, cwd, self.os_env, stderr)
++	task.generator = self
++	copy_attrs(self, task, 'before after ext_in ext_out', only_if_set=True)
++	self.tasks.append(task)
++
++	task.inputs = inputs
++	task.outputs = outputs
++	task.dep_vars = self.to_list(self.dep_vars)
++
++	for dep in self.dependencies:
++		assert dep is not self
++		dep.post()
++		for dep_task in dep.tasks:
++			task.set_run_after(dep_task)
++
++	if not task.inputs:
++		# the case for svnversion, always run, and update the output nodes
++		task.runnable_status = type(Task.TaskBase.run)(runnable_status, task, task.__class__) # always run
++		task.post_run = type(Task.TaskBase.run)(post_run, task, task.__class__)
++
++	# TODO the case with no outputs?
++
++def post_run(self):
++	for x in self.outputs:
++		x.sig = Utils.h_file(x.abspath())
++
++def runnable_status(self):
++	return self.RUN_ME
++
++Task.task_factory('copy', vars=[], func=action_process_file_func)
++
+diff --git a/wscript b/wscript
+index 4b5acb0ad7..f5d1b28e56 100644
+--- a/wscript
++++ b/wscript
+@@ -1011,9 +1011,15 @@ def configure(conf):
+     if Options.options.dist_target != 'mingw':
+         if Options.options.dist_target != 'msvc' and re.search ("openbsd", sys.platform) == None:
+             if re.search ("freebsd", sys.platform) != None:
+-                conf.check_cc(function_name='dlopen', header_name='dlfcn.h', uselib_store='DL')
++                conf.check_cc(
++                        msg="Checking for function 'dlopen' in dlfcn.h",
++                        fragment = "#include <dlfcn.h>\n int main(void) { dlopen (\"\", 0); return 0;}\n",
++                        uselib_store='DL', execute = False)
+             else:
+-                conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
++                conf.check_cc(
++                        msg="Checking for function 'dlopen' in dlfcn.h",
++                        fragment = "#include <dlfcn.h>\n int main(void) { dlopen (\"\", 0); return 0;}\n",
++                        linkflags='-ldl', uselib_store='DL', execute = False)
+         conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
+                   execute = "1",
+                   mandatory = True,
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0002-Update-waf-to-v2.0.19.patch

@@ -0,0 +1,99 @@
+From 19603d075f7013453c79711a646301df694c7b03 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Mon, 20 Jan 2020 23:08:55 +0100
+Subject: [PATCH 2/8] Update waf to v2.0.19
+
+For oe:
+* Removed waf: we cannot patch binary files. Recipe ships waf
+* tools/misc.py was added from master in previous patch so no adjustment here
+
+Upstream-Status: Backport [1]
+
+[1] https://github.com/Ardour/ardour/commit/19603d075f7013453c79711a646301df694c7b03
+---
+ doc/updating_waf.txt |  25 +++++++++++-------
+ tools/autowaf.py     |  11 ++++----
+ tools/waf-str.patch  |  11 ++++++++
+ 4 files changed, 31 insertions(+), 77 deletions(-)
+ create mode 100644 tools/waf-str.patch
+
+diff --git a/doc/updating_waf.txt b/doc/updating_waf.txt
+index 69c1225d63..0c192d4489 100644
+--- a/doc/updating_waf.txt
++++ b/doc/updating_waf.txt
+@@ -1,15 +1,20 @@
+-Download waf (https://waf.io/)
+-
+-autowaf.py is present in the tools directory of the Ardour source code.
+-a patch for C++11/clang can be found in tools/waflib.patch (needed for waf 1.8.19)
+-
+-Current waf is build as follows;
++# Download waf (https://waf.io/)
++#
++# autowaf.py and misc.py are present in the tools directory of the Ardour source code.
++# - waf-str.patch is needed for py2/py3 compatible install_dir:
++#  * in py2 paths are byte-arrays and would need to be converted using .encode("utf-8")
++#    (otherwise waf expands them /t/o/p/a/t/h/s/l/i/k/e/t/h/i/s)
++#  * however py3 cannot handled encoded arrays:
++#    (TypeError: cannot use a string pattern on a bytes-like object)
++#
++# Current waf is build as follows:
+ 
+ ARDOURSRC=`pwd`
+ cd /tmp
+-curl https://waf.io/waf-1.6.11.tar.bz2 | tar xj
+-cd waf-1.6.11
++curl https://waf.io/waf-2.0.19.tar.bz2 | tar xj
++cd waf-2.0.19
++
++patch -p1 < $ARDOURSRC/tools/waf-str.patch
+ 
+-patch -p1 < $ARDOURSRC/tools/waflib.patch
+-./waf-light -v --make-waf --tools=misc,doxygen,$ARDOURSRC/tools/autowaf.py --prelude=''
++./waf-light -v --make-waf --tools=misc,doxygen,$ARDOURSRC/tools/autowaf.py,$ARDOURSRC/tools/misc.py --prelude=''
+ cp ./waf $ARDOURSRC/waf
+diff --git a/tools/autowaf.py b/tools/autowaf.py
+index f82b80a83f..375dc5909a 100644
+--- a/tools/autowaf.py
++++ b/tools/autowaf.py
+@@ -140,14 +140,13 @@ def check_pkg(conf, name, **args):
+         found = None
+         pkg_var_name = 'PKG_' + name.replace('-', '_')
+         pkg_name = name
+-        if conf.env.PARDEBUG:
+-            args['mandatory'] = False  # Smash mandatory arg
+-            found = conf.check_cfg(package=pkg_name + 'D', args="--cflags --libs", **args)
+-            if found:
+-                pkg_name += 'D'
+         if mandatory:
+             args['mandatory'] = True  # Unsmash mandatory arg
+-        if not found:
++        if 'atleast_version' in args:
++            if not 'msg' in args:
++                args['msg'] = 'Checking for %r >= %s' %(pkg_name, args['atleast_version'])
++            found = conf.check_cfg(package=pkg_name, args=[pkg_name + " >= " + args['atleast_version'], '--cflags', '--libs'], **args)
++        else:
+             found = conf.check_cfg(package=pkg_name, args="--cflags --libs", **args)
+         if found:
+             conf.env[pkg_var_name] = pkg_name
+
+diff --git a/tools/waf-str.patch b/tools/waf-str.patch
+new file mode 100644
+index 0000000000..8d37f68d32
+--- /dev/null
++++ b/tools/waf-str.patch
+@@ -0,0 +1,11 @@
++--- a/waflib/Build.py	2020-01-21 15:01:13.864899388 +0100
+++++ b/waflib/Build.py	2020-01-21 15:01:59.573030630 +0100
++@@ -953,7 +953,7 @@
++ 	tsk.link = kw.get('link', '') or kw.get('install_from', '')
++ 	tsk.relative_trick = kw.get('relative_trick', False)
++ 	tsk.type = kw['type']
++-	tsk.install_to = tsk.dest = kw['install_to']
+++	tsk.install_to = tsk.dest = str(kw['install_to'])
++ 	tsk.install_from = kw['install_from']
++ 	tsk.relative_base = kw.get('cwd') or kw.get('relative_base', self.path)
++ 	tsk.install_user = kw.get('install_user')
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0003-Change-waf-darwin-default-compiler-to-prefer-gcc-if-.patch

@@ -0,0 +1,31 @@
+From 1d2cfd6f2d736144b8c81179126b5850a718f769 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Tue, 21 Jan 2020 02:23:51 +0100
+Subject: [PATCH 3/8] Change waf/darwin default compiler to prefer gcc (if
+ available)
+
+---
+ wscript | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/wscript b/wscript
+index cb3980ed41..e1beb6a86d 100644
+--- a/wscript
++++ b/wscript
+@@ -11,6 +11,13 @@ from waflib.Tools import winres
+ from waflib.Build import Context
+ from waflib.Build import BuildContext
+ 
++# Fixup OSX 10.5/10.6 builds
++# prefer gcc, g++ 4.x over ancient clang-1.5
++from waflib.Tools.compiler_c import c_compiler
++from waflib.Tools.compiler_cxx import cxx_compiler
++c_compiler['darwin'] = ['gcc', 'clang' ]
++cxx_compiler['darwin'] = ['g++', 'clang++' ]
++
+ class i18n(BuildContext):
+         cmd = 'i18n'
+         fun = 'i18n'
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0004-Tweaks-to-build-package-scripts-for-new-waf.patch

@@ -0,0 +1,128 @@
+From 5a841ef4624ef4b776e578af80d2397241754b00 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 22 Jan 2020 00:47:33 +0100
+Subject: [PATCH 5/8] Tweaks to build/package scripts for new waf
+
+* Windows: delete waf installed .dll.a files
+* Windows: override waf's conf.env.LIBDIR = conf.env.BINDIR
+  with explicit --libdir
+* Windows: fix asm (`x86_64-w64-mingw32-as` -D flag is for
+  debug messages, -D defines are not available)
+* Mac: override waf adding -install_name (and
+  -Wl,-compatibility_version -Wl,-current_version)
+  by moving -dynamiclib from linkflags to ldflags
+* Mac: Allow libs with compat version number suffix
+  (not needed anymore, but may help in the future)
+  
+Upstream-Status: Backport [1]
+
+[1] https://github.com/Ardour/ardour/commit/5a841ef4624ef4b776e578af80d2397241754b00
+---
+ libs/ardour/wscript           |  7 ++++++-
+ tools/osx_packaging/osx_build |  2 +-
+ tools/x-win/compile.sh        |  3 ++-
+ tools/x-win/package.sh        |  1 +
+ wscript                       | 17 +++++++++++++++++
+ 5 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/libs/ardour/wscript b/libs/ardour/wscript
+index 8a65daaaf0..a27826953a 100644
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ from waflib.extras import autowaf as autowaf
+-from waflib import Options
++from waflib import Options, Task, Tools
+ import os
+ import sys
+ import re
+@@ -369,6 +369,11 @@ def build(bld):
+     # micro increment <=> no interface changes
+     LIBARDOUR_LIB_VERSION = "3.0.0"
+ 
++    # remove '${DEFINES_ST:DEFINES}' from run_str.
++    # x86_64-w64-mingw32-as (mingw) -D flag is for debug messages
++    if bld.env['build_target'] == 'mingw':
++        class asm(Task.classes['asm']): run_str = '${AS} ${ASFLAGS} ${ASMPATH_ST:INCPATHS} ${AS_SRC_F}${SRC} ${AS_TGT_F}${TGT}'
++
+     # operate on copy to avoid adding sources twice
+     sources = list(libardour_sources)
+     if bld.is_tracks_build():
+diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
+index 2b417b86af..cb681bafd1 100755
+--- a/tools/osx_packaging/osx_build
++++ b/tools/osx_packaging/osx_build
+@@ -449,7 +449,7 @@ while [ true ] ; do
+ 		strip -u -r -arch all $file &>/dev/null
+ 	fi
+ 
+-	deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
++	deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | egrep -v "$(basename $file .dylib).*.dylib"`
+ 	# echo -n "."
+ 	for dep in $deps ; do
+ 	    base=`basename $dep`
+diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh
+index d778e921b5..4f54f6623d 100755
+--- a/tools/x-win/compile.sh
++++ b/tools/x-win/compile.sh
+@@ -79,7 +79,8 @@ LDFLAGS="-L${PREFIX}/lib" ./waf configure \
+ 	--dist-target=mingw \
+ 	--also-include=${PREFIX}/include \
+ 	$ARDOURCFG \
+-	--prefix=${PREFIX}
++	--prefix=${PREFIX} \
++	--libdir=${PREFIX}/lib
+ ./waf ${CONCURRENCY}
+ 
+ if [ "$(id -u)" = "0" ]; then
+diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
+index bfb7381e41..032c45a192 100755
+--- a/tools/x-win/package.sh
++++ b/tools/x-win/package.sh
+@@ -200,6 +200,7 @@ cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/
+ # clean build-dir after depoyment
+ echo " === bundle completed, cleaning up"
+ ./waf uninstall
++find $DESTDIR -name "*.dll.a" | xargs rm
+ echo " === complete"
+ du -sh $DESTDIR
+ 
+diff --git a/wscript b/wscript
+index d4724ecb72..9fd84bb2ca 100644
+--- a/wscript
++++ b/wscript
+@@ -915,6 +915,12 @@ def configure(conf):
+         conf.env.append_value ('CXXFLAGS', '-DSILENCE_AFTER')
+         conf.define ('FREEBIE', 1)
+ 
++    # set explicit LIBDIR, otherwise mingw/windows builds use
++    # conf.env.LIBDIR = conf.env.BINDIR and `waf install` fails
++    # because $BINDIR/ardour6 is the main binary, and $LIBDIR/ardour6/ a directory
++    if Options.options.libdir:
++        conf.env.LIBDIR = Options.options.libdir
++
+     if Options.options.lv2dir:
+         conf.env['LV2DIR'] = Options.options.lv2dir
+     else:
+@@ -1247,6 +1253,17 @@ int main () { return 0; }
+     # Fix utterly braindead FLAC include path to not smash assert.h
+     conf.env['INCLUDES_FLAC'] = []
+ 
++    if sys.platform == 'darwin':
++        # override waf's -install_name added in
++        # waflib/Tools/ccroot.py when -dynamiclib is used
++        if conf.env.LINKFLAGS_cshlib:
++            conf.env.LINKFLAGS_cshlib = [];
++            conf.env.LDFLAGS_cshlib = ['-dynamiclib']
++
++        if conf.env.LINKFLAGS_cxxshlib:
++            conf.env.LINKFLAGS_cxxshlib = [];
++            conf.env.LDFLAGS_cxxshlib = ['-dynamiclib']
++
+     config_text = open('libs/ardour/config_text.cc', "w")
+     config_text.write('''#include "ardour/ardour.h"
+ namespace ARDOUR {
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0005-Downgrade-using-all-channels-warning-to-info-part-2.patch

@@ -0,0 +1,25 @@
+From 7c381dab6e0977f61f9bbd08bd1d20f0fe2abcf6 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Sat, 25 Jan 2020 04:17:53 +0100
+Subject: [PATCH 6/8] Downgrade "using all channels" warning to info - part 2
+
+---
+ libs/backends/alsa/alsa_audiobackend.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
+index 6b044f9fd0..357b00c044 100644
+--- a/libs/backends/alsa/alsa_audiobackend.cc
++++ b/libs/backends/alsa/alsa_audiobackend.cc
+@@ -883,7 +883,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement)
+ 		} else {
+ 		 _n_outputs = std::min (_n_outputs, _pcmi->nplay ());
+ 		}
+-		PBD::warning << _("AlsaAudioBackend: adjusted output channel count to match device.") << endmsg;
++		PBD::info << _("AlsaAudioBackend: adjusted output channel count to match device.") << endmsg;
+ 	}
+ 
+ 	if (_n_inputs != _pcmi->ncapt ()) {
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0006-Update-waf2.x-subst-feature-uses-obj-attributes.patch

@@ -0,0 +1,114 @@
+From 4fe30364951ea46b93e3c93acbaf2f777343d131 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Sat, 25 Jan 2020 06:20:16 +0100
+Subject: [PATCH 7/8] Update waf2.x "subst" feature uses obj attributes
+
+Upstrem-Status: Backport [1]
+
+[1] https://github.com/Ardour/ardour/commit/4fe30364951ea46b93e3c93acbaf2f777343d131
+---
+ libs/fst/wscript                         | 4 +---
+ libs/plugins/a-comp.lv2/wscript          | 2 +-
+ libs/plugins/a-delay.lv2/wscript         | 2 +-
+ libs/plugins/a-eq.lv2/wscript            | 2 +-
+ libs/plugins/a-fluidsynth.lv2/wscript    | 2 +-
+ libs/plugins/a-reverb.lv2/wscript        | 2 +-
+ libs/plugins/reasonablesynth.lv2/wscript | 2 +-
+ 7 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/libs/fst/wscript b/libs/fst/wscript
+index ca90b7207d..bbac8d6f27 100644
+--- a/libs/fst/wscript
++++ b/libs/fst/wscript
+@@ -52,9 +52,7 @@ def build(bld):
+         obj.target = 'ardour-vst-scanner'
+         obj.chmod  = Utils.O755
+         obj.install_path = os.path.join(bld.env['LIBDIR'])
+-        obj.dict   = {
+-            'VERSION' : bld.env['VERSION'],
+-                }
++        obj.VERSION = bld.env['VERSION']
+ 
+         obj = bld (features = 'c cxx cxxprogram wine')
+         obj.source = (
+diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
+index 99d7bb03f1..00099cb564 100644
+--- a/libs/plugins/a-comp.lv2/wscript
++++ b/libs/plugins/a-comp.lv2/wscript
+@@ -34,7 +34,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript
+index 2af05ff137..c28d7cabcf 100644
+--- a/libs/plugins/a-delay.lv2/wscript
++++ b/libs/plugins/a-delay.lv2/wscript
+@@ -33,7 +33,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript
+index e36a804f7f..6f380aa232 100644
+--- a/libs/plugins/a-eq.lv2/wscript
++++ b/libs/plugins/a-eq.lv2/wscript
+@@ -33,7 +33,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
+index 3a093259d6..681ad1f489 100644
+--- a/libs/plugins/a-fluidsynth.lv2/wscript
++++ b/libs/plugins/a-fluidsynth.lv2/wscript
+@@ -32,7 +32,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'cxx cshlib',
+diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript
+index 3eb5ce10bc..a11e2cf7af 100644
+--- a/libs/plugins/a-reverb.lv2/wscript
++++ b/libs/plugins/a-reverb.lv2/wscript
+@@ -32,7 +32,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript
+index 0eb5c55a04..ee54ce8bee 100644
+--- a/libs/plugins/reasonablesynth.lv2/wscript
++++ b/libs/plugins/reasonablesynth.lv2/wscript
+@@ -32,7 +32,7 @@ def build(bld):
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+             obj.install_path = '${LV2DIR}/%s' % bundle
+             obj.chmod = Utils.O644
+-            obj.dict = {'LIB_EXT': module_ext}
++            obj.LIB_EXT = module_ext
+ 
+         # Build plugin library
+         obj = bld(features     = 'c cshlib',
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5/waf-backport/0007-a-comp.lv2-wscript-sync-to-master.patch

@@ -0,0 +1,55 @@
+From cf71cc33c44d25a5483ef3ed4ea994f845e0f9b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 25 Jan 2020 17:20:39 +0100
+Subject: [PATCH] a-comp.lv2/wscript: sync to master
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ libs/plugins/a-comp.lv2/wscript | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
+index 00099cb564..c739e4bea7 100644
+--- a/libs/plugins/a-comp.lv2/wscript
++++ b/libs/plugins/a-comp.lv2/wscript
+@@ -15,10 +15,9 @@ def options(opt):
+ def configure(conf):
+     conf.load('compiler_c')
+     autowaf.configure(conf)
+-    if Options.options.lv2:
+-        autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
+-                uselib_store='LV2_1_0_0')
+-        autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0') 
++    autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.0',
++                      uselib_store='LV2_1_0_0')
++    autowaf.check_pkg(conf, 'cairo', uselib_store='CAIRO', atleast_version='1.12.0')
+ 
+ def build(bld):
+     bundle = 'a-comp.lv2'
+@@ -28,7 +27,6 @@ def build(bld):
+     if bld.is_defined('HAVE_LV2'):
+         # Build RDF files
+         for i in ['manifest.ttl', 'a-comp.ttl', 'a-comp#stereo.ttl', 'presets.ttl']:
+-            bld(features     = 'subst',
+             obj = bld(features='subst')
+             obj.source = i + '.in'
+             obj.target = '../../LV2/%s/%s' % (bundle, i)
+@@ -40,8 +38,8 @@ def build(bld):
+         obj = bld(features     = 'c cshlib',
+                   source       = 'a-comp.c',
+                   name         = 'a-comp',
+-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+-                  includes     = [ '../../ardour' ],
++                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
++                  includes     = [ '../../ardour', '../shared' ],
+                   target       = '../../LV2/%s/a-comp' % bundle,
+                   install_path = '${LV2DIR}/%s' % bundle,
+                   uselib       = 'CAIRO',
+-- 
+2.21.0
+

recipes-musicians/ardour/ardour5_git.bb

@@ -28,30 +28,39 @@ DEPENDS += " \
     fluidsynth \
 "
 
-inherit wafold distro_features_check gtk-icon-cache pkgconfig
+inherit waf features_check gtk-icon-cache pkgconfig python3native mime-xdg
 
-REQUIRED_DISTRO_FEATURE = "x11"
+REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = " \
     git://github.com/Ardour/ardour.git \
+    file://waf-backport/waf \
+    file://waf-backport/0001-Towards-waf-python-2-3-support.patch \
+    file://waf-backport/0002-Update-waf-to-v2.0.19.patch \
+    file://waf-backport/0003-Change-waf-darwin-default-compiler-to-prefer-gcc-if-.patch \
+    file://waf-backport/0004-Tweaks-to-build-package-scripts-for-new-waf.patch \
+    file://waf-backport/0005-Downgrade-using-all-channels-warning-to-info-part-2.patch \
+    file://waf-backport/0006-Update-waf2.x-subst-feature-uses-obj-attributes.patch \
+    file://waf-backport/0007-a-comp.lv2-wscript-sync-to-master.patch \
     file://0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch \
     file://0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch \
     file://0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch \
     file://0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch \
     file://0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch \
+    file://0006-Find-fmt-binding-in-out-of-tree-building.patch \
     file://ardour5.desktop \
 "
 SRCREV = "ae0dcdc0c5d13483271065c360e378202d20170a"
 PV = "5.12"
 S = "${WORKDIR}/git"
 
-
 # arch specific override - default (tested) is ARM -> no fpu-optimizations
 # can be something like i686 / x86_64 see file 'wscript' in sourcepath for more details
 BUILD_DIST_TARGET ??= "none"
 
 EXTRA_OECONF = " \
     --configdir=${sysconfdir} \
+    --bindir=${bindir} \
     --libdir=${libdir} \
     --optimize \
     --cxx11 \
@@ -63,6 +72,19 @@ EXTRA_OECONF = " \
     --dist-target=${BUILD_DIST_TARGET} \
 "
 
+PATH_append = ":${B}"
+
+# Asking fails - waf supports --bindir / --libdir
+waf_preconfigure() {
+}
+
+do_configure_prepend() {
+    # link python -> python3
+    ln -sf `which python3` ${B}/python
+    # copy waf
+    cp -f ${WORKDIR}/waf-backport/waf ${S}/
+}
+
 do_install_append() {
     # install icons to freedesktop locations
     for s in 16 22 32 48 256 512; do

recipes-musicians/ardour/ardour6/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch

@@ -0,0 +1,66 @@
+From 24b6038dc7c235780038d3fce2d9c83fada6ac8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 6 Feb 2017 23:33:45 +0100
+Subject: [PATCH] remove all build flags that cause trouble for cross
+ configure/build
+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@googlemail.com>
+
+---
+ tools/autowaf.py |  1 +
+ wscript          | 26 --------------------------
+ 2 files changed, 1 insertion(+), 26 deletions(-)
+
+diff --git a/tools/autowaf.py b/tools/autowaf.py
+index 375dc5909..bb7714335 100644
+--- a/tools/autowaf.py
++++ b/tools/autowaf.py
+@@ -93,6 +93,7 @@ def copyfile (task):
+ 
+ def check_header(conf, lang, name, define='', mandatory=True):
+     "Check for a header"
++    return True
+     includes = '' # search default system include paths
+     if sys.platform == "darwin":
+         includes = '/opt/local/include'
+diff --git a/wscript b/wscript
+index 9fd84bb2c..d4178cb36 100644
+--- a/wscript
++++ b/wscript
+@@ -476,31 +476,6 @@ int main() { return 0; }''',
+ 
+         compiler_flags.append ("-DARCH_X86")
+ 
+-        if platform == 'linux' :
+-
+-            #
+-            # determine processor flags via /proc/cpuinfo
+-            #
+-
+-            if conf.env['build_target'] != 'i386':
+-
+-                flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+-                x86_flags = flag_line.split (": ")[1:][0].split ()
+-
+-                if "mmx" in x86_flags:
+-                    compiler_flags.append ("-mmmx")
+-                if "sse" in x86_flags:
+-                    build_host_supports_sse = True
+-                if "3dnow" in x86_flags:
+-                    compiler_flags.append ("-m3dnow")
+-
+-            if cpu == "i586":
+-                compiler_flags.append ("-march=i586")
+-            elif cpu == "i686":
+-                compiler_flags.append ("-march=i686")
+-
+-        if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
+-            compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ])
+ 
+         if (conf.env['build_target'] == 'mingw'):
+             if (re.search ("(x86_64|AMD64)", cpu) != None):

recipes-musicians/ardour/ardour6/0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch

@@ -0,0 +1,229 @@
+From 610ce4e19b0b39d0e8391057b22163d4fdc7bdb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 3 Jul 2017 23:24:55 +0200
+Subject: [PATCH 2/2] Use ARM NEON intrinsics if available for mixing functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ libs/ardour/ardour/mix.h |  10 +++
+ libs/ardour/globals.cc   |  13 ++++
+ libs/ardour/mix.cc       | 157 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 180 insertions(+)
+
+diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h
+index 4676c01..55919f0 100644
+--- a/libs/ardour/ardour/mix.h
++++ b/libs/ardour/ardour/mix.h
+@@ -65,6 +65,16 @@ LIBARDOUR_API void  veclib_mix_buffers_no_gain       (ARDOUR::Sample * dst, cons
+ 
+ #endif
+ 
++#if defined (__ARM_NEON__)
++
++LIBARDOUR_API float neon_compute_peak                (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current);
++LIBARDOUR_API void neon_find_peaks                   (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float *min, float *max);
++LIBARDOUR_API void  neon_apply_gain_to_buffer        (ARDOUR::Sample * buf, ARDOUR::pframes_t nframes, float gain);
++LIBARDOUR_API void  neon_mix_buffers_with_gain       (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes, float gain);
++LIBARDOUR_API void  neon_mix_buffers_no_gain         (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes);
++
++#endif
++
+ /* non-optimized functions */
+ 
+ LIBARDOUR_API float default_compute_peak              (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current);
+diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
+index 28eb818..d562b35 100644
+--- a/libs/ardour/globals.cc
++++ b/libs/ardour/globals.cc
+@@ -222,6 +222,19 @@ setup_hardware_optimization (bool try_optimization)
+ 
+ 			info << "Apple VecLib H/W specific optimizations in use" << endmsg;
+ 		}
++#elif defined (__ARM_NEON__)
++		// No runtime detection
++		compute_peak           = neon_compute_peak;
++		find_peaks             = neon_find_peaks;
++		apply_gain_to_buffer   = neon_apply_gain_to_buffer;
++		mix_buffers_with_gain  = neon_mix_buffers_with_gain;
++		mix_buffers_no_gain    = neon_mix_buffers_no_gain;
++		copy_vector            = default_copy_vector;
++
++		generic_mix_functions = false;
++
++		info << "ARM NEON optimizations in use" << endmsg;
++
+ #endif
+ 
+ 		/* consider FPU denormal handling to be "h/w optimization" */
+diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
+index 96ae624..d1a46a2 100644
+--- a/libs/ardour/mix.cc
++++ b/libs/ardour/mix.cc
+@@ -182,4 +182,161 @@ veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pf
+ 
+ #endif
+ 
++#if defined (__ARM_NEON__)
++#include <arm_neon.h>
++
++float
++neon_compute_peak (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float current)
++{
++	float32x4_t v4current = vdupq_n_f32(current);
++	float32x4_t v4work;
++	float32x2_t v2current;
++
++	// unaligned lead (spread single float to vector)
++	while (((intptr_t)buf) % 16 != 0 && nsamples > 0) {
++		v4work = vdupq_n_f32(*buf);
++		v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
++
++		buf++;
++		nsamples--;
++	}
++	// aligned
++	while (nsamples >= 4) {
++		v4work = vld1q_f32(buf);
++		v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
++
++		buf+=4;
++		nsamples-=4;
++	}
++	// rest < 4 (spread single float to vector)
++	while (nsamples > 0) {
++		v4work = vdupq_n_f32(*buf);
++		v4current = vmaxq_f32(v4current, vabsq_f32(v4work));
++
++		buf++;
++		nsamples--;
++	}
++
++	// calc max in vector by pairwise max done twice
++	v2current = vpmax_f32(vget_low_f32(v4current), vget_high_f32(v4current));
++	v2current = vpmax_f32(v2current, v2current);
++	return vget_lane_f32(v2current, 0);
++}
++
++void
++neon_find_peaks (const ARDOUR::Sample * buf, ARDOUR::pframes_t nsamples, float *min, float *max)
++{
++	float32x4_t v4min = vdupq_n_f32(*min);
++	float32x4_t v4max = vdupq_n_f32(*max);
++	float32x4_t v4work;
++	float32x2_t v2min, v2max;
++
++	// vector
++	while (nsamples >= 4) {
++		v4work = vld1q_f32(buf);
++		v4min = vminq_f32(v4min, v4work);
++		v4max = vmaxq_f32(v4max, v4work);
++
++		buf+=4;
++		nsamples-=4;
++	}
++	// rest < 4 (spread single float to vector)
++	while (nsamples > 0) {
++		v4work = vdupq_n_f32(*buf);
++		v4min = vminq_f32(v4min, v4work);
++		v4max = vmaxq_f32(v4max, v4work);
++
++		buf++;
++		nsamples--;
++	}
++
++	// calc min in vector by pairwise max done twice
++	v2min = vpmin_f32(vget_low_f32(v4min), vget_high_f32(v4min));
++	v2min = vpmax_f32(v2min, v2min);
++	*min = vget_lane_f32(v2min, 0);
++	// calc max in vector by pairwise max done twice
++	v2max = vpmax_f32(vget_low_f32(v4max), vget_high_f32(v4max));
++	v2max = vpmax_f32(v2max, v2max);
++	*max = vget_lane_f32(v2max, 0);
++}
++
++void
++neon_apply_gain_to_buffer (ARDOUR::Sample * buf, ARDOUR::pframes_t nframes, float gain)
++{
++	float32x4_t v4gain = vdupq_n_f32(gain);
++	float32x4_t v4work;
++
++	// vector
++	while (nframes >= 4) {
++		v4work = vld1q_f32(buf);
++		v4work = vmulq_f32(v4work, v4gain);
++		vst1q_f32(buf, v4work);
++
++		buf+=4;
++		nframes-=4;
++	}
++	// rest < 4
++	while (nframes > 0) {
++		*buf *= gain;
++
++		buf++;
++		nframes--;
++	}
++}
++
++void
++neon_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes, float gain)
++{
++	float32x4_t v4gain = vdupq_n_f32(gain);
++	float32x4_t v4src, v4dst;
++
++	// vector
++	while (nframes >= 4) {
++		v4src = vld1q_f32(src);
++		v4dst = vld1q_f32(dst);
++		// v4dst = v4dst + v4src * v4gain
++		v4dst = vmlaq_f32(v4dst, v4src, v4gain);
++		vst1q_f32(dst, v4dst);
++
++		src+=4;
++		dst+=4;
++		nframes-=4;
++	}
++	// rest < 4
++	while (nframes > 0) {
++		*dst += *src * gain;
++
++		src++;
++		dst++;
++		nframes--;
++	}
++}
++
++void
++neon_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, ARDOUR::pframes_t nframes)
++{
++	float32x4_t v4src, v4dst;
++
++	// vector
++	while (nframes >= 4) {
++		v4src = vld1q_f32(src);
++		v4dst = vld1q_f32(dst);
++		v4dst = vaddq_f32(v4dst, v4src);
++		vst1q_f32(dst, v4dst);
++
++		src+=4;
++		dst+=4;
++		nframes-=4;
++	}
++	// rest < 4
++	while (nframes > 0) {
++		*dst += *src;
++
++		src++;
++		dst++;
++		nframes--;
++	}
++}
++
++#endif
+ 
+-- 
+2.9.4
+

recipes-musicians/ardour/ardour6_git.bb

@@ -0,0 +1,106 @@
+SUMMARY = "Ardour is a multi-channel digital audio workstation"
+HOMEPAGE = "http://ardour.org/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b"
+
+DEPENDS += " \
+    gettext-native \
+    gtk+ \
+    gtkmm \
+    cppunit \
+    jack \
+    alsa-lib \
+    fftw \
+    vamp-plugin-sdk \
+    aubio \
+    taglib \
+    boost \
+    virtual/libx11 \
+    dssi \
+    zlib \
+    lrdf \
+    rubberband \
+    suil \
+    lilv \
+    libarchive \
+    libltc \
+    qm-dsp \
+    fluidsynth \
+    hidapi \
+"
+
+inherit waf features_check gtk-icon-cache pkgconfig python3native mime-xdg
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = " \
+    git://github.com/Ardour/ardour.git \
+    file://0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch \
+    file://0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch \
+"
+SRCREV = "c8e92338fffa92e4ee0bc03ca8ca9ff93ed8b2b4"
+PV = "6.2"
+S = "${WORKDIR}/git"
+
+# arch specific override - default (tested) is ARM -> no fpu-optimizations
+# can be something like i686 / x86_64 see file 'wscript' in sourcepath for more details
+BUILD_DIST_TARGET ??= "none"
+
+EXTRA_OECONF = " \
+    --configdir=${sysconfdir} \
+    --bindir=${bindir} \
+    --libdir=${libdir} \
+    --optimize \
+    --freedesktop \
+    --cxx11 \
+    --no-phone-home \
+    --use-external-libs \
+    --qm-dsp-include=${STAGING_INCDIR}/qm-dsp \
+    \
+    --with-backends="jack,alsa" \
+    --dist-target=${BUILD_DIST_TARGET} \
+"
+
+PATH_append = ":${B}"
+
+# Asking fails - waf supports --bindir / --libdir
+waf_preconfigure() {
+}
+
+do_configure_prepend() {
+    # link python -> python3
+    ln -sf `which python3` ${B}/python
+}
+
+do_install_append() {
+    # install icons to freedesktop locations
+    for s in 16 22 32 48 256 512; do
+        install -d  ${D}${datadir}/icons/hicolor/${s}x${s}/apps
+        ln -s ../../../../${BPN}/resources/Ardour-icon_${s}px.png \
+            ${D}${datadir}/icons/hicolor/${s}x${s}/apps/${BPN}.png
+    done
+
+    # install .desktop
+    install -d  ${D}${datadir}/applications
+    install -m 0644 ${B}/gtk2_ardour/ardour6.desktop ${D}${datadir}/applications
+}
+
+FILES_${PN}-dev += " \
+    ${libdir}/${BPN}/libardour.so \
+    ${libdir}/${BPN}/libardouralsautil.so \
+    ${libdir}/${BPN}/libaudiographer.so \
+    ${libdir}/${BPN}/libcanvas.so \
+    ${libdir}/${BPN}/libevoral.so \
+    ${libdir}/${BPN}/libgtkmm2ext.so \
+    ${libdir}/${BPN}/libmidipp.so \
+    ${libdir}/${BPN}/libpbd.so \
+    ${libdir}/${BPN}/libptformat.so \
+    ${libdir}/${BPN}/libtemporal.so \
+    ${libdir}/${BPN}/libwaveview.so \
+    ${libdir}/${BPN}/libwidgets.so \
+    ${libdir}/${BPN}/vamp/*.so \
+"
+
+FILES_${PN}-staticdev += " \
+    ${libdir}/${BPN}/*.a \
+"

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

@@ -0,0 +1,28 @@
+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,6 +16,7 @@ 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/bjumblr/bjumblr.bb

@@ -0,0 +1,29 @@
+SUMMARY = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"
+HOMEPAGE = "https://github.com/sjaehn/BJumblr"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit pkgconfig features_check
+
+DEPENDS += " \
+    virtual/libx11 \
+    libsndfile1 \
+    cairo \
+    lv2 \
+"
+
+SRC_URI = " \
+    git://github.com/sjaehn/BJumblr.git \
+    file://0001-BJumblr.cpp-Fix-build-with-gcc10.patch \
+"
+SRCREV = "7a240470926e7929048121f0b67938851d712b6c"
+S = "${WORKDIR}/git"
+PV = "1.2.0"
+
+do_install() {
+    DESTDIR=${D} PREFIX=${prefix} oe_runmake install
+}
+
+FILES_${PN} += "${libdir}/lv2"

recipes-musicians/bjumblr/bjumblr/0001-BJumblr.cpp-Fix-build-with-gcc10.patch

@@ -0,0 +1,56 @@
+From aceb6d17c6ef7abb6780606df780fd6288ff4e71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 9 Jun 2020 22:30:48 +0200
+Subject: [PATCH] BJumblr.cpp: Fix build with gcc10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Error message:
+| src/BJumblr.cpp:70:21: error: 'invalid_argument' is not a member of 'std'
+|    70 |  if (!m) throw std::invalid_argument ("BJumblr.lv2: Host does not support urid:map.");
+|       |                     ^~~~~~~~~~~~~~~~
+| src/BJumblr.cpp:71:34: error: 'invalid_argument' is not a member of 'std'
+|    71 |  if (!workerSchedule) throw std::invalid_argument ("BJumblr.lv2: Host does not support work:schedule.");
+|       |                                  ^~~~~~~~~~~~~~~~
+|  src/BJumblr.cpp: In constructor 'BJumblr::Sample::Sample(const char*)':
+| src/BJumblr.cpp:104:50: error: 'invalid_argument' is not a member of 'std'
+|   104 |         if (!sndfile || !info.frames) throw std::invalid_argument("BJumblr.lv2: Can't open " + std::string(samplepath) + ".");
+|       |                                                  ^~~~~~~~~~~~~~~~
+| src/BJumblr.cpp: In member function 'LV2_State_Status BJumblr::state_restore(LV2_State_Retrieve_Function, LV2_State_Handle, uint32_t, const LV2_Feature* const*)':
+| src/BJumblr.cpp:701:15: error: 'invalid_argument' in namespace 'std' does not name a type
+|   701 |   catch (std::invalid_argument &ia)
+|       |               ^~~~~~~~~~~~~~~~
+| src/BJumblr.cpp:703:29: error: 'ia' was not declared in this scope
+|   703 |    fprintf (stderr, "%s\n", ia.what());
+|       |                             ^~
+| src/BJumblr.cpp: In member function 'LV2_Worker_Status BJumblr::work(LV2_Worker_Respond_Function, LV2_Worker_Respond_Handle, uint32_t, const void*)':
+| src/BJumblr.cpp:842:17: error: 'invalid_argument' in namespace 'std' does not name a type
+|   842 |     catch (std::invalid_argument &ia)
+|       |                 ^~~~~~~~~~~~~~~~
+| src/BJumblr.cpp:844:31: error: 'ia' was not declared in this scope
+|   844 |      fprintf (stderr, "%s\n", ia.what());
+|       |                               ^~
+
+Upstream-Status: Submitted[https://github.com/sjaehn/BJumblr/pull/9]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/BJumblr.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/BJumblr.cpp b/src/BJumblr.cpp
+index 5f89e41..3e97e6a 100644
+--- a/src/BJumblr.cpp
++++ b/src/BJumblr.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "BJumblr.hpp"
++#include <stdexcept>
+ 
+ inline double floorfrac (const double value) {return value - floor (value);}
+ inline double floormod (const double numer, const double denom) {return numer - floor(numer / denom) * denom;}
+-- 
+2.26.2
+

recipes-musicians/bristol/bristol_0.60.11.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceforge.net/projects/bristol/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit autotools pkgconfig  distro_features_check
+inherit autotools pkgconfig  features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-musicians/calf-studio-gear/calf.bb

@@ -10,14 +10,12 @@ SRC_URI = " \
     git://github.com/calf-studio-gear/calf.git \
     file://0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch \
     file://0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch \
-    file://0003-Fix-detection-of-LV2-for-latest-git.patch \
-    file://0004-Find-headers-for-all-versions-of-LV2.patch \
 "
-SRCREV = "e5c08dc2483c444d18d24a37c395274002320f5c"
+SRCREV = "41a2b7fb029cf0099fc05b7a9c569208034018de"
 S = "${WORKDIR}/git"
-PV = "0.90.1"
+PV = "0.90.3"
 
-inherit autotools-brokensep pkgconfig gtk-icon-cache bash-completion qemu-ext
+inherit autotools-brokensep pkgconfig gtk-icon-cache bash-completion qemu-ext-musicians
 
 DEPENDS += " \
     gtk+ \

recipes-musicians/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch

@@ -1,39 +0,0 @@
-From 021850be25992b8a090182a05ad62660414c964f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 19 Jan 2019 21:48:29 +0100
-Subject: [PATCH 1/2] Fix detection of LV2 for latest git
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-LV2 removed lv2-core.pc in [1]. So find lv2 and set required version to 1.1.4
-which was released in September 2016 and should be avalaible on most
-environments. This should be compatible to LV2 1.1.14 because from pkg-config
-point of view lv2-core.pc and lv2.pc look similar.
-
-Upstream-Status: Submitted [2]
-
-[1] https://github.com/drobilla/lv2/commit/4db67120efca2d4c200d2e1ba5cf3d7b97cab97e
-[2] https://github.com/calf-studio-gear/calf/pull/213
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b9c3d500..a0368773 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,7 +79,7 @@ if test "$JACK_FOUND" = "yes"; then
-   PKG_CHECK_MODULES(JACK_RENAME_PORT, jack >= 1.9.11, JACK_HAS_RENAME="yes", JACK_HAS_RENAME_DUMMY="no")
- fi
- 
--PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, LV2_FOUND="yes", LV2_FOUND="no")
-+PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.1.14, LV2_FOUND="yes", LV2_FOUND="no")
- 
- PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0,
-   AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_FOUND="yes", LASH_0_6_FOUND="no"),
--- 
-2.20.1
-

recipes-musicians/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch

@@ -1,75 +0,0 @@
-From 855cf20b9bb9fec30b72fa05a9b4cd28a1b4d35d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 19 Jan 2019 23:00:49 +0100
-Subject: [PATCH 2/2] Find headers for all versions of LV2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/calf-studio-gear/calf/pull/213
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/calf/lv2_options.h | 2 +-
- src/calf/lv2_ui.h      | 2 +-
- src/calf/lv2wrap.h     | 2 +-
- src/makerdf.cpp        | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/calf/lv2_options.h b/src/calf/lv2_options.h
-index 29568b8d..d66153da 100644
---- a/src/calf/lv2_options.h
-+++ b/src/calf/lv2_options.h
-@@ -20,7 +20,7 @@
- #include <stdint.h>
- 
- #include "lv2_urid.h"
--#include "lv2.h"
-+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
- 
- #define LV2_OPTIONS_URI    "http://lv2plug.in/ns/ext/options"
- #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#"
-diff --git a/src/calf/lv2_ui.h b/src/calf/lv2_ui.h
-index b802ec59..c3e60822 100644
---- a/src/calf/lv2_ui.h
-+++ b/src/calf/lv2_ui.h
-@@ -27,7 +27,7 @@
- 
- #include <stdint.h>
- 
--#include "lv2.h"
-+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
- 
- #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui"
- #define LV2_UI_PREFIX LV2_UI_URI "#"
-diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h
-index 8d6b13c4..d19eae7b 100644
---- a/src/calf/lv2wrap.h
-+++ b/src/calf/lv2wrap.h
-@@ -25,7 +25,7 @@
- 
- #include <string>
- #include <vector>
--#include <lv2.h>
-+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
- #include <calf/giface.h>
- #include <calf/lv2_atom.h>
- #include <calf/lv2_atom_util.h>
-diff --git a/src/makerdf.cpp b/src/makerdf.cpp
-index 0b6cec5c..9f782534 100644
---- a/src/makerdf.cpp
-+++ b/src/makerdf.cpp
-@@ -22,7 +22,7 @@
- #include <calf/preset.h>
- #include <calf/utils.h>
- #if USE_LV2
--#include <lv2.h>
-+#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
- #include <calf/lv2_atom.h>
- #include <calf/lv2_options.h>
- #include <calf/lv2_state.h>
--- 
-2.20.1
-

recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch

@@ -14,17 +14,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/source/Makefile.mk b/source/Makefile.mk
-index 688dca20..07afc7a2 100644
+index 6d1b24859..37518ef96 100644
 --- a/source/Makefile.mk
 +++ b/source/Makefile.mk
-@@ -253,7 +253,6 @@ endif
+@@ -285,7 +285,6 @@ endif
  endif
  
  ifeq ($(HAVE_QT5),true)
--QT5_HOSTBINS = $(shell pkg-config --variable=host_bins Qt5Core)
+-QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core)
  MOC_QT5 ?= $(QT5_HOSTBINS)/moc
  RCC_QT5 ?= $(QT5_HOSTBINS)/rcc
  UIC_QT5 ?= $(QT5_HOSTBINS)/uic
 -- 
-2.14.4
+2.26.2
 

recipes-musicians/carla/carla_git.bb

@@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = " \
-    git://github.com/falkTX/Carla.git;branch=develop \
+    git://github.com/falkTX/Carla.git \
     file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \
     file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \
 "
-SRCREV = "8385b5ee418357e2dc907518ac39c20beb3b28ed"
+SRCREV = "1b5080dff02b1e751e32f0582e4aee7bc2c74a67"
 S = "${WORKDIR}/git"
-PV = "2.0.0+git${SRCPV}"
+PV = "2.1.1"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit qmake5_base pkgconfig qemu-ext distro_features_check mime gtk-icon-cache
+inherit qmake5_base pkgconfig qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
 
 B = "${S}"
 

recipes-musicians/chromaprint/chromaprint.bb

@@ -10,10 +10,9 @@ DEPENDS += " \
     ffmpeg \
 "
 
-
 SRC_URI = "git://github.com/acoustid/chromaprint.git"
-SRCREV = "ecd2edd73315530d4f9c1b1186aee24c63a7b6c2"
-PV = "1.4.3"
+SRCREV = "516e3b31c7fa6e822035ea3b3e31f9c7f51ef4b6"
+PV = "1.5.0"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " \

recipes-musicians/csound/csound_git.bb

@@ -2,7 +2,7 @@ SUMMARY = "A sound and music computing system"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-inherit cmake gettext python-dir
+inherit cmake gettext python3native
 
 # TBD: fltk is not propely detected
 DEPENDS += " \
@@ -47,11 +47,11 @@ PACKAGECONFIG[pulseaudio] = "-DUSE_PULSEAUDIO=ON,-DUSE_PULSEAUDIO=OFF,pulseaudio
 PACKAGECONFIG[luajit] = "-DLUA_MODULE_INSTALL_DIR=${libdir}/lua/${LUA_VERSION},,luajit"
 
 PACKAGES =+ " \
-    ${PN}-python2 \
+    ${PN}-python \
     ${PN}-luajit \
 "
 
-FILES_${PN}-python2 = "${PYTHON_SITEPACKAGES_DIR}"
-RDEPENDS_${PN}-python2 += "python"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
+RDEPENDS_${PN}-python += "python3-core"
 
 FILES_${PN}-luajit = "${libdir}/lua"

recipes-musicians/device-control/lpd8editor/lpd8editor.bb

@@ -15,8 +15,8 @@ SRC_URI = " \
     file://0001-Remove-Werror-from-CXXFLAGS.patch\
     file://lpd8-editor.desktop \
 "
-SRCREV = "5ca6f2b90889893e0633b23ffe0e4a014096656a"
-PV = "0.0.12"
+SRCREV = "c5b3a64487b3f126f9da15e94d547eff8e972c0c"
+PV = "0.0.13"
 S = "${WORKDIR}/git"
 
 do_install_append() {

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

@@ -20,7 +20,7 @@ PV = "0.0.0+git${SRCPV}"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit lv2-postinst-helper distro_features_check pack_audio_plugins
+inherit lv2-turtle-helper features_check pack_audio_plugins
 
 # distro-ports dependency for special hack script / libs 
 DEPENDS += " \
@@ -34,21 +34,23 @@ DEPENDS += " \
     distrho-ports \
 "
 
-do_configure() {
-    # 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
+LV2_TTL_GENERATOR = "${STAGING_BINDIR}/lv2_ttl_generator"
 
-	cd ${S}
-    # platforms supporting sse2 can override NOOPTIMIZATIONS
+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?
     NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
 }
 
@@ -62,8 +64,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,11 +8,8 @@ LIC_FILES_CHKSUM = " \
 
 SRC_URI = " \
     git://github.com/DISTRHO/DISTRHO-Ports.git \
-    file://0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch \
-    file://0002-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 \
+    file://0001-Adjust-build-so-ttl-generation-is-postponed.patch \
+    file://0002-make-project.lua-Adjust-includepath-to-fix-build-of-.patch \
     \
     http://linuxsynths.com/ObxdPatchesDemos/ObxdPatchesBrian-01.tar.gz;name=linuxsynths-obxd-patches1;subdir=linuxsynths-obxd-patches \
     \
@@ -20,9 +17,9 @@ SRC_URI = " \
     http://linuxsynths.com/VexPatchesDemos/VexPatches02.tar.gz;name=linuxsynths-vex-patches2;subdir=linuxsynths-vex-patches \
 "
 
-SRCREV = "a82fff059baafc03f7c0e8b9a99f383af7bfbd79"
+SRCREV = "b1770b2258f309c11d32ee718bd7f78bc9ca0ae3"
 S = "${WORKDIR}/git"
-PV = "2018-04-16"
+PV = "2020-07-14+git${SRCPV}"
 
 SRC_URI[linuxsynths-obxd-patches1.md5sum] = "32244f847a54a71ee3c25079df5c8b84"
 SRC_URI[linuxsynths-obxd-patches1.sha256sum] = "246fccadd71bb9f0606a95bf7b0aee7807fd3a14f754367425423a51c31e160e"
@@ -34,10 +31,9 @@ SRC_URI[linuxsynths-vex-patches2.sha256sum] = "378cff261dab333c5f29246b6f3f557e0
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit dos2unix lv2-postinst-helper distro_features_check pack_audio_plugins
+inherit meson lv2-turtle-helper features_check pack_audio_plugins
 
 DEPENDS += " \
-    premake3-native \
     virtual/libgl \
     alsa-lib \
     libx11 \
@@ -47,25 +43,20 @@ DEPENDS += " \
     ladspa-sdk \
 "
 
-do_configure() {
-    # 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
+LV2_TTL_GENERATOR = "${B}/libs/lv2-ttl-generator/lv2_ttl_generator"
 
-    # platforms supporting sse2 can override this (NOOPTIMIZATIONS)
-    NOOPTIMIZATIONS=1 ${S}/scripts/premake-update.sh linux
+do_ttl_sed() {
+    sed -i \
+        -e 's|lv2_ttl_generator,|'\''echo'\'', plugin_lv2_dir / plugin_name + lib_suffix, '\''>>'\'', '\''${LV2_PLUGIN_INFO_FILE}'\'',|g' \
+        ${S}/ports-legacy/meson.build ${S}/ports/meson.build
 }
 
-do_install() {
-    install -d ${D}${libdir}
-	cp -r ${S}/bin/* ${D}${libdir}
+do_configure_append() {
+    # Have no idea how to teach meson this properly...
+    sed -i 's|'\''>>'\''|>>|g' ${B}/build.ninja
+}
 
+do_install_append() {
     # presets
     install -d ${D}${libdir}/lv2
     # obxd
@@ -77,23 +68,39 @@ do_install() {
         cp -rf $file ${D}${libdir}/lv2/
     done
 
-    # install scripts for distro-ports-extra (and abuse libdir to ensure is is found in sysroot)
-    install -d ${D}/${libdir}/distrho-ports-build
-    cp -rf ${WORKDIR}/scripts ${D}${libdir}/distrho-ports-build/
-    cp -rf ${S}/libs ${D}${libdir}/distrho-ports-build/
-    rm -f ${D}${libdir}/distrho-ports-build/libs/lv2_ttl_generator
+    # install ttl-generator and scripts for distrho-ports-extra
+    install -d ${D}${bindir}/scripts
+    install -m 755 ${B}/libs/lv2-ttl-generator/lv2_ttl_generator ${D}${bindir}
+    for file in `find ${S}/scripts -name '*.sh'` ; do
+        install -m 755 $file ${D}${bindir}/scripts
+    done
+    install -m 755 ${S}/scripts/make-project.lua ${D}${bindir}/scripts
+
+    # juce libs & headers for distrho-ports-extra
+    cp -r ${S}/libs ${D}${libdir}/
+    install -m 644 ${B}/libs/juced/libjuced.a ${D}${libdir}
+    install -m 644 ${B}/libs/juce-legacy/libjuce-legacy.a ${D}${libdir}
+    install -m 644 ${B}/libs/juce-current/libjuce-current.a ${D}${libdir}
 }
 
+# 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 scripts for distrho-ports-extra
-FILES_${PN}-staticdev += " \
-    ${libdir}/distrho-ports-build \
+# dummy pack ttl-generator for distrho-ports-extra
+PACKAGES =+ "${PN}-ttl-generator"
+FILES_${PN}-ttl-generator += " \
+    ${bindir}/lv2_ttl_generator \
+    ${bindir}/scripts \
+    ${libdir}/libs \
 "
-RDEPENDS_${PN}-staticdev = "bash perl"
+# ${PN}-ttl-generator is intented for build of distrho-ports-extra and
+# definitely nothing to be installed on target
+INSANE_SKIP_${PN}-ttl-generator = "file-rdeps"
 
 # Have not found what causes stripping - debugging of plugins is unlikely
 INSANE_SKIP_${PN} = "already-stripped"

recipes-musicians/distrho/distrho-ports/0001-Adjust-build-so-ttl-generation-is-postponed.patch

@@ -0,0 +1,45 @@
+From 6854821d70fb76a799d9535ec85abf4c43a21255 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 21 Jul 2020 20:21:58 +0200
+Subject: [PATCH] Adjust build so ttl-generation is postponed
+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>
+---
+ ports-legacy/meson.build | 2 +-
+ ports/meson.build        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ports-legacy/meson.build b/ports-legacy/meson.build
+index f72df49b..817e18c9 100644
+--- a/ports-legacy/meson.build
++++ b/ports-legacy/meson.build
+@@ -274,7 +274,7 @@ if plugin in get_option('plugins')
+                 'mkdir', '-p', plugin_lv2_dir, '&&',
+                 'cd', plugin_lv2_dir, '&&',
+                 'cp', plugin_lv2_lib.full_path(), plugin_lv2_dir / plugin_name + lib_suffix, '&&',
+-                (meson.is_cross_build() ? 'wine' : 'env'), lv2_ttl_generator, '.' / plugin_name + lib_suffix,
++                'echo', plugin_lv2_dir / plugin_name + lib_suffix, '>>', '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/distrho-ports/2020-07-14+gitAUTOINC+b1770b2258-r0/lv2-ttl-generator-data',
+             ],
+             install: true,
+             install_dir: lv2dir,
+diff --git a/ports/meson.build b/ports/meson.build
+index 51e3ad93..e06370ab 100644
+--- a/ports/meson.build
++++ b/ports/meson.build
+@@ -220,7 +220,7 @@ foreach plugin : plugins
+                 'mkdir', '-p', plugin_lv2_dir, '&&',
+                 'cd', plugin_lv2_dir, '&&',
+                 'cp', plugin_lv2_lib.full_path(), plugin_lv2_dir / plugin_name + lib_suffix, '&&',
+-                (meson.is_cross_build() ? 'wine' : 'env'), lv2_ttl_generator, '.' / plugin_name + lib_suffix,
++                lv2_ttl_generator,
+             ],
+             install: true,
+             install_dir: lv2dir,
+-- 
+2.21.3
+

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

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

@@ -1,31 +0,0 @@
-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/0002-make-project.lua-Adjust-includepath-to-fix-build-of-.patch

@@ -0,0 +1,52 @@
+From f420c0b5754060bd4a93108a5c75a1ba4eed886e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 21 Jul 2020 21:31:47 +0200
+Subject: [PATCH] make-project.lua: Adjust includepath to fix build of
+ DISTRHO-Ports-Extra
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ scripts/make-project.lua | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/make-project.lua b/scripts/make-project.lua
+index a68a09eb..c7d074f5 100644
+--- a/scripts/make-project.lua
++++ b/scripts/make-project.lua
+@@ -124,7 +124,7 @@ function make_plugin_project(name, spec)
+     "../../../libs/juce-legacy/source",
+     "../../../libs/juce-legacy/source/modules",
+     "../../../libs/juce-plugin",
+-    "../../../libs/juce-plugin/juce-legacy"
++    "../../../libs/juce-legacy"
+   }
+ 
+   package.libpaths = {
+@@ -156,8 +156,8 @@ end
+ function make_juce_lv2_project(name)
+   package = make_plugin_project(name, "LV2")
+ 
+-  package.config["Release"].links = { "juce-legacy" }
+-  package.config["Debug"].links   = { "juce-legacy_debug" }
++  package.config["Release"].links = { "juce-current" }
++  package.config["Debug"].links   = { "juce-current_debug" }
+ 
+   if (windows) then
+     package.links       = { "comdlg32", "gdi32", "imm32", "ole32", "oleaut32", "shlwapi", "uuid", "version", "winmm", "wininet", "ws2_32" }
+@@ -184,8 +184,8 @@ end
+ function make_juce_vst_project(name)
+   package = make_plugin_project(name, "VST")
+ 
+-  package.config["Release"].links = { "juce-legacy" }
+-  package.config["Debug"].links   = { "juce-legacy_debug" }
++  package.config["Release"].links = { ""juce-legacy", juce-current" }
++  package.config["Debug"].links   = { "juce-legacy_debug", "juce-current_debug" }
+ 
+   package.buildoptions = {
+     package.buildoptions,
+-- 
+2.21.3
+

recipes-musicians/distrho/distrho-ports/0003-Fix-build-with-musl-by-removing-unused-SystemStats-g.patch

@@ -1,134 +0,0 @@
-From 1a4c189c7c5778951edc57f2840889629ce81135 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 3 Apr 2019 23:38:30 +0200
-Subject: [PATCH] Fix build with musl by removing unused
- SystemStats::getStackBacktrace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Musl [1] considers itself as the pure POSIX incarnation and unfortunately
-there are people liking it.
-Since execinfo.h is not part of POSIX but a GNU header [2], musl fails with
-
-| ../source/modules/juce_core/juce_core.cpp:98:12: fatal error: execinfo.h: No such file or directory
-|   #include <execinfo.h>
-|            ^~~~~~~~~~~~
-| compilation terminated.
-
-Removing SystemStats::getStackBacktrace does not cause any harm because it is
-not used.
-
-I am aware that there might be an update of JUCE or other prugins using
-getStackBacktrace in the future but till then musl fan boys are happy.
-
-Upstream-Status: Submitted [3]
-
-[1] https://www.musl-libc.org/
-[2] https://www.gnu.org/software/gnulib/manual/html_node/execinfo_002eh.html
-[3] https://github.com/DISTRHO/DISTRHO-Ports/pull/31
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- .../source/modules/juce_core/juce_core.cpp    |  3 --
- .../juce_core/system/juce_SystemStats.cpp     | 52 -------------------
- .../juce_core/system/juce_SystemStats.h       |  6 ---
- 3 files changed, 61 deletions(-)
-
-diff --git a/libs/juce/source/modules/juce_core/juce_core.cpp b/libs/juce/source/modules/juce_core/juce_core.cpp
-index 136dd284..06c7d17f 100644
---- a/libs/juce/source/modules/juce_core/juce_core.cpp
-+++ b/libs/juce/source/modules/juce_core/juce_core.cpp
-@@ -94,9 +94,6 @@
-  #include <net/if.h>
-  #include <sys/ioctl.h>
- 
-- #if ! JUCE_ANDROID
--  #include <execinfo.h>
-- #endif
- #endif
- 
- #if JUCE_MAC || JUCE_IOS
-diff --git a/libs/juce/source/modules/juce_core/system/juce_SystemStats.cpp b/libs/juce/source/modules/juce_core/system/juce_SystemStats.cpp
-index c073331b..6f814213 100644
---- a/libs/juce/source/modules/juce_core/system/juce_SystemStats.cpp
-+++ b/libs/juce/source/modules/juce_core/system/juce_SystemStats.cpp
-@@ -118,58 +118,6 @@ bool SystemStats::hasAVX2() noexcept            { return getCPUInformation().has
- bool SystemStats::hasNeon() noexcept            { return getCPUInformation().hasNeon; }
- 
- 
--//==============================================================================
--String SystemStats::getStackBacktrace()
--{
--    String result;
--
--   #if JUCE_ANDROID || JUCE_MINGW
--    jassertfalse; // sorry, not implemented yet!
--
--   #elif JUCE_WINDOWS
--    HANDLE process = GetCurrentProcess();
--    SymInitialize (process, nullptr, TRUE);
--
--    void* stack[128];
--    int frames = (int) CaptureStackBackTrace (0, numElementsInArray (stack), stack, nullptr);
--
--    HeapBlock<SYMBOL_INFO> symbol;
--    symbol.calloc (sizeof (SYMBOL_INFO) + 256, 1);
--    symbol->MaxNameLen = 255;
--    symbol->SizeOfStruct = sizeof (SYMBOL_INFO);
--
--    for (int i = 0; i < frames; ++i)
--    {
--        DWORD64 displacement = 0;
--
--        if (SymFromAddr (process, (DWORD64) stack[i], &displacement, symbol))
--        {
--            result << i << ": ";
--
--            IMAGEHLP_MODULE64 moduleInfo;
--            zerostruct (moduleInfo);
--            moduleInfo.SizeOfStruct = sizeof (moduleInfo);
--
--            if (::SymGetModuleInfo64 (process, symbol->ModBase, &moduleInfo))
--                result << moduleInfo.ModuleName << ": ";
--
--            result << symbol->Name << " + 0x" << String::toHexString ((int64) displacement) << newLine;
--        }
--    }
--
--   #else
--    void* stack[128];
--    int frames = backtrace (stack, numElementsInArray (stack));
--    char** frameStrings = backtrace_symbols (stack, frames);
--
--    for (int i = 0; i < frames; ++i)
--        result << frameStrings[i] << newLine;
--
--    ::free (frameStrings);
--   #endif
--
--    return result;
--}
- 
- //==============================================================================
- static SystemStats::CrashHandlerFunction globalCrashHandler = nullptr;
-diff --git a/libs/juce/source/modules/juce_core/system/juce_SystemStats.h b/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-index 89d3854e..a99d830a 100644
---- a/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-+++ b/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-@@ -186,12 +186,6 @@ public:
-     static int getPageSize();
- 
-     //==============================================================================
--    /** Returns a backtrace of the current call-stack.
--        The usefulness of the result will depend on the level of debug symbols
--        that are available in the executable.
--    */
--    static String getStackBacktrace();
--
-     /** A function type for use in setApplicationCrashHandler(). The parameter will contain
-         platform-specific data about the crash.
-     */
--- 
-2.20.1
-

recipes-musicians/distrho/distrho-ports/0004-Further-musl-fix-by-removal-of-unused-function.patch

@@ -1,146 +0,0 @@
-From 06be2d073cb86298cba6ae98f8c7ffbec4f15e7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 4 Apr 2019 00:19:22 +0200
-Subject: [PATCH] Further musl fix by removal of unused function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This time there are _NL_IDENTIFICATION* variables missing. Since the functions
-
-SystemStats::getUserLanguage()
-SystemStats::getUserRegion()
-SystemStats::getDisplayLanguage()
-
-are not in use there is no harm caused by removing them.
-
-Same: I am aware that there might be an update of JUCE or other prugins using
-getStackBacktrace in the future but till then musl fan boys are happy.
-
-Upstream-Status: Submitted [1]
-
-[1] https://github.com/DISTRHO/DISTRHO-Ports/pull/31
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- .../native/juce_android_SystemStats.cpp       |  4 ----
- .../native/juce_linux_SystemStats.cpp         |  4 ----
- .../juce_core/native/juce_mac_SystemStats.mm  | 11 ----------
- .../native/juce_win32_SystemStats.cpp         | 22 -------------------
- .../juce_core/system/juce_SystemStats.h       | 17 --------------
- 5 files changed, 58 deletions(-)
-
-diff --git a/libs/juce/source/modules/juce_core/native/juce_android_SystemStats.cpp b/libs/juce/source/modules/juce_core/native/juce_android_SystemStats.cpp
-index a1bdd59e..6055352f 100644
---- a/libs/juce/source/modules/juce_core/native/juce_android_SystemStats.cpp
-+++ b/libs/juce/source/modules/juce_core/native/juce_android_SystemStats.cpp
-@@ -445,10 +445,6 @@ String SystemStats::getComputerName()
- }
- 
- 
--String SystemStats::getUserLanguage()    { return AndroidStatsHelpers::getLocaleValue (false); }
--String SystemStats::getUserRegion()      { return AndroidStatsHelpers::getLocaleValue (true); }
--String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
--
- //==============================================================================
- void CPUInformation::initialise() noexcept
- {
-diff --git a/libs/juce/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/libs/juce/source/modules/juce_core/native/juce_linux_SystemStats.cpp
-index 40f19187..07a99749 100644
---- a/libs/juce/source/modules/juce_core/native/juce_linux_SystemStats.cpp
-+++ b/libs/juce/source/modules/juce_core/native/juce_linux_SystemStats.cpp
-@@ -129,10 +129,6 @@ static String getLocaleValue (nl_item key)
-     return result;
- }
- 
--String SystemStats::getUserLanguage()    { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
--String SystemStats::getUserRegion()      { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
--String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
--
- //==============================================================================
- void CPUInformation::initialise() noexcept
- {
-diff --git a/libs/juce/source/modules/juce_core/native/juce_mac_SystemStats.mm b/libs/juce/source/modules/juce_core/native/juce_mac_SystemStats.mm
-index 81f62192..b0a751dd 100644
---- a/libs/juce/source/modules/juce_core/native/juce_mac_SystemStats.mm
-+++ b/libs/juce/source/modules/juce_core/native/juce_mac_SystemStats.mm
-@@ -241,17 +241,6 @@ static String getLocaleValue (CFStringRef key)
-     return result;
- }
- 
--String SystemStats::getUserLanguage()   { return getLocaleValue (kCFLocaleLanguageCode); }
--String SystemStats::getUserRegion()     { return getLocaleValue (kCFLocaleCountryCode); }
--
--String SystemStats::getDisplayLanguage()
--{
--    CFArrayRef cfPrefLangs = CFLocaleCopyPreferredLanguages();
--    const String result (String::fromCFString ((CFStringRef) CFArrayGetValueAtIndex (cfPrefLangs, 0)));
--    CFRelease (cfPrefLangs);
--    return result;
--}
--
- //==============================================================================
- /*  NB: these are kept outside the HiResCounterInfo struct and initialised to 1 to avoid
-     division-by-zero errors if some other static constructor calls us before this file's
-diff --git a/libs/juce/source/modules/juce_core/native/juce_win32_SystemStats.cpp b/libs/juce/source/modules/juce_core/native/juce_win32_SystemStats.cpp
-index e2b44093..c78cf747 100644
---- a/libs/juce/source/modules/juce_core/native/juce_win32_SystemStats.cpp
-+++ b/libs/juce/source/modules/juce_core/native/juce_win32_SystemStats.cpp
-@@ -469,26 +469,4 @@ static String getLocaleValue (LCID locale, LCTYPE key, const char* defaultValue)
-     return defaultValue;
- }
- 
--String SystemStats::getUserLanguage()     { return getLocaleValue (LOCALE_USER_DEFAULT, LOCALE_SISO639LANGNAME,  "en"); }
--String SystemStats::getUserRegion()       { return getLocaleValue (LOCALE_USER_DEFAULT, LOCALE_SISO3166CTRYNAME, "US"); }
--
--String SystemStats::getDisplayLanguage()
--{
--    DynamicLibrary dll ("kernel32.dll");
--    JUCE_LOAD_WINAPI_FUNCTION (dll, GetUserDefaultUILanguage, getUserDefaultUILanguage, LANGID, (void))
--
--    if (getUserDefaultUILanguage == nullptr)
--        return "en";
--
--    const DWORD langID = MAKELCID (getUserDefaultUILanguage(), SORT_DEFAULT);
--
--    String mainLang (getLocaleValue (langID, LOCALE_SISO639LANGNAME, "en"));
--    String region   (getLocaleValue (langID, LOCALE_SISO3166CTRYNAME, nullptr));
--
--    if (region.isNotEmpty())
--        mainLang << '-' << region;
--
--    return mainLang;
--}
--
- } // namespace juce
-diff --git a/libs/juce/source/modules/juce_core/system/juce_SystemStats.h b/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-index a99d830a..ca560670 100644
---- a/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-+++ b/libs/juce/source/modules/juce_core/system/juce_SystemStats.h
-@@ -106,23 +106,6 @@ public:
-     /** Returns the host-name of the computer. */
-     static String getComputerName();
- 
--    /** Returns the language of the user's locale.
--        The return value is a 2 or 3 letter language code (ISO 639-1 or ISO 639-2)
--    */
--    static String getUserLanguage();
--
--    /** Returns the region of the user's locale.
--        The return value is a 2 letter country code (ISO 3166-1 alpha-2).
--    */
--    static String getUserRegion();
--
--    /** Returns the user's display language.
--        The return value is a 2 or 3 letter language code (ISO 639-1 or ISO 639-2).
--        Note that depending on the OS and region, this may also be followed by a dash
--        and a sub-region code, e.g "en-GB"
--    */
--    static String getDisplayLanguage();
--
-     /** This will attempt to return some kind of string describing the device.
-         If no description is available, it'll just return an empty string. You may
-         want to use this for things like determining the type of phone/iPad, etc.
--- 
-2.20.1
-

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

@@ -1,163 +0,0 @@
-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,43 +4,37 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=ec024abddfab2ee463c8c1ad98883d12 \
 "
 
-SRC_URI = " \
-    git://github.com/DISTRHO/DPF-Plugins.git \
-"
-
-SRCREV = "3adff289617ed32f9d0cb679b05e430531cbf0dd"
+SRC_URI = "git://github.com/DISTRHO/DPF-Plugins.git"
+SRCREV = "86084a934adb26f529038cbcf901fd7a09b95897"
 S = "${WORKDIR}/git"
-PV = "v1.1+git${SRCPV}"
+PV = "v1.3+git${SRCPV}"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-inherit qemu-ext distro_features_check pkgconfig pack_audio_plugins
+inherit pkgconfig lv2-turtle-helper pack_audio_plugins features_check
 
-# TODO standalones: DEPEND jack / install / *.desktop
+# TODO standalone: *.desktop
 DEPENDS += " \
     virtual/libgl \
+    cairo \
     ladspa-sdk \
     lv2 \
+    liblo \
+    jack \
     projectm \
 "
 
-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
-}
+EXTRA_OEMAKE += " \
+    NOOPT=true \
+    SKIP_STRIPPING=true \
+"
 
 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/
@@ -61,5 +55,5 @@ do_install() {
     done
 }
 
-# Have not found what causes stripping - debugging of plugins is unlikely
-INSANE_SKIP_${PN} = "already-stripped"
+PACKAGES =+ "${PN}-standalone"
+FILES_${PN}-standalone = "${bindir}"

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

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

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

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

@@ -0,0 +1,25 @@
+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.bb

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

recipes-musicians/drobilla/ingen.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 pythonnative
+inherit waf pkgconfig gtk-icon-cache pack_audio_plugins python3native
 
 DEPENDS += " \
     boost \
@@ -16,10 +16,10 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    git://github.com/drobilla/ingen.git \
-    file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
+    gitsm://gitlab.com/drobilla/ingen.git;protocol=https \
+    file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "cc3d7ef610e5f93086eb46406cc600ee81a23e98"
+SRCREV = "36949a845cf79e105445b9bc8656f2560469dc4d"
 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.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=eb60cfffc455677d4f11cf7f36c12093"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2b0c9f0c37e43f926aac5d7732f06dfb"
 
 inherit waf pkgconfig gtk-icon-cache
 
@@ -20,12 +20,12 @@ DEPENDS += " \
 "
 
 SRC_URI = " \
-    git://github.com/drobilla/jalv.git \
-    file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \
+    gitsm://gitlab.com/drobilla/jalv.git;protocol=https \
+    file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "8311df91cc212adf3220acfcb50ab63414fe9dd6"
+SRCREV = "15f779a8603bc3f020e7000189900c52964771cd"
 S = "${WORKDIR}/git"
-PV = "1.6.0+git${SRCPV}"
+PV = "1.6.4+git${SRCPV}"
 
 FILES_${PN} += " \
     ${libdir}/jack \

recipes-musicians/drobilla/lilv_0.24.4.bb

@@ -1,14 +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=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/mda-lv2.bb

@@ -3,15 +3,19 @@ HOMEPAGE = "https://drobilla.net/software/mda-lv2"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit waf distro_features_check pkgconfig
+inherit waf features_check pkgconfig
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "lv2"
 
-SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "1962f48c54eafe52a3d2471cd3072aa8"
-SRC_URI[sha256sum] = "a476c31ed9f8b009ebacc32a02d06ba9584c0d0d03f03dd62b1354d10a030442"
+SRC_URI = " \
+    gitsm://gitlab.com/drobilla/mda-lv2.git;protocol=https \
+    file://0001-Fix-build-for-python3-only-environments.patch \
+"
+SRCREV = "1761c1c97a4a4b9b5dc1bbb5b2784bafa8c7d2d5"
+PV = "1.2.4"
+S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " \
     --lv2dir=${libdir}/lv2 \

recipes-musicians/drobilla/patchage.bb

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

recipes-musicians/drobilla/raul.bb

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

recipes-musicians/drobilla/serd.bb

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

recipes-musicians/drobilla/sord.bb

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

recipes-musicians/drumgizmo/drumgizmo.bb

@@ -1,8 +1,8 @@
 require ${BPN}.inc
 
-inherit autotools-brokensep pkgconfig distro_features_check gtk-icon-cache qemu-ext
+inherit autotools-brokensep pkgconfig features_check gtk-icon-cache qemu-ext-musicians
 
-REQUIRED_DISTRO_FEATURE = "x11"
+REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS += " \
     ${BPN}-native \
@@ -20,6 +20,7 @@ SRC_URI += " \
     file://0001-automake-enable-subdir-objects.patch \
     file://0002-Use-native-rcgen.patch \
     file://0003-Do-not-create-Manifest.ttl-with-cross-ttlgen.patch \
+    file://0004-Fix-build-with-lv2-1.1.18.patch \
     file://drumgizmo.desktop \
 "
 

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] = "370b0931f5ab95952d0b85eea2533837"
-SRC_URI[sha256sum] = "a1a31b2af5544e39e8e19c370fa6fee0a372a14fffa762d4d12debf4e711ec9c"
-PV = "0.9.17"
+SRC_URI[md5sum] = "fb2340ab61062e0814f4539657dc14ec"
+SRC_URI[sha256sum] = "67a2d9d4aa11ee92f000cc8a49710408c2328b2581a5339be3cbfe91d99feb2e"
+PV = "0.9.18.1"

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: Wed, 31 Jul 2019 20:20:25 +0200
+Date: Thu, 24 Oct 2019 21:47:59 +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 7751154..d22f9c5 100644
+index 6c0d324..5b36f21 100644
 --- a/plugin/Makefile.am
 +++ b/plugin/Makefile.am
-@@ -42,7 +42,7 @@ ttlgen_SOURCES = \
- 	$(top_srcdir)/plugin/plugingizmo/ttlgen.cc
+@@ -66,7 +66,7 @@ UITYPE=CocoaUI
+ endif
  
  manifest.ttl : ttlgen drumgizmo.la
--	./ttlgen .libs/drumgizmo.so manifest.ttl
-+	echo ./ttlgen .libs/drumgizmo.so manifest.ttl
+-	./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
++	echo ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
  
  
  #######

recipes-musicians/drumgizmo/files/0004-Fix-build-with-lv2-1.1.18.patch

@@ -0,0 +1,63 @@
+From 69a7bfe770436964140d310288991dfb08c42ff9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 21 May 2020 22:48:18 +0200
+Subject: [PATCH] Fix build with lv2 >= 1.1.18
+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>
+---
+ plugin/plugingizmo/pluginlv2.cc | 4 ++--
+ plugin/plugingizmo/pluginlv2.h  | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugin/plugingizmo/pluginlv2.cc b/plugin/plugingizmo/pluginlv2.cc
+index d12c0e7..afcd7ab 100644
+--- a/plugin/plugingizmo/pluginlv2.cc
++++ b/plugin/plugingizmo/pluginlv2.cc
+@@ -86,7 +86,7 @@ void PluginLV2::setLatency(float latency)
+ 	}
+ }
+ 
+-LV2_Handle PluginLV2::instantiate(const struct _LV2_Descriptor* descriptor,
++LV2_Handle PluginLV2::instantiate(const struct LV2_Descriptor* descriptor,
+                                   double sample_rate,
+                                   const char* bundle_path,
+                                   const LV2_Feature *const *features)
+@@ -616,7 +616,7 @@ const void* PluginLV2::extensionData(const char *uri)
+ //
+ // GUI
+ //
+-LV2UI_Handle PluginLV2::uiInstantiate(const struct _LV2UI_Descriptor*descriptor,
++LV2UI_Handle PluginLV2::uiInstantiate(const struct LV2UI_Descriptor*descriptor,
+                                       const char * plugin_uri,
+                                       const char * bundle_path,
+                                       LV2UI_Write_Function write_function,
+diff --git a/plugin/plugingizmo/pluginlv2.h b/plugin/plugingizmo/pluginlv2.h
+index 8365de7..3955710 100644
+--- a/plugin/plugingizmo/pluginlv2.h
++++ b/plugin/plugingizmo/pluginlv2.h
+@@ -192,7 +192,7 @@ public:
+ 	void closeWindow() override;
+ 
+ public:
+-	static LV2_Handle instantiate(const struct _LV2_Descriptor* descriptor,
++	static LV2_Handle instantiate(const struct LV2_Descriptor* descriptor,
+ 	                              double sample_rate,
+ 	                              const char* bundle_path,
+ 	                              const LV2_Feature* const * features);
+@@ -222,7 +222,7 @@ public:
+ 	                                uint32_t flags,
+ 	                                const LV2_Feature *const * features);
+ 
+-	static LV2UI_Handle uiInstantiate(const struct _LV2UI_Descriptor * descriptor,
++	static LV2UI_Handle uiInstantiate(const struct LV2UI_Descriptor * descriptor,
+ 	                                  const char * plugin_uri,
+ 	                                  const char * bundle_path,
+ 	                                  LV2UI_Write_Function write_function,
+-- 
+2.21.1
+

recipes-musicians/gmidimonitor/files/gmidimonitor-alsa.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GMidiMonitor Alsa
-Comment=Shows Alsa MIDI events
-Exec=gmidimonitor --alsa
-Icon=gmidimonitor
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;AudioVideo;Audio;Multimedia;

recipes-musicians/gmidimonitor/files/gmidimonitor-jack.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GMidiMonitor Jack
-Comment=Shows Jack MIDI events
-Exec=gmidimonitor --jack
-Icon=gmidimonitor
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;AudioVideo;Audio;Multimedia;

recipes-musicians/gmidimonitor/gmidimonitor_3.6.bb

@@ -1,32 +1,17 @@
 SUMMARY = "GTK+ application that shows MIDI events"
-HOMEPAGE = "http://home.gna.org/gmidimonitor"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f1e8b3e96c0abf4e3abb3b0f8e8eaf7f"
+LICENSE = "LGPLv2 & PD"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=f1e8b3e96c0abf4e3abb3b0f8e8eaf7f \
+    file://COPYING.icon;md5=1d49e879912b1ea962200c42d117ca6c \
+"
 
-inherit waf gtk-icon-cache
+inherit meson gtk-icon-cache
 
 DEPENDS += " \
-    gtk+ \
+    gtk+3 \
     jack \
 "
 
-SRC_URI = " \
-    git://repo.or.cz/gmidimonitor.git \
-    http://upload.wikimedia.org/wikipedia/commons/d/d5/RB_keyboard_icon.svg;name=icon \
-    file://gmidimonitor-alsa.desktop \
-    file://gmidimonitor-jack.desktop \
-"
-SRCREV = "a50612655903f1a56748604a5d0d27a5044a78b3"
+SRC_URI = "git://github.com/schnitzeltony/gmidimonitor.git"
+SRCREV = "af366f49970ed91a414e5b832a13436417be4bdb"
 S = "${WORKDIR}/git"
-
-SRC_URI[icon.md5sum] = "e6e764ea13f2b15a297d8cd62540edf2"
-SRC_URI[icon.sha256sum] = "16d3e31b4e9ef6e9c7ba3ab79876726f52da21631870cea95076a98913a0bd2c"
-
-do_install_append() {
-    install -d "${D}/${datadir}/applications"
-    install ${WORKDIR}/gmidimonitor-alsa.desktop ${D}/${datadir}/applications/
-    install ${WORKDIR}/gmidimonitor-jack.desktop ${D}/${datadir}/applications/
-
-    install -d "${D}/${datadir}/pixmaps"
-    install ${WORKDIR}/RB_keyboard_icon.svg ${D}/${datadir}/pixmaps/${BPN}.svg
-}

recipes-musicians/guitarix/guitarix.bb

@@ -3,24 +3,25 @@ HOMEPAGE = "http://guitarix.org/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
 
-PV = "0.38.1"
 SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
-    file://0001-do-not-perform-link-test-durin-cross-build.patch \
+    git://github.com/brummer10/guitarix.git \
+    file://0001-Rework-messages-somehow-yes-or-no-is-missing.patch \
+    file://0002-Do-not-strip-LV2-plugins.patch \
 "
-SRC_URI[md5sum] = "d9aec810bf164cbf040b298cb9c45d50"
-SRC_URI[sha256sum] = "00fda3e1ce1d5f1691665f9ff32bb3c9800381313d49b7c2e25618d0b3ed872f"
+SRCREV = "9e6dbe30cb5fc226e5d3c02190f1bce0b3fde539"
+PV = "0.40.0+git${SRCPV}"
+S = "${WORKDIR}/git/trunk"
 
-inherit wafold fontcache gettext
+inherit waf fontcache gettext
 
 DEPENDS += " \
     gperf-native \
     intltool-native \
+    sassc-native \
     boost \
     libeigen \
     avahi \
-    bluez5 \
-    gtkmm \
+    gtkmm3 \
     jack \
     lilv \
     ladspa-sdk \
@@ -30,16 +31,35 @@ DEPENDS += " \
     zita-convolver \
 "
 
+PACKAGECONFIG[bluez] = ",--no-bluez,bluez5"
+
 EXTRA_OECONF = " \
     --disable-sse \
+    --bindir=${bindir} \
+    --libdir=${libdir} \
     --ldflags="${LDFLAGS}" \
     --no-ldconfig \
     --no-desktop-update \
     --shared-lib \
     --lib-dev \
     --install-roboto-font \
+    --no-faust \
 "
 
+python waf_preconfigure() {
+}
+
+PATH_prepend = "${B}:"
+
+do_configure_prepend() {
+    # link python -> python3
+    ln -sf `which python3` ${B}/python
+}
+
+do_compile_prepend() {
+    export STRIP=echo
+}
+
 do_install_append() {
     # some corrections [dev-elf] - inspired by https://src.fedoraproject.org/rpms/guitarix/blob/master/f/guitarix.spec
     chmod 755 ${D}${libdir}/libgxw*.so.0.1

recipes-musicians/guitarix/guitarix/0001-Rework-messages-somehow-yes-or-no-is-missing.patch

@@ -0,0 +1,33 @@
+From 6d873f6758321065756805d24a44aab5618a1955 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 11 Jun 2020 18:11:13 +0200
+Subject: [PATCH] Rework messages - somehow 'yes' or 'no' is missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ wscript | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..c4882262 100644
+--- a/wscript
++++ b/wscript
+@@ -153,10 +153,9 @@ def display_msg(msg, status = None, color = None):
+     global g_maxlen
+     g_maxlen = max(g_maxlen, len(msg))
+     if status is not None:
+-        print_msg("%s :" % msg.ljust(g_maxlen),False)
+-        Logs.pprint(color, status)
++        print("%s : %s" % (msg, status))
+     else:
+-        print_msg("%s" % msg.ljust(g_maxlen))
++        print("%s" % msg)
+ 
+ def error_msg(msg):
+     Utils.eprint('RED', msg)
+-- 
+2.21.3
+

recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch

@@ -1,33 +0,0 @@
-From c2fca3345cfbcb0fc129ea23e8438057202604f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 4 Aug 2017 22:01:03 +0200
-Subject: [PATCH] do not perform link test durin cross build
-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@googlemail.com>
----
- src/ladspa/wscript | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/ladspa/wscript b/src/ladspa/wscript
-index be5f31d..2c43e2d 100644
---- a/src/ladspa/wscript
-+++ b/src/ladspa/wscript
-@@ -10,10 +10,6 @@ def configure(conf):
- def test_loadable(self):
-     def link_and_test(lib=self.link_task.outputs[0].bldpath(self.env), link=self.link_task.run):
-         link()
--        try:
--            ctypes.cdll.LoadLibrary(lib)
--        except Exception as e:
--            raise RuntimeError("LADSPA load test failed: %s" % e)
-     self.link_task.run = link_and_test
- 
- def build(bld):
--- 
-2.9.4
-

recipes-musicians/guitarix/guitarix/0002-Do-not-strip-LV2-plugins.patch

@@ -0,0 +1,28 @@
+From 8babbcc4b204d3ff2bf485ac48da1ce55b91741b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 11 Jun 2020 18:44:50 +0200
+Subject: [PATCH] Do not strip LV2 plugins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 100644
+--- a/wscript
++++ b/wscript
+@@ -375,7 +375,6 @@ def configure(conf):
+     conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+     conf.env['BIN_NAME'] = APPNAME
+     if opt.lv2:
+-        conf.gxload('strip')
+         conf.gxload('lv2')
+     conf.env['LADSPA'] = opt.ladspa
+     conf.env['NEW_LADSPA'] = opt.new_ladspa
+-- 
+2.21.3
+

recipes-musicians/guitarix/gxplugins.lv2.bb

@@ -3,13 +3,10 @@ HOMEPAGE = "https://github.com/brummer10/GxPlugins.lv2"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
-SRC_URI = " \
-    gitsm://github.com/brummer10/GxPlugins.lv2.git \
-    file://0001-Adjust-Makefiles-for-cross-compiling.patch \
-"
-SRCREV = "63f19485984c002caddec734a9ee94faad2acb55"
+SRC_URI = "gitsm://github.com/brummer10/GxPlugins.lv2.git"
+SRCREV = "e40b34f3fd5dc4c6523dc826062d0ddb2578f573"
 S = "${WORKDIR}/git"
-PV = "0.6"
+PV = "0.8"
 
 inherit pkgconfig
 
@@ -20,6 +17,7 @@ DEPENDS += " \
 "
 
 do_compile() {
+    export GUI_LDFLAGS="${LDFLAGS}"
     oe_runmake SSE_CFLAGS= STRIP=echo 
 }
 

recipes-musicians/guitarix/gxplugins.lv2/0001-Adjust-Makefiles-for-cross-compiling.patch

@@ -1,826 +0,0 @@
-From 50092b8f2c5c2c6de3de90d97f75b6fd475b8b5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 27 Jan 2019 00:37:05 +0100
-Subject: [PATCH] Adjust Makefiles for cross-compiling
-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>
----
- GxAxisFace.lv2/Makefile                       | 36 +++---------------
- GxBoobTube.lv2/Makefile                       | 34 ++---------------
- GxBottleRocket.lv2/Makefile                   | 38 +++----------------
- .../gui/gx_bottlerocket_x11ui.c               |  2 +-
- GxCreamMachine.lv2/Makefile                   | 34 ++---------------
- GxDOP250.lv2/Makefile                         | 36 +++---------------
- GxFz1b.lv2/Makefile                           | 38 +++----------------
- GxFz1s.lv2/Makefile                           | 38 +++----------------
- GxGuvnor.lv2/Makefile                         | 32 ++--------------
- GxHeathkit.lv2/Makefile                       | 36 +++---------------
- GxHotBox.lv2/Makefile                         | 37 +++---------------
- GxHotBox.lv2/gui/gx_hotbox_x11ui.c            |  2 +-
- GxHyperion.lv2/Makefile                       | 32 ++--------------
- GxHyperion.lv2/gui/gx_hyperion_x11ui.c        |  2 +-
- GxKnightFuzz.lv2/Makefile                     | 36 +++---------------
- GxLiquidDrive.lv2/Makefile                    | 36 +++---------------
- GxMicroAmp.lv2/Makefile                       | 36 +++---------------
- GxQuack.lv2/Makefile                          | 38 +++----------------
- GxSD1.lv2/Makefile                            | 38 +++----------------
- GxSD2Lead.lv2/Makefile                        | 36 +++---------------
- GxSVT.lv2/Makefile                            | 36 +++---------------
- GxSaturator.lv2/Makefile                      | 32 ++--------------
- GxSlowGear.lv2/Makefile                       | 32 ++--------------
- GxSunFace.lv2/Makefile                        | 36 +++---------------
- GxSuperFuzz.lv2/Makefile                      | 32 ++--------------
- GxSuppaToneBender.lv2/Makefile                | 32 ++--------------
- GxSuppaToneBender.lv2/gui/gx_vstb_x11ui.c     |  2 +-
- GxToneMachine.lv2/Makefile                    | 32 ++--------------
- GxTubeDistortion.lv2/Makefile                 | 36 +++---------------
- GxUVox720k.lv2/Makefile                       | 32 ++--------------
- GxVBassPreAmp.lv2/Makefile                    | 38 +++----------------
- GxVBassPreAmp.lv2/gui/gx_voxbass_x11ui.c      |  2 +-
- GxValveCaster.lv2/Makefile                    | 36 +++---------------
- GxVintageFuzzMaster.lv2/Makefile              | 32 ++--------------
- GxVmk2.lv2/Makefile                           | 34 ++---------------
- GxVoodoFuzz.lv2/Makefile                      | 32 ++--------------
- GxVoodoFuzz.lv2/gui/gx_voodoo_x11ui.c         |  2 +-
- 37 files changed, 145 insertions(+), 950 deletions(-)
-
-diff --git a/GxAxisFace.lv2/Makefile b/GxAxisFace.lv2/Makefile
-index 1193800..ea27187 100644
---- a/GxAxisFace.lv2/Makefile
-+++ b/GxAxisFace.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxBoobTube.lv2/Makefile b/GxBoobTube.lv2/Makefile
-index 66cf7eb..1f81fcd 100644
---- a/GxBoobTube.lv2/Makefile
-+++ b/GxBoobTube.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -84,8 +58,8 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png 
- 	@$(ECHO) $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxBottleRocket.lv2/Makefile b/GxBottleRocket.lv2/Makefile
-index e7efdcc..b01970f 100644
---- a/GxBottleRocket.lv2/Makefile
-+++ b/GxBottleRocket.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +49,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxCreamMachine.lv2/Makefile b/GxCreamMachine.lv2/Makefile
-index 53c1dc6..a8b3604 100644
---- a/GxCreamMachine.lv2/Makefile
-+++ b/GxCreamMachine.lv2/Makefile
-@@ -36,7 +10,7 @@
- 	# set compile flags
- 	CXXFLAGS += -I. -I./dsp -I./plugin -I./dsp/zita-resampler-1.1.0 -I./dsp/zita-resampler-1.1.0/zita-resampler -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -73,8 +47,8 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png 
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxDOP250.lv2/Makefile b/GxDOP250.lv2/Makefile
-index ba27784..a797bb4 100644
---- a/GxDOP250.lv2/Makefile
-+++ b/GxDOP250.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxFz1b.lv2/Makefile b/GxFz1b.lv2/Makefile
-index 72df63a..6311726 100644
---- a/GxFz1b.lv2/Makefile
-+++ b/GxFz1b.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +49,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxFz1s.lv2/Makefile b/GxFz1s.lv2/Makefile
-index fd5af20..1de0565 100644
---- a/GxFz1s.lv2/Makefile
-+++ b/GxFz1s.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +49,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxGuvnor.lv2/Makefile b/GxGuvnor.lv2/Makefile
-index 065acf1..5dc4406 100644
---- a/GxGuvnor.lv2/Makefile
-+++ b/GxGuvnor.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxHeathkit.lv2/Makefile b/GxHeathkit.lv2/Makefile
-index 1669295..ae5ba5d 100644
---- a/GxHeathkit.lv2/Makefile
-+++ b/GxHeathkit.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxHotBox.lv2/Makefile b/GxHotBox.lv2/Makefile
-index 8df2752..16d805f 100644
---- a/GxHotBox.lv2/Makefile
-+++ b/GxHotBox.lv2/Makefile
-@@ -38,7 +13,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +50,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxHyperion.lv2/Makefile b/GxHyperion.lv2/Makefile
-index 86f8b88..2bc01e0 100644
---- a/GxHyperion.lv2/Makefile
-+++ b/GxHyperion.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxKnightFuzz.lv2/Makefile b/GxKnightFuzz.lv2/Makefile
-index 16d13b8..02a9713 100644
---- a/GxKnightFuzz.lv2/Makefile
-+++ b/GxKnightFuzz.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxLiquidDrive.lv2/Makefile b/GxLiquidDrive.lv2/Makefile
-index 92796e6..537923d 100644
---- a/GxLiquidDrive.lv2/Makefile
-+++ b/GxLiquidDrive.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxMicroAmp.lv2/Makefile b/GxMicroAmp.lv2/Makefile
-index 60818f0..556ade0 100644
---- a/GxMicroAmp.lv2/Makefile
-+++ b/GxMicroAmp.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxQuack.lv2/Makefile b/GxQuack.lv2/Makefile
-index 2aed99f..a39c911 100644
---- a/GxQuack.lv2/Makefile
-+++ b/GxQuack.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -70,10 +44,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSD1.lv2/Makefile b/GxSD1.lv2/Makefile
-index 3b98ee0..4cbfc6a 100644
---- a/GxSD1.lv2/Makefile
-+++ b/GxSD1.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +49,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSD2Lead.lv2/Makefile b/GxSD2Lead.lv2/Makefile
-index 7759f91..0f7bb91 100644
---- a/GxSD2Lead.lv2/Makefile
-+++ b/GxSD2Lead.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSVT.lv2/Makefile b/GxSVT.lv2/Makefile
-index 74a96a8..a8bc7f6 100644
---- a/GxSVT.lv2/Makefile
-+++ b/GxSVT.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSaturator.lv2/Makefile b/GxSaturator.lv2/Makefile
-index 62aea02..5c71786 100644
---- a/GxSaturator.lv2/Makefile
-+++ b/GxSaturator.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSlowGear.lv2/Makefile b/GxSlowGear.lv2/Makefile
-index 6b236a1..ad72d70 100644
---- a/GxSlowGear.lv2/Makefile
-+++ b/GxSlowGear.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSunFace.lv2/Makefile b/GxSunFace.lv2/Makefile
-index 428539b..ded15f6 100644
---- a/GxSunFace.lv2/Makefile
-+++ b/GxSunFace.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSuperFuzz.lv2/Makefile b/GxSuperFuzz.lv2/Makefile
-index c3fe9f2..b102d7c 100644
---- a/GxSuperFuzz.lv2/Makefile
-+++ b/GxSuperFuzz.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxSuppaToneBender.lv2/Makefile b/GxSuppaToneBender.lv2/Makefile
-index ab640c2..e79fc1c 100644
---- a/GxSuppaToneBender.lv2/Makefile
-+++ b/GxSuppaToneBender.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png 
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxToneMachine.lv2/Makefile b/GxToneMachine.lv2/Makefile
-index 92b7825..43f3668 100644
---- a/GxToneMachine.lv2/Makefile
-+++ b/GxToneMachine.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	  -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxTubeDistortion.lv2/Makefile b/GxTubeDistortion.lv2/Makefile
-index dfb58e5..1839ed7 100644
---- a/GxTubeDistortion.lv2/Makefile
-+++ b/GxTubeDistortion.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,9 +49,9 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxUVox720k.lv2/Makefile b/GxUVox720k.lv2/Makefile
-index 3933ea2..705dd6c 100644
---- a/GxUVox720k.lv2/Makefile
-+++ b/GxUVox720k.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxVBassPreAmp.lv2/Makefile b/GxVBassPreAmp.lv2/Makefile
-index bc60ce1..fd6a707 100644
---- a/GxVBassPreAmp.lv2/Makefile
-+++ b/GxVBassPreAmp.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,10 +49,10 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o
--	-@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxValveCaster.lv2/Makefile b/GxValveCaster.lv2/Makefile
-index 54c6df5..bbfc7e9 100644
---- a/GxValveCaster.lv2/Makefile
-+++ b/GxValveCaster.lv2/Makefile
-@@ -39,7 +13,7 @@
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	DEBUGFLAGS += -I. -I./dsp -I./plugin -fPIC -DPIC -O2 -Wall -D DEBUG
- 	LDFLAGS += -I. -shared -lm
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -85,8 +59,8 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png
- 	@$(ECHO) $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxVintageFuzzMaster.lv2/Makefile b/GxVintageFuzzMaster.lv2/Makefile
-index 03ff63e..0f96ffd 100644
---- a/GxVintageFuzzMaster.lv2/Makefile
-+++ b/GxVintageFuzzMaster.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxVmk2.lv2/Makefile b/GxVmk2.lv2/Makefile
-index 53c6dc6..74c9fa2 100644
---- a/GxVmk2.lv2/Makefile
-+++ b/GxVmk2.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	 -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,8 +49,8 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png gui/frame.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
--	-@cd ./gui && ld -r -b binary frame.png -o frame.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary frame.png -o frame.o
- 
- clean :
- 	@rm -f $(NAME).so
-diff --git a/GxVoodoFuzz.lv2/Makefile b/GxVoodoFuzz.lv2/Makefile
-index 2f00294..fdd609a 100644
---- a/GxVoodoFuzz.lv2/Makefile
-+++ b/GxVoodoFuzz.lv2/Makefile
-@@ -38,7 +12,7 @@
- 	 -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \
- 	  -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
- 	LDFLAGS += -I. -shared -lm 
--	GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
-+	GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11
- 	# invoke build files
- 	OBJECTS = plugin/$(NAME).cpp 
- 	GUI_OBJECTS = gui/$(NAME)_x11ui.c
-@@ -75,7 +49,7 @@ endif
-    #@build resource object files
- $(RES_OBJECTS) : gui/pedal.png
- 	@echo $(LGREEN)"generate resource files,"$(NONE)
--	-@cd ./gui && ld -r -b binary pedal.png -o pedal.o
-+	-@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o
- 
- clean :
- 	@rm -f $(NAME).so
--- 
-2.20.1
-

recipes-musicians/helm/helm_git.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://tytel.org/helm/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit dos2unix qemu-ext distro_features_check gtk-icon-cache pack_audio_plugins
+inherit dos2unix qemu-ext-musicians features_check gtk-icon-cache pack_audio_plugins mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

recipes-musicians/hydrogen/files/0002-Fix-man-installation-path.patch

@@ -1,31 +0,0 @@
-From ab93d721ca7ae5d628cd3d8fd2d7f90a19cd6954 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 5 Feb 2018 23:52:46 +0100
-Subject: [PATCH] Fix man installation path
-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>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96dbf47a..5149e78f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -361,7 +361,7 @@ IF(NOT MINGW AND NOT APPLE)
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
- ENDIF()
- 
- #
--- 
-2.14.3
-

recipes-musicians/hydrogen/hydrogen_git.bb

@@ -28,17 +28,10 @@ DEPENDS += " \
     cppunit \
 "
 
-# drumkits URIs from http://hydrogen-music.org/feeds/drumkit_list.php (downloaded to WORKDIR)
-# NOTES: 
-# * Licenses are included in drumkit_list.php
-# * download of drumkits might fail -> repeat builds of this recipe usually helps
 
 SRC_URI = " \
     git://github.com/hydrogen-music/hydrogen.git \
     file://0001-hydrogen.default.conf-do-not-show-developer-warnings.patch \
-    file://0002-Fix-man-installation-path.patch \
-    \
-    http://hydrogen-music.org/feeds/drumkit_list.php;name=drumkit-list \
     \
     http://hydro.smoors.de/Audiophob.h2drumkit;downloadfilename=Audiophob.tar.gz;name=Audiophob;subdir=drumkits \
     http://hydro.smoors.de/belofilms_GuitarStrums.h2drumkit;downloadfilename=belofilms_GuitarStrums.tar.gz;name=belofilms_GuitarStrums;subdir=drumkits \
@@ -87,14 +80,21 @@ SRC_URI = " \
     https://freewavesamples.com/files/YamahaRX15Kit.h2drumkit;downloadfilename=YamahaRX15Kit.tar.gz;name=YamahaRX15Kit;subdir=drumkits \
     https://freewavesamples.com/files/YamahaTG-55Kit.h2drumkit;downloadfilename=YamahaTG-55Kit.tar.gz;name=YamahaTG-55Kit;subdir=drumkits \
 "
-SRCREV = "538eaeb9f4e9be2febf02e36a08e3e9fca2ae317"
-PV ="1.0.0~beta1+git${SRCPV}"
+SRCREV = "d186d169f12bd8c5f34677aab713a9542bace52c"
+PV ="1.0.0~rc1+git${SRCPV}"
+
+###############################################################################
+# drumkits URIs from http://hydrogen-music.org/feeds/drumkit_list.php
+# So if you want to check for more uncomment the following lines and, build
+# hydrogen and check ${WORKDIR}/drumkit_list.php
+
+#SRC_URI += "http://hydrogen-music.org/feeds/drumkit_list.php;name=drumkit-list"
+#SRC_URI[drumkit-list.md5sum] = "4c709788c9f07dd2f7d2a5e60de6a5b2"
+#SRC_URI[drumkit-list.sha256sum] = "93f057f5ea6b709c6ebf319a20248f7cfb4e10855de87323992eb503929757e7"
+###############################################################################
 
 S = "${WORKDIR}/git"
 
-SRC_URI[drumkit-list.md5sum] = "d7c54dba04092112fb012c1a0acc6404"
-SRC_URI[drumkit-list.sha256sum] = "c4ddfcff63e57e72ab376a9b85a1fdf7ba47ec244dcca45ab95984adfd585780"
-
 SRC_URI[Audiophob.md5sum] = "24cb2577a447bbd72aab769aacb3e8b4"
 SRC_URI[Audiophob.sha256sum] = "70b71304221a1287f257ed9a03bfb221af6ce335deec3a3385237e6be6fa9e0c"
 
@@ -231,7 +231,7 @@ SRC_URI[YamahaTG-55Kit.md5sum] = "cf95db46c05287aaa1a18dff0b0ce335"
 SRC_URI[YamahaTG-55Kit.sha256sum] = "8dba9f8fa7027606765b3b9bd3d11470e39919683a8676b1598d96c2f7df1462"
 
 
-inherit cmake_qt5 manpages
+inherit cmake_qt5 manpages mime-xdg gtk-icon-cache
 
 EXTRA_OECMAKE = " \
     -DWANT_DEBUG=OFF \
@@ -257,6 +257,7 @@ FILES_SOLIBSDEV = ""
 
 FILES_${PN} += " \
     ${datadir}/appdata \
+    ${datadir}/icons \
     ${libdir}/libhydrogen-core* \
 "
 

recipes-musicians/infamousplugins/infamousplugins.bb

@@ -13,12 +13,10 @@ DEPENDS += " \
 
 inherit cmake pkgconfig gtk-icon-cache
 
-SRC_URI = " \
-    git://github.com/ssj71/infamousPlugins.git \
-"
-SRCREV = "28b405414a5d044e576ab00b75ceaa1c0a7b8929"
+SRC_URI = "git://github.com/ssj71/infamousPlugins.git"
+SRCREV = "4c7275b1fa8ea3296446421cbd29ec2df66588c0"
 S = "${WORKDIR}/git"
-PV = "0.3.0"
+PV = "0.3.0+git${SRCPV}"
 
 EXTRA_OECMAKE += " \
     -DLIBDIR=${baselib} \

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

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

@@ -0,0 +1,35 @@
+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/files/0003-Fix-build-with-lv2-1.1.18.patch

@@ -0,0 +1,54 @@
+From d1c6690abb1b23712712da710b1629091fe13453 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 21 May 2020 18:07:23 +0200
+Subject: [PATCH] Fix build with lv2 >= 1.1.18
+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>
+---
+ ir_gui.cc | 2 +-
+ lv2_ui.h  | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ir_gui.cc b/ir_gui.cc
+index 5a0a97b..5f67289 100644
+--- a/ir_gui.cc
++++ b/ir_gui.cc
+@@ -1523,7 +1523,7 @@ static void cleanup(LV2UI_Handle ui) {
+ 	free(cp);
+ }
+ 
+-static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor * descriptor,
++static LV2UI_Handle instantiate(const struct LV2UI_Descriptor * descriptor,
+ 				const char * plugin_uri,
+ 				const char * bundle_path,
+ 				LV2UI_Write_Function write_function,
+diff --git a/lv2_ui.h b/lv2_ui.h
+index d5b813d..b32fba7 100644
+--- a/lv2_ui.h
++++ b/lv2_ui.h
+@@ -238,7 +238,7 @@ typedef void (*LV2UI_Write_Function)(LV2UI_Controller controller,
+ /** This struct contains the implementation of an UI. A pointer to an 
+     object of this type is returned by the lv2ui_descriptor() function. 
+ */
+-typedef struct _LV2UI_Descriptor {
++typedef struct LV2UI_Descriptor {
+   
+   /** The URI for this UI (not for the plugin it controls). */
+   const char* URI;
+@@ -268,7 +268,7 @@ typedef struct _LV2UI_Descriptor {
+ 			same array as the one the plugin host passes to a 
+ 			plugin.
+   */
+-  LV2UI_Handle (*instantiate)(const struct _LV2UI_Descriptor* descriptor,
++  LV2UI_Handle (*instantiate)(const struct LV2UI_Descriptor* descriptor,
+                               const char*                     plugin_uri,
+                               const char*                     bundle_path,
+                               LV2UI_Write_Function            write_function,
+-- 
+2.21.1
+

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

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

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

@@ -0,0 +1,47 @@
+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 \
+    file://0003-Fix-build-with-lv2-1.1.18.patch \
+"
+S = "${WORKDIR}/git"
+
+LV2_NAME = "http://tomszilagyi.github.io/plugins/lv2/ir"
+IR_LV2_VARIANT ?= ""
+IR_LV2_DOAP_EXTENSION ?= ""
+
+do_compile_prepend() {
+    for file in `grep -rl '${LV2_NAME}'`; do
+        sed -i 's|${LV2_NAME}|${LV2_NAME}_${IR_LV2_VARIANT}|g' $file
+    done
+    for file in `grep -rl ir.so`; do
+        sed -i 's|ir.so|ir_${IR_LV2_VARIANT}.so|g' $file
+    done
+    for file in `grep -rl ir_gui.so`; do
+        sed -i 's|ir_gui.so|ir_gui_${IR_LV2_VARIANT}.so|g' $file
+    done
+}
+
+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/kokkinizita/clxclient_3.9.2.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://kokkinizita.linuxaudio.org/linuxaudio/"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-inherit pkgconfig distro_features_check
+inherit pkgconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 

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

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

@@ -0,0 +1,39 @@
+SUMMARY = "Element Audio Plugin Host"
+HOMEPAGE = "https://kushview.net/element/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+inherit waf pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "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 = "c73c120334f4e170dba029f3794e5e8ba601c127"
+PV = "0.44.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/liblo/liblo.bb

@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 inherit autotools pkgconfig
 
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-"
-SRC_URI[md5sum] = "fa1a9d45f86fc18fb54019f670ff2262"
-SRC_URI[sha256sum] = "30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b"
-PV = "0.30"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "14378c1e74c58e777fbb4fcf33ac5315"
+SRC_URI[sha256sum] = "2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750"
+PV = "0.31"

recipes-musicians/libmp4v2/libmp4v2/0001-Fix-build-with-gcc10.patch

@@ -0,0 +1,444 @@
+From 35f66749107e91911d5aba645cf847b96b53e0e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 8 Jun 2020 13:22:44 +0200
+Subject: [PATCH] Fix build with gcc10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Stolen from [1]
+
+[1] https://src.fedoraproject.org/rpms/libmp4v2/raw/master/f/gcc10.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ libutil/Utility.cpp  | 10 ++++----
+ util/mp4art.cpp      | 14 +++++------
+ util/mp4chaps.cpp    | 20 ++++++++--------
+ util/mp4file.cpp     |  6 ++---
+ util/mp4subtitle.cpp |  8 +++----
+ util/mp4track.cpp    | 56 ++++++++++++++++++++++----------------------
+ 6 files changed, 57 insertions(+), 57 deletions(-)
+
+diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp
+index 76cdd12..4561cd3 100644
+--- a/libutil/Utility.cpp
++++ b/libutil/Utility.cpp
+@@ -531,26 +531,26 @@ Utility::process_impl()
+                 printHelp( false, false );
+                 return SUCCESS;
+ 
+-            case LC_DEBUG:
++            case int(LC_DEBUG):
+                 debugUpdate( std::strtoul( prog::optarg, NULL, 0 ) );
+                 break;
+ 
+-            case LC_VERBOSE:
++            case int(LC_VERBOSE):
+             {
+                 const uint32_t level = std::strtoul( prog::optarg, NULL, 0 );
+                 _verbosity = ( level < 4 ) ? level : 3;
+                 break;
+             }
+ 
+-            case LC_HELP:
++            case int(LC_HELP):
+                 printHelp( true, false );
+                 return SUCCESS;
+ 
+-            case LC_VERSION:
++            case int(LC_VERSION):
+                 printVersion( false );
+                 return SUCCESS;
+ 
+-            case LC_VERSIONX:
++            case int(LC_VERSIONX):
+                 printVersion( true );
+                 return SUCCESS;
+ 
+diff --git a/util/mp4art.cpp b/util/mp4art.cpp
+index add935e..f610a28 100644
+--- a/util/mp4art.cpp
++++ b/util/mp4art.cpp
+@@ -377,11 +377,11 @@ ArtUtility::utility_option( int code, bool& handled )
+     handled = true;
+ 
+     switch( code ) {
+-        case LC_ART_ANY:
++        case int(LC_ART_ANY):
+             _artFilter = numeric_limits<uint32_t>::max();
+             break;
+ 
+-        case LC_ART_INDEX:
++        case int(LC_ART_INDEX):
+         {
+             istringstream iss( prog::optarg );
+             iss >> _artFilter;
+@@ -390,29 +390,29 @@ ArtUtility::utility_option( int code, bool& handled )
+             break;
+         }
+ 
+-        case LC_LIST:
++        case int(LC_LIST):
+             _action = &ArtUtility::actionList;
+             break;
+ 
+-        case LC_ADD:
++        case int(LC_ADD):
+             _action = &ArtUtility::actionAdd;
+             _artImageFile = prog::optarg;
+             if( _artImageFile.empty() )
+                 return herrf( "invalid image file: empty-string\n" );
+             break;
+ 
+-        case LC_REMOVE:
++        case int(LC_REMOVE):
+             _action = &ArtUtility::actionRemove;
+             break;
+ 
+-        case LC_REPLACE:
++        case int(LC_REPLACE):
+             _action = &ArtUtility::actionReplace;
+             _artImageFile = prog::optarg;
+             if( _artImageFile.empty() )
+                 return herrf( "invalid image file: empty-string\n" );
+             break;
+ 
+-        case LC_EXTRACT:
++        case int(LC_EXTRACT):
+             _action = &ArtUtility::actionExtract;
+             break;
+ 
+diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp
+index 98400f8..b7227f9 100644
+--- a/util/mp4chaps.cpp
++++ b/util/mp4chaps.cpp
+@@ -634,32 +634,32 @@ ChapterUtility::utility_option( int code, bool& handled )
+ 
+     switch( code ) {
+         case 'A':
+-        case LC_CHPT_ANY:
++        case int(LC_CHPT_ANY):
+             _ChapterType = MP4ChapterTypeAny;
+             break;
+ 
+         case 'Q':
+-        case LC_CHPT_QT:
++        case int(LC_CHPT_QT):
+             _ChapterType = MP4ChapterTypeQt;
+             break;
+ 
+         case 'N':
+-        case LC_CHPT_NERO:
++        case int(LC_CHPT_NERO):
+             _ChapterType = MP4ChapterTypeNero;
+             break;
+ 
+         case 'C':
+-        case LC_CHPT_COMMON:
++        case int(LC_CHPT_COMMON):
+             _ChapterFormat = CHPT_FMT_COMMON;
+             break;
+ 
+         case 'l':
+-        case LC_CHP_LIST:
++        case int(LC_CHP_LIST):
+             _action = &ChapterUtility::actionList;
+             break;
+ 
+         case 'e':
+-        case LC_CHP_EVERY:
++        case int(LC_CHP_EVERY):
+         {
+             istringstream iss( prog::optarg );
+             iss >> _ChaptersEvery;
+@@ -675,7 +675,7 @@ ChapterUtility::utility_option( int code, bool& handled )
+             _action = &ChapterUtility::actionExport;
+             break;
+ 
+-        case LC_CHP_EXPORT:
++        case int(LC_CHP_EXPORT):
+             _action = &ChapterUtility::actionExport;
+             /* currently not supported since the chapters of n input files would be written to one chapter file
+             _ChapterFile = prog::optarg;
+@@ -690,7 +690,7 @@ ChapterUtility::utility_option( int code, bool& handled )
+             _action = &ChapterUtility::actionImport;
+             break;
+ 
+-        case LC_CHP_IMPORT:
++        case int(LC_CHP_IMPORT):
+             _action = &ChapterUtility::actionImport;
+             /* currently not supported since the chapters of n input files would be read from one chapter file
+             _ChapterFile = prog::optarg;
+@@ -702,12 +702,12 @@ ChapterUtility::utility_option( int code, bool& handled )
+             break;
+ 
+         case 'c':
+-        case LC_CHP_CONVERT:
++        case int(LC_CHP_CONVERT):
+             _action = &ChapterUtility::actionConvert;
+             break;
+ 
+         case 'r':
+-        case LC_CHP_REMOVE:
++        case int(LC_CHP_REMOVE):
+             _action = &ChapterUtility::actionRemove;
+             break;
+ 
+diff --git a/util/mp4file.cpp b/util/mp4file.cpp
+index c27844b..bcfb898 100644
+--- a/util/mp4file.cpp
++++ b/util/mp4file.cpp
+@@ -190,15 +190,15 @@ FileUtility::utility_option( int code, bool& handled )
+     handled = true;
+ 
+     switch( code ) {
+-        case LC_LIST:
++        case int(LC_LIST):
+             _action = &FileUtility::actionList;
+             break;
+ 
+-        case LC_OPTIMIZE:
++        case int(LC_OPTIMIZE):
+             _action = &FileUtility::actionOptimize;
+             break;
+ 
+-        case LC_DUMP:
++        case int(LC_DUMP):
+             _action = &FileUtility::actionDump;
+             break;
+ 
+diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp
+index 7462153..e914955 100644
+--- a/util/mp4subtitle.cpp
++++ b/util/mp4subtitle.cpp
+@@ -165,25 +165,25 @@ SubtitleUtility::utility_option( int code, bool& handled )
+     handled = true;
+ 
+     switch( code ) {
+-        case LC_LIST:
++        case int(LC_LIST):
+             _action = &SubtitleUtility::actionList;
+             break;
+ 
+-        case LC_EXPORT:
++        case int(LC_EXPORT):
+             _action = &SubtitleUtility::actionExport;
+             _stTextFile = prog::optarg;
+             if( _stTextFile.empty() )
+                 return herrf( "invalid TXT file: empty-string\n" );
+             break;
+ 
+-        case LC_IMPORT:
++        case int(LC_IMPORT):
+             _action = &SubtitleUtility::actionImport;
+             _stTextFile = prog::optarg;
+             if( _stTextFile.empty() )
+                 return herrf( "invalid TXT file: empty-string\n" );
+             break;
+ 
+-        case LC_REMOVE:
++        case int(LC_REMOVE):
+             _action = &SubtitleUtility::actionRemove;
+             break;
+ 
+diff --git a/util/mp4track.cpp b/util/mp4track.cpp
+index d550506..eeb18a0 100644
+--- a/util/mp4track.cpp
++++ b/util/mp4track.cpp
+@@ -789,11 +789,11 @@ TrackUtility::utility_option( int code, bool& handled )
+     handled = true;
+ 
+     switch( code ) {
+-        case LC_TRACK_WILDCARD:
++        case int(LC_TRACK_WILDCARD):
+             _trackMode = TM_WILDCARD;
+             break;
+ 
+-        case LC_TRACK_INDEX:
++        case int(LC_TRACK_INDEX):
+         {
+             _trackMode = TM_INDEX;
+             istringstream iss( prog::optarg );
+@@ -803,7 +803,7 @@ TrackUtility::utility_option( int code, bool& handled )
+             break;
+         }
+ 
+-        case LC_TRACK_ID:
++        case int(LC_TRACK_ID):
+         {
+             _trackMode = TM_ID;
+             istringstream iss( prog::optarg );
+@@ -813,142 +813,142 @@ TrackUtility::utility_option( int code, bool& handled )
+             break;
+         }
+ 
+-        case LC_LIST:
++        case int(LC_LIST):
+             _action = &TrackUtility::actionList;
+             break;
+ 
+-        case LC_COLR_PARMS:
++        case int(LC_COLR_PARMS):
+             _colorParameterItem.convertFromCSV( prog::optarg );
+             break;
+ 
+-        case LC_COLR_PARM_HD:
++        case int(LC_COLR_PARM_HD):
+             _colorParameterItem.primariesIndex        = 1;
+             _colorParameterItem.transferFunctionIndex = 1;
+             _colorParameterItem.matrixIndex           = 1;
+             break;
+ 
+-        case LC_COLR_PARM_SD:
++        case int(LC_COLR_PARM_SD):
+             _colorParameterItem.primariesIndex        = 6;
+             _colorParameterItem.transferFunctionIndex = 1;
+             _colorParameterItem.matrixIndex           = 6;
+             break;
+ 
+-        case LC_COLR_LIST:
++        case int(LC_COLR_LIST):
+             _action = &TrackUtility::actionColorParameterList;
+             break;
+ 
+-        case LC_ENABLED:
++        case int(LC_ENABLED):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setEnabled;
+             _actionTrackModifierSet_name     = "enabled";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_INMOVIE:
++        case int(LC_INMOVIE):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setInMovie;
+             _actionTrackModifierSet_name     = "inMovie";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_INPREVIEW:
++        case int(LC_INPREVIEW):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setInPreview;
+             _actionTrackModifierSet_name     = "inPreview";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_LAYER:
++        case int(LC_LAYER):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setLayer;
+             _actionTrackModifierSet_name     = "layer";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_ALTGROUP:
++        case int(LC_ALTGROUP):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setAlternateGroup;
+             _actionTrackModifierSet_name     = "alternateGroup";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_VOLUME:
++        case int(LC_VOLUME):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setVolume;
+             _actionTrackModifierSet_name     = "volume";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_WIDTH:
++        case int(LC_WIDTH):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setWidth;
+             _actionTrackModifierSet_name     = "width";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_HEIGHT:
++        case int(LC_HEIGHT):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setHeight;
+             _actionTrackModifierSet_name     = "height";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_LANGUAGE:
++        case int(LC_LANGUAGE):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setLanguage;
+             _actionTrackModifierSet_name     = "language";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_HDLRNAME:
++        case int(LC_HDLRNAME):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setHandlerName;
+             _actionTrackModifierSet_name     = "handlerName";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_UDTANAME:
++        case int(LC_UDTANAME):
+             _action = &TrackUtility::actionTrackModifierSet;
+             _actionTrackModifierSet_function = &TrackModifier::setUserDataName;
+             _actionTrackModifierSet_name     = "userDataName";
+             _actionTrackModifierSet_value    = prog::optarg;
+             break;
+ 
+-        case LC_UDTANAME_R:
++        case int(LC_UDTANAME_R):
+             _action = &TrackUtility::actionTrackModifierRemove;
+             _actionTrackModifierRemove_function = &TrackModifier::removeUserDataName;
+             _actionTrackModifierRemove_name     = "userDataName";
+             break;
+ 
+-        case LC_COLR_ADD:
++        case int(LC_COLR_ADD):
+             _action = &TrackUtility::actionColorParameterAdd;
+             break;
+ 
+-        case LC_COLR_SET:
++        case int(LC_COLR_SET):
+             _action = &TrackUtility::actionColorParameterSet;
+             break;
+ 
+-        case LC_COLR_REMOVE:
++        case int(LC_COLR_REMOVE):
+             _action = &TrackUtility::actionColorParameterRemove;
+             break;
+ 
+-        case LC_PASP_PARMS:
++        case int(LC_PASP_PARMS):
+             _pictureAspectRatioItem.convertFromCSV( prog::optarg );
+             break;
+ 
+-        case LC_PASP_LIST:
++        case int(LC_PASP_LIST):
+             _action = &TrackUtility::actionPictureAspectRatioList;
+             break;
+ 
+-        case LC_PASP_ADD:
++        case int(LC_PASP_ADD):
+             _action = &TrackUtility::actionPictureAspectRatioAdd;
+             break;
+ 
+-        case LC_PASP_SET:
++        case int(LC_PASP_SET):
+             _action = &TrackUtility::actionPictureAspectRatioSet;
+             break;
+ 
+-        case LC_PASP_REMOVE:
++        case int(LC_PASP_REMOVE):
+             _action = &TrackUtility::actionPictureAspectRatioRemove;
+             break;
+ 
+-- 
+2.26.2
+