Revert "Do not ignore line endings on patch files - it is shuch a mess"

We loose our diffs on patches - sigh

This reverts commit 3b9986d51f.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit ea7afbb50e)

appends/meta-qt5/python3-pyqt5_%.bbappend

@@ -0,0 +1,46 @@
+BBCLASSEXTEND = "native"
+
+DEPENDS_class-native = "qtbase-native sip3-native python3-native"
+
+PYQT_MODULES_class-native = "QtCore"
+
+# This is a copy from meta-qt5 adjusted to native staging
+do_configure_prepend_class-native() {
+    cd ${S}
+    echo "py_platform = linux" > pyqt.cfg
+    echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
+    echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
+    echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
+    echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
+    echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
+    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
+    echo "qt_shared = True" >> pyqt.cfg
+    QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
+    echo "[Qt $QT_VERSION]" >> pyqt.cfg
+    echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
+    echo yes | ${PYTHON} configure.py --verbose --qmake  ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_NATIVE}
+
+    qmake5_base_do_configure
+
+    # avoid running code prepended by recipe
+    return 0
+}
+
+CFLAGS_append_class-native = " -I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}"
+CXXFLAGS_append_class-native = " -I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}"
+
+do_install_class-native() {
+    cd ${S}
+    oe_runmake MAKEFLAGS='-j 1' install
+
+    # should be done for target either...
+    for file in `find ${D}${bindir} -name 'py*5'`; do
+        echo "Remove abs path in $file..."
+        sed -i 's:exec.*${PYTHON_DIR}:exec ${PYTHON_PN}:g' "$file"
+    done
+}
+
+RDEPENDS_${PN}_class-native = ""
+

classes/qt5-translation.bbclass

@@ -7,17 +7,15 @@ QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translatio
 
 FILES_${PN}-locale = "${datadir}/*/translations"
 
-# remove ${datadir}/${BPN} set by bitbake.conf
-FILES_${PN}_remove = "${datadir}/${BPN}"
-
 python qt_do_split_locales() {
     import glob
+    import collections
 
     if (d.getVar('PACKAGE_NO_LOCALE') == '1'):
         bb.debug(1, "package requested not splitting locales")
         return
 
-    packages = (d.getVar('PACKAGES') or "").split()
+    packages = collections.deque((d.getVar('PACKAGES') or "").split())
 
     datadir = d.getVar('datadir')
     if not datadir:
@@ -41,7 +39,7 @@ python qt_do_split_locales() {
                 locales.append(locale)
 
     if not locales:
-        bb.debug(1, "No locale files in this package")
+        bb.warn("No locale files for recipe %s. Remove qt5-translation from inherit?" % d.getVar('PN'))
         return
 
     summary = d.getVar('SUMMARY') or pn
@@ -51,7 +49,7 @@ python qt_do_split_locales() {
     for l in sorted(locales):
         ln = legitimize_package_name(l)
         pkg = pn + '-locale-' + ln
-        packages.append(pkg)
+        packages.appendleft(pkg)
         files = ''
         for transvar in d.getVar('QT_TRANSLATION_FILES').split():
             files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
@@ -63,7 +61,7 @@ python qt_do_split_locales() {
         if locale_section:
             d.setVar('SECTION_' + pkg, locale_section)
 
-    d.setVar('PACKAGES', ' '.join(packages))
+    d.setVar('PACKAGES', ' '.join(list(packages)))
 }
 
 PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "

conf/layer.conf

@@ -6,6 +6,11 @@ BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/
 # appends
 BBFILES += "${LAYERDIR}/appends/*/*.bbappend"
 
+
+BBFILES_DYNAMIC += "\
+    rust-layer:${LAYERDIR}/dynamic-layers/meta-rust/*.bb \
+"
+
 BBFILE_COLLECTIONS += "meta-musicians"
 BBFILE_PATTERN_meta-musicians := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-musicians = "20"
@@ -20,4 +25,4 @@ LAYERDEPENDS_meta-musicians = " \
     meta-python \
     qt5-layer \
 "
-LAYERSERIES_COMPAT_meta-musicians = "dunfell gatesgarth"
+LAYERSERIES_COMPAT_meta-musicians = "dunfell gatesgarth hardknott"

dynamic-layers/meta-rust/spotify-qt.bb

@@ -4,9 +4,9 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://license;md5=e49f4652534af377a713df3d9dec60cb"
 
 SRC_URI = "git://github.com/kraxarn/spotify-qt.git"
-SRCREV = "59fcf9bd1d53a61b5d60977bbf5aefa01bddbbb0"
+SRCREV = "684ec3b0f0c919ab9273f73283cfae04ee49c679"
 S = "${WORKDIR}/git"
-PV = "3.2"
+PV = "3.6"
 
 DEPENDS = " \
     qtbase \

dynamic-layers/meta-rust/spotifyd.bb

@@ -1,7 +1,7 @@
 SUMMARY = "A Spotify daemon"
 HOMEPAGE = "https://github.com/Spotifyd/spotifyd"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
 python() {
     if 'rust-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
@@ -18,10 +18,12 @@ DEPENDS = " \
 inherit cargo
 
 SRC_URI = "git://github.com/Spotifyd/spotifyd.git"
-SRCREV = "133a1199f80c7c22f29a45226db3bb856b106a5b"
+SRCREV = "27ce5ac95c3a9b8de84bc4c0969a942fda2e2ad0"
 S = "${WORKDIR}/git"
 # crate ruins SRCPV so set PV manually
-PV = "0.2.24+git133a1199"
+#PV = "0.2.24+git133a1199"
+
+PV = "0.3.0"
 
 # No unconditional start on each boot
 #do_install_append() {

recipes-bindings/python3-pyqt5/0001-Make-sure-to-find-python3-sip-code-generator.patch

@@ -1,31 +0,0 @@
-From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 4 Aug 2018 02:48:14 +0200
-Subject: [PATCH] Make sure to find python3 sip code generator
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- configure.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.py b/configure.py
-index a263efb..daefc0e 100644
---- a/configure.py
-+++ b/configure.py
-@@ -522,7 +522,7 @@ class TargetConfiguration:
-         self.qtconf_prefix = ''
-         self.qt_shared = False
-         self.qt_version = 0
--        self.sip = self._find_exe('sip5', 'sip')
-+        self.sip = self._find_exe('sip3')
-         self.sip_h_version = None
-         self.sip_inc_dir = self.py_venv_inc_dir
-         self.static = False
--- 
-2.14.4
-

recipes-bindings/python3-pyqt5_5.9.2.bb

@@ -1,76 +0,0 @@
-SUMMARY = "Python Qt5 Bindings"
-AUTHOR = "Phil Thomson @ riverbank.co.uk"
-HOMEPAGE = "http://riverbankcomputing.co.uk"
-SECTION = "devel/python"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
-
-SRC_URI = "\
-    https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PV}/PyQt5_gpl-${PV}.tar.gz \
-    file://0001-Make-sure-to-find-python3-sip-code-generator.patch \
-"
-SRC_URI[md5sum] = "33d6d2ab8183da17ac18b8132a4b278e"
-SRC_URI[sha256sum] = "c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394"
-
-PE = "1"
-
-inherit qmake5 python3native
-
-DEPENDS += "sip3-native sip3 qtbase python3"
-DEPENDS_append_class-target = "qtsvg"
-
-S = "${WORKDIR}/PyQt5_gpl-${PV}"
-B = "${S}"
-
-DISABLED_FEATURES = "PyQt_Desktop_OpenGL"
-
-DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
-
-PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtSvg"
-PYQT_MODULES_class-native = "QtCore"
-PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets QtSvg"
-
-# full paths
-SYSROOTDIR = "${STAGING_DIR_HOST}"
-SYSROOTDIR_class-native = "${STAGING_DIR_NATIVE}"
-INCLUDEDIR = "${STAGING_INCDIR}"
-INCLUDEDIR_class-native = "${STAGING_INCDIR_NATIVE}"
-LIBDIR = "${STAGING_LIBDIR}"
-LIBDIR_class-native = "${STAGING_LIBDIR_NATIVE}"
-PYTHONEXEC="${bindir}/${PYTHON_PN}"
-PYTHONEXEC_class-native="${PYTHON}"
-
-do_configure() {
-    echo "py_platform = linux" > pyqt.cfg
-    echo "py_inc_dir = ${INCLUDEDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
-    echo "py_pylib_dir = ${LIBDIR}/python${PYTHON_BASEVERSION}" >> pyqt.cfg
-    echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
-    echo "pyqt_module_dir = ${D}/${PYTHON_SITEPACKAGES_DIR}" >> pyqt.cfg
-    echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
-    echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
-    echo "pyuic_interpreter = ${PYTHONEXEC}" >> pyqt.cfg
-    echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
-    echo "qt_shared = True" >> pyqt.cfg
-    QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
-    echo "[Qt $QT_VERSION]" >> pyqt.cfg
-    echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
-    echo yes | python3 configure.py --verbose --qmake ${OE_QMAKE_QMAKE} --configuration pyqt.cfg --sysroot ${SYSROOTDIR}
-}
-
-do_install() {
-     oe_runmake install
-}
-
-do_install_class-native() {
-     oe_runmake install
-}
-
-RDEPENDS_${PN}_append_class-target = " python3-core python3-sip"
-
-FILES_${PN} += " \
-    ${libdir}/${PYTHON_DIR}/site-packages \
-    ${datadir}/sip/PyQt5 \
-"
-
-BBCLASSEXTEND += "native nativesdk"
-

recipes-bindings/sip3_4.19.8.bb

@@ -1,44 +0,0 @@
-SUMMARY = "SIP is a C++/Python Wrapper Generator"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-SECTION = "devel"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
-
-inherit python3-dir
-
-DEPENDS = "python3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
-SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727"
-SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc"
-BPN = "sip"
-
-BBCLASSEXTEND = "native"
-
-PACKAGES += "python3-sip"
-
-do_configure_prepend_class-target() {
-    echo "py_platform = linux" > sip.cfg
-    echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
-    echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
-    echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
-    echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
-    echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
-    python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
-}
-do_configure_prepend_class-native() {
-    echo "py_platform = linux" > sip.cfg
-    echo "py_inc_dir = ${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
-    echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
-    echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
-    echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
-    echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
-    python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
-}
-do_install() {
-    oe_runmake install
-    # avoid conflicts with sip for python2
-    mv ${D}/${bindir}/sip ${D}/${bindir}/sip3
-}
-
-FILES_python3-sip = "${libdir}/${PYTHON_DIR}/site-packages/"

recipes-graphics/ntk/ntk_git.bb

@@ -4,14 +4,13 @@ LICENSE = "LGPLv2 & FLTK"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca"
 
 SRC_URI = " \
-    git://github.com/original-male/${BPN}.git \
+    git://github.com/falkTX/ntk.git \
     file://0001-wscript-check-compile-instead-of-tun-check-datatype-.patch \
     file://0002-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "dae177189b12f74ea01ac2389b76326c06d9be78"
+SRCREV = "720d8d33200ebd030df700c6c7a5a9cdf4581c03"
 S = "${WORKDIR}/git"
-PV_LAST_RELEASE = "1.3.1000"
-PV = "${PV_LAST_RELEASE}+git${SRCPV}"
+PV = "1.3.1001"
 
 inherit waf pkgconfig
 
@@ -30,11 +29,11 @@ WAF_EXTRA_CONF = " \
 do_install_append() {
     rm ${D}${libdir}/libntk.a
     rm ${D}${libdir}/libntk.a.1
-    mv ${D}${libdir}/libntk.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk.a
+    mv ${D}${libdir}/libntk.a.${PV} ${D}${libdir}/libntk.a
 
     rm ${D}${libdir}/libntk_images.a
     rm ${D}${libdir}/libntk_images.a.1
-    mv ${D}${libdir}/libntk_images.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk_images.a
+    mv ${D}${libdir}/libntk_images.a.${PV} ${D}${libdir}/libntk_images.a
 }
 
 BBCLASSEXTEND = "native"

recipes-gstreamer/gstreamer-0.10/gst-plugins-base_0.10.36.bb

@@ -37,6 +37,13 @@ do_configure_prepend() {
     rm -f ${S}/m4/lib-link.m4
 }
 
+do_configure_append() {
+    # remove stay \ introduced by make 4.3
+    if make -v | grep '4\.3'; then
+        sed -i 's:\\#include:#include:g' `find -name Makefile`
+    fi
+}
+
 FILES_${PN} += "${datadir}/${BPN}"
 
 CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"

recipes-musicians/ardour/ardour6_git.bb

@@ -29,13 +29,13 @@ DEPENDS += " \
     hidapi \
 "
 
-inherit waf features_check gtk-icon-cache pkgconfig python3native mime-xdg siteinfo
+inherit waf features_check gtk-icon-cache pkgconfig python3native mime mime-xdg siteinfo
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://github.com/Ardour/ardour.git"
-SRCREV = "80e3c191e412be7da5e0d05856e14f2f208b3035"
-PV = "6.5"
+SRCREV = "6733a847eeb55b4640a65a8bfebac8c7166521c8"
+PV = "6.7"
 S = "${WORKDIR}/git"
 
 # arch specific override - default (tested) is ARM -> no fpu-optimizations
@@ -69,20 +69,9 @@ do_configure_prepend() {
     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 += " \
+    ${datadir}/appdata \
+    ${datadir}/mime \
     ${libdir}/${BPN}/libardour.so \
     ${libdir}/${BPN}/libardouralsautil.so \
     ${libdir}/${BPN}/libaudiographer.so \

recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch

@@ -1,5 +1,5 @@
 From 88c61efce068b4cfe6d4c175bd9d1b85def23708 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sat, 15 Jul 2017 00:03:36 +0200
 Subject: [PATCH] do not try to cross-run carla-lv2-export
 MIME-Version: 1.0
@@ -8,24 +8,25 @@ Content-Transfer-Encoding: 8bit
 
 Upstream-Status: Inappropriate [cross specific]
 
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- source/plugin/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ source/plugin/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/source/plugin/Makefile b/source/plugin/Makefile
-index 59b5c5d..3bcb368 100644
+index 2ec4eb305..726ec32c0 100644
 --- a/source/plugin/Makefile
 +++ b/source/plugin/Makefile
-@@ -206,7 +206,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS)
- ifeq ($(BUILDING_FOR_WINDOWS),true)
- 	@cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT)
- else
--	@cd $(BINDIR) && ./carla-lv2-export$(APP_EXT)
-+	@cd $(BINDIR)
- endif
+@@ -478,8 +478,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(BINDIR)/car
+ 	@echo "Linking carla-lv2-export$(APP_EXT)"
+ 	@$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT)
+ 
+-	@echo "Generating LV2 ttl data"
+-	@cd $(BINDIR) && $(EXE_WRAPPER) ./carla-lv2-export$(APP_EXT)
++	@echo "LV2 ttl data creation is postponed"
  	@cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* .
  
+ $(BINDIR)/carla-lv2-export$(APP_EXT): $(OBJDIR)/carla-lv2-export.cpp.o
 -- 
-2.9.4
+2.30.2
 

recipes-musicians/carla/carla_git.bb

@@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = " \
-    git://github.com/falkTX/Carla.git \
+    git://github.com/falkTX/Carla.git;branch=main \
     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 = "1b5080dff02b1e751e32f0582e4aee7bc2c74a67"
+SRCREV = "74ee581a3c68cb4b3c13c83bb3f215a8d114b5a7"
 S = "${WORKDIR}/git"
-PV = "2.1.1"
+PV = "2.3.0"
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit qmake5_base pkgconfig qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
+inherit qmake5_base python3native qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
 
 B = "${S}"
 

recipes-musicians/drobilla/ganv.bb

@@ -16,6 +16,6 @@ SRC_URI = " \
     gitsm://gitlab.com/drobilla/ganv.git;protocol=https \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "662bcbc0eceab2c3d4013efbd99861e451c8cf3b"
+SRCREV = "17f58b94abf5e7b1ad7ea3c40d0cd1107298d41a"
 S = "${WORKDIR}/git"
-PV = "1.6.0"
+PV = "1.8.0"

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=2b0c9f0c37e43f926aac5d7732f06dfb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f6c5b43b95e2c2f1a006d1310332a8fb"
 
 inherit waf pkgconfig gtk-icon-cache
 
@@ -23,9 +23,9 @@ SRC_URI = " \
     gitsm://gitlab.com/drobilla/jalv.git;protocol=https \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "15f779a8603bc3f020e7000189900c52964771cd"
+SRCREV = "9ab6e66c6ea7230f716b74d62c03fc5d19f56abe"
 S = "${WORKDIR}/git"
-PV = "1.6.4+git${SRCPV}"
+PV = "1.6.6"
 
 FILES_${PN} += " \
     ${libdir}/jack \

recipes-musicians/drobilla/lilv.bb

@@ -1,18 +1,18 @@
 SUMMARY = "C library providing simple use of LV2 plugins"
 HOMEPAGE = "http://drobilla.net/software/lilv"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c06b907cf23a6e8b605bfb2b0d2446cc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b698a6a2120a83eecb34a9c6f1b93989"
 
 inherit waf python3native bash-completion pkgconfig
 
 DEPENDS += "lv2 serd sord sratom"
 
-PV = "0.24.10"
+PV = "0.24.12"
 SRC_URI = " \
     http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRC_URI[sha256sum] = "d1bba93d6ddacadb5e742fd10ad732727edb743524de229c70cc90ef81ffc594"
+SRC_URI[sha256sum] = "26a37790890c9c1f838203b47f5b2320334fe92c02a4d26ebbe2669dbd769061"
 
 EXTRA_OECONF = "--configdir=${sysconfdir} --dyn-manifest"
 

recipes-musicians/drobilla/mda-lv2.bb

@@ -13,8 +13,8 @@ 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"
+SRCREV = "19752af61234581e0f73db539d5609ab14b3d928"
+PV = "1.2.6"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " \

recipes-musicians/drobilla/patchage.bb

@@ -16,6 +16,6 @@ SRC_URI = " \
     gitsm://gitlab.com/drobilla/patchage.git;protocol=https \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRCREV = "b69c3bac42c9cf5cfcd79bce3363b4343bf0cd2e"
-PV = "1.0.2"
+SRCREV = "34f5d891fabe5c4e6137ce3d94aee8ca1955ebab"
+PV = "1.0.4"
 S = "${WORKDIR}/git"

recipes-musicians/drobilla/serd.bb

@@ -1,13 +1,13 @@
 SUMMARY = "C library for RDF syntax which supports accessing Turtle and NTriples"
 HOMEPAGE = "http://drobilla.net/software/serd"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c06b907cf23a6e8b605bfb2b0d2446cc"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b698a6a2120a83eecb34a9c6f1b93989"
 
 inherit waf
 
-PV = "0.30.6"
+PV = "0.30.8"
 SRC_URI = " \
     http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRC_URI[sha256sum] = "f5a2c74c659d8b318059068f135a43a3771491c367b6947e053a713b23cd37ef"
+SRC_URI[sha256sum] = "672ec48f55f6f5bf1b548f3d6a76f127e803dbae2550ddb730bb02d2fd28fa87"

recipes-musicians/drobilla/sord.bb

@@ -1,16 +1,15 @@
 SUMMARY = "C library for storing RDF data in memory"
 HOMEPAGE = "http://drobilla.net/software/sord"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6b8d060e6d32fbd53684f9dc0443b6a3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b698a6a2120a83eecb34a9c6f1b93989"
 
 inherit waf pkgconfig
 
 DEPENDS += "libpcre serd"
 
-PV = "0.16.6"
+PV = "0.16.8"
 SRC_URI = " \
     http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRC_URI[sha256sum] = "667af27a76085336d3865d087c1bb31a9d5f85b3359bcb27112dc43659229d44"
-
+SRC_URI[sha256sum] = "7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14"

recipes-musicians/drobilla/sratom.bb

@@ -1,15 +1,15 @@
 SUMMARY = "Sratom is a library for serialising LV2 atoms to and from RDF"
 HOMEPAGE = "http://drobilla.net/software/sratom"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ebc7934238811c788037421c6c548ddf"
+LIC_FILES_CHKSUM = "file://COPYING;md5=02c12fd13bfe8cd6878ad1ea35778acf"
 
 inherit waf pkgconfig
 
 DEPENDS += "lv2 serd sord"
 
-PV = "0.6.6"
+PV = "0.6.8"
 SRC_URI = " \
     http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRC_URI[sha256sum] = "fb910bf62a5e69f4430bf09653d386fc4de9ff02bfd58635e1d45cbd31481b9d"
+SRC_URI[sha256sum] = "3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df"

recipes-musicians/drobilla/suil.bb

@@ -1,7 +1,7 @@
 SUMMARY = "Suil is a lightweight C library for loading and wrapping LV2 plugin UIs"
 HOMEPAGE = "https://drobilla.net/software/suil"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=54e4263214f26373135dee9a81a9bf55"
+LIC_FILES_CHKSUM = "file://COPYING;md5=323e8282a413e218c2ec674a44c02cf4"
 
 inherit waf features_check pkgconfig
 
@@ -9,11 +9,11 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS = "gtk+ gtk+3 qtbase lv2"
 
-PV = "0.10.8"
+PV = "0.10.10"
 SRC_URI = " \
     http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
-SRC_URI[sha256sum] = "91cd87e17e80d2e43d64700369b93a5c2d0f1648e36411e0233253a0c3840f40"
+SRC_URI[sha256sum] = "750f08e6b7dc941a5e694c484aab02f69af5aa90edcc9fb2ffb4fb45f1574bfb"
 
 FILES_${PN} += "${libdir}/suil-0"

recipes-musicians/drumgizmo/drumgizmo-native.bb

@@ -3,7 +3,7 @@ require ${BPN}.inc
 inherit native
 
 do_compile() {
-     ${CXX} ${CXXFLAGS} -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc $(LDFLAGS)
+     ${CXX} ${CXXFLAGS} -I${S}/getoptpp -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc ${LDFLAGS}
 }
 
 do_install() {

recipes-musicians/drumgizmo/drumgizmo.bb

@@ -20,7 +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://0004-Do-not-perform-tests-they-don-t-work-cross.patch \
     file://drumgizmo.desktop \
 "
 

recipes-musicians/drumgizmo/drumgizmo.inc

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

recipes-musicians/drumgizmo/drumgizmo/0002-Use-native-rcgen.patch

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am
-index dd36783..ca30e84 100644
+index d102024..8a4a677 100644
 --- a/plugingui/Makefile.am
 +++ b/plugingui/Makefile.am
-@@ -28,7 +28,7 @@ RES = \
- 	../COPYING
+@@ -71,7 +71,7 @@ BUILT_SOURCES = \
+ 	$(NLS_RES)
  
- resource_data.cc : rcgen $(RES)
--	./rcgen $(RES) > resource_data.cc
-+	drumgizmo-rcgen $(RES) > resource_data.cc
+ resource_data.cc: rcgen$(EXEEXT) $(RES) $(NLS_RES)
+-	$(rcgen_verbose)./rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
++	drumgizmo-rcgen -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES)
  
- libdggui_la_CPPFLAGS = \
- 	$(GUI_CPPFLAGS) \
+ CLEANFILES = \
+ 	resource_data.cc \
 -- 
-2.14.3
+2.26.2
 

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

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/plugin/Makefile.am b/plugin/Makefile.am
-index 6c0d324..5b36f21 100644
+index f382acc..2181854 100644
 --- a/plugin/Makefile.am
 +++ b/plugin/Makefile.am
-@@ -66,7 +66,7 @@ UITYPE=CocoaUI
- endif
+@@ -75,7 +75,7 @@ ttlgen_verbose_ = $(ttlgen_verbose_@AM_DEFAULT_V@)
+ ttlgen_verbose_0 = @echo "  TTLGEN   "$@;
  
  manifest.ttl : ttlgen drumgizmo.la
--	./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
-+	echo ./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE)
+-	$(ttlgen_verbose)./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) > /dev/null
++	echo $(ttlgen_verbose)./ttlgen .libs/drumgizmo.so manifest.ttl $(UITYPE) > /dev/null
  
  
  #######
 -- 
-2.21.0
+2.26.2
 

recipes-musicians/drumgizmo/drumgizmo/0004-Do-not-perform-tests-they-don-t-work-cross.patch

@@ -0,0 +1,31 @@
+From 15eefcf7d4db242b1bc00db00194475646d4313d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 8 Jan 2021 17:00:44 +0100
+Subject: [PATCH] Do not perform tests - they don't work cross
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4196db7..87c401e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = gnu
+-SUBDIRS = tools src plugingui plugin drumgizmo man test
+-DISTDIRS = tools src plugingui plugin drumgizmo man test
++SUBDIRS = tools src plugingui plugin drumgizmo man
++DISTDIRS = tools src plugingui plugin drumgizmo man
+ 
+ EXTRA_DIST = \
+ 	version.h \
+-- 
+2.26.2
+

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

@@ -1,63 +0,0 @@
-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/geonkick/geonkick.bb

@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 inherit cmake mime mime-xdg gtk-icon-cache
 
 DEPENDS += " \
-    redkite \
     redkite-native \
     libsndfile1 \
     rapidjson \
@@ -14,9 +13,12 @@ DEPENDS += " \
     lv2 \
 "
 
-SRC_URI = "git://gitlab.com/iurie-sw/geonkick;protocol=https"
-SRCREV = "e3323636b4f3d77cc4c2629f1c196ead161c7a11"
-PV = "2.5.1"
+SRC_URI = " \
+    git://gitlab.com/iurie-sw/geonkick;protocol=https \
+    file://0001-Execute-native-REDKITE-S-rkpng2c.patch \
+"
+SRCREV = "77b2155f8b30ea7e4af5c664e930eeb43c17a24d"
+PV = "2.7.3"
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = " \

recipes-musicians/geonkick/geonkick/0001-Execute-native-REDKITE-S-rkpng2c.patch

@@ -0,0 +1,31 @@
+From 3488aac706bea4e03a1a29fa6d929d4caafc9b0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 3 Apr 2021 00:44:26 +0200
+Subject: [PATCH] Execute native REDKITE'S rkpng2c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 242db79..cf4f099 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -237,7 +237,7 @@ foreach(pngFile ${gkick_rc_png_files})
+   string(REPLACE " " "_" filename ${filename})
+   add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/resources/${filename}.c
+     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/resources
+-    && ${CMAKE_BINARY_DIR}/redkite/tools/rkpng2c
++    && rkpng2c
+     "${GKICK_RC_DIR}/${pngFile}" "${CMAKE_BINARY_DIR}/resources/${filename}.c" "rk__${filename}")
+     set(GKICK_RC_OUTPUT ${GKICK_RC_OUTPUT} ${CMAKE_BINARY_DIR}/resources/${filename}.c)
+ endforeach()
+-- 
+2.26.2
+

recipes-musicians/geonkick/redkite.bb

@@ -9,8 +9,8 @@ inherit cmake features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://github.com/iurie-sw/redkite.git"
-SRCREV = "61f26b13123bc9cb85045ab52046a40d6be392dc"
-PV = "1.2.0"
+SRCREV = "5ff4841320716e93a27b5be7c8557df8b333492a"
+PV = "1.3.1"
 S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"

recipes-musicians/hermann/guitarix.bb

@@ -8,8 +8,8 @@ SRC_URI = " \
     file://0001-Rework-messages-somehow-yes-or-no-is-missing.patch \
     file://0002-Do-not-strip-LV2-plugins.patch \
 "
-SRCREV = "a2a3f122c42689cb9dd87b7613b698aa1bac9358"
-PV = "0.42.0"
+SRCREV = "7dfddb517000b3a5c22875c5b06f71ed589adddd"
+PV = "0.42.1+git${SRCPV}"
 S = "${WORKDIR}/git/trunk"
 
 inherit waf fontcache gettext

recipes-musicians/hermann/mamba.bb

@@ -4,8 +4,8 @@ LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1a396d84ed72b4a017f02f5c5d1eaafe"
 
 SRC_URI = "gitsm://github.com/brummer10/Mamba.git"
-SRCREV = "2d8da87ea76673c3f17629f6b64a3853e5cd4533"
-PV = "2.0"
+SRCREV = "6b1c0011a6cf4bf7e4996b2120a9ff12ed45e0ae"
+PV = "2.2"
 S = "${WORKDIR}/git"
 
 inherit pkgconfig features_check mime-xdg gettext
@@ -13,6 +13,7 @@ inherit pkgconfig features_check mime-xdg gettext
 REQUIRED_DISTRO_FEATURES = "x11"
 
 DEPENDS += " \
+    vim-native \
     cairo \
     virtual/libx11 \
     libsigc++-2.0 \

recipes-musicians/hydrogen/hydrogen.bb

@@ -80,8 +80,8 @@ 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 = "4886dc95073ec60760df2d860e17446e9c59424c"
-PV ="1.0.1"
+SRCREV = "3294c3942b6899fb9140c4dc0b343d86bc0935ac"
+PV ="1.0.2"
 
 ###############################################################################
 # drumkits URIs from http://hydrogen-music.org/feeds/drumkit_list.php

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

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

recipes-musicians/kushview/kushview-element_git.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "https://kushview.net/element/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
 
-inherit waf pkgconfig features_check
+inherit waf gtk-icon-cache pkgconfig features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
@@ -17,14 +17,12 @@ DEPENDS += " \
     lilv \
     suil \
     ladspa-sdk \
+    jack \
 "
 
-SRC_URI = " \
-    gitsm://github.com/kushview/Element.git \
-    file://0001-Fix-build-for-python3-only-environments.patch \
-"
-SRCREV = "c73c120334f4e170dba029f3794e5e8ba601c127"
-PV = "0.44.0"
+SRC_URI = "gitsm://github.com/kushview/Element.git"
+SRCREV = "3233c02d0fe1b96e551c0fae20626dcacb6d431e"
+PV = "0.46.0"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " \
@@ -32,6 +30,13 @@ EXTRA_OECONF = " \
     --libdir=${libdir} \
 "
 
+PATH_append = ":${B}"
+
+do_configure_prepend() {
+    # link python -> python3
+    ln -sf `which python3` ${B}/python
+}
+
 FILES_${PN} += "${datadir}/element"
 
 # TBD - we should send a fix upstream..

recipes-musicians/linuxaudio/new-session-manager.bb

@@ -11,8 +11,8 @@ DEPENDS = " \
 "
 
 SRC_URI = "git://github.com/linuxaudio/new-session-manager.git"
-SRCREV = "fb380bf7253096620e166d4abafa45cd830eeedd"
-PV = "1.4.0+git${SRCPV}"
+SRCREV = "b23c052c8bfc4c67e6e02105eed624982834e8be"
+PV = "1.5.0"
 S = "${WORKDIR}/git"
 
 inherit meson gtk-icon-cache

recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch

@@ -10,20 +10,21 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/utils/Makefile | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
+ src/utils/Makefile | 28 ++++++++++------------------
+ 1 file changed, 10 insertions(+), 18 deletions(-)
 
 diff --git a/src/utils/Makefile b/src/utils/Makefile
-index 37383b05..3cc76ca8 100644
+index 88b37393..b6d4e7a5 100644
 --- a/src/utils/Makefile
 +++ b/src/utils/Makefile
-@@ -14,22 +14,14 @@ ifeq ($(LSP_TESTING),1)
+@@ -15,23 +15,15 @@ ifeq ($(LSP_TESTING),1)
    OBJ_EXTRA              += $(OBJ_TEST_CORE)
  endif
  
 -ifeq ($(findstring lv2,$(BUILD_MODULES)),lv2)
 -  MODULES                += $(UTL_GENTTL)
 -  FILELIST               += lv2_genttl.o
+-  INCLUDE_EXTRA          += $(LV2_HEADERS)
 -endif
 -ifeq ($(findstring vst,$(BUILD_MODULES)),vst)
 -  MODULES                += $(UTL_VSTMAKE)
@@ -31,20 +32,21 @@ index 37383b05..3cc76ca8 100644
 -endif
 -ifeq ($(findstring jack,$(BUILD_MODULES)),jack)
 -  MODULES                += $(UTL_JACKMAKE)
--  FILELIST               += jack_genmake.o 
+-  FILELIST               += jack_genmake.o
 -endif
 -ifeq ($(findstring doc,$(BUILD_MODULES)),doc)
 -  MODULES                += $(UTL_GENPHP)
--  FILELIST               += gen_php.o 
+-  FILELIST               += gen_php.o
 -endif
 +MODULES                += $(UTL_GENTTL)
 +FILELIST               += lv2_genttl.o
++INCLUDE_EXTRA          += $(LV2_HEADERS)
 +MODULES                += $(UTL_VSTMAKE)
 +FILELIST               += vst_genmake.o
 +MODULES                += $(UTL_JACKMAKE)
-+FILELIST               += jack_genmake.o 
++FILELIST               += jack_genmake.o
 +MODULES                += $(UTL_GENPHP)
-+FILELIST               += gen_php.o 
++FILELIST               += gen_php.o
  
  FILES                   = $(addprefix $(OBJDIR)/, $(FILELIST))
  

recipes-musicians/lsp-plugins/lsp-plugins.bb

@@ -20,7 +20,11 @@ DEPENDS += " \
 SRC_URI += " \
     file://0001-Makefile-align-for-oe-cross-build.patch \
     file://0002-Pass-LDFLAGS-to-so-lib-builds.patch \
-    file://0003-Hack-remove-runtime-charset-conversions.patch \
+"
+# musl is CORRECT and causing nothing but waste of resources
+SRC_URI_append_libc-musl = " \
+    file://musl/0001-Hack-remove-runtime-charset-conversions.patch \
+    file://musl/0002-Fix-build-with-musl.patch \
 "
 
 ARM_INSTRUCTION_SET = "arm"
@@ -77,3 +81,12 @@ FILES_${PN} += " \
 
 PACKAGES =+ "${PN}-standalone"
 FILES_${PN}-standalone = "${bindir}"
+
+# lsp-plugins (and maybe others) need a gconv cache for target use of iconv
+# see https://github.com/sadko4u/lsp-plugins/issues/17#issuecomment-487416107
+RDEPENDS_${PN}_append_libc-glibc += " \
+    glibc-gconv glibc-gconvs glibc-utils \
+"
+pkg_postinst_ontarget_${PN}_append_libc-glibc() {
+    iconvconfig
+}

recipes-musicians/lsp-plugins/lsp-plugins.inc

@@ -7,9 +7,9 @@ SRC_URI = " \
     gitsm://github.com/sadko4u/lsp-plugins.git \
     file://0001-Add-missing-dsp-in-SUBDIRS.patch \
 "
-SRCREV = "ad2720345ce5dffb45f871146de1ae6d16f4c73d"
+SRCREV = "d78befc2faaa6de64050c3c4b662dea429e47c40"
 S = "${WORKDIR}/git"
-PV = "1.1.26"
+PV = "1.1.30"
 
 do_configure[noexec] = "1"
 

recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch

@@ -33,10 +33,10 @@ index 189af3f5..52706983 100644
  
  # Files
 diff --git a/scripts/make/configure.mk b/scripts/make/configure.mk
-index e2d3d58a..660c1b5a 100644
+index 09aee9a0..5a796e85 100644
 --- a/scripts/make/configure.mk
 +++ b/scripts/make/configure.mk
-@@ -57,69 +57,6 @@ export INSTALLATIONS
+@@ -58,69 +58,8 @@ export INSTALLATIONS
  export UNINSTALLATIONS
  export RELEASES
  
@@ -66,6 +66,7 @@ index e2d3d58a..660c1b5a 100644
 -endif
 -
 -ifeq ($(BUILD_PLATFORM), BSD)
+-  INCLUDE          += -I/usr/local/include
 -  ifeq ($(BUILD_PROFILE),arm)
 -    CC_ARCH          = -marm
 -    ifneq ($(LD_PATH),)
@@ -97,15 +98,14 @@ index e2d3d58a..660c1b5a 100644
 -ifeq ($(BUILD_PROFILE),aarch64)
 -  CC_ARCH          = -march=armv8-a
 -endif
--
--
+ 
+ 
 -export CC_ARCH
 -export LD_ARCH
 -export LD_PATH
--
- export INCLUDE     = -I"${CURDIR}/include"
+ export INCLUDE
  
  # Dependencies: compile headers and linkage libraries
 -- 
-2.21.0
+2.26.2
 

recipes-musicians/lsp-plugins/lsp-plugins/musl/0001-Hack-remove-runtime-charset-conversions.patch

@@ -1,4 +1,4 @@
-From b8d6bc13a68a78dc026db863cbc7103bbb584afe Mon Sep 17 00:00:00 2001
+From bc8d07b9f2c0bab4ec66023d9c925539bdc09f63 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 28 Apr 2019 22:17:48 +0200
 Subject: [PATCH] Hack: remove runtime charset conversions
@@ -10,15 +10,16 @@ There are no charsets installed yet and I have no idea which are required. So
 treat all texts as UTF-8.
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
 ---
  src/core/LSPString.cpp | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/src/core/LSPString.cpp b/src/core/LSPString.cpp
-index 8e0d72af..e8cf00ff 100644
+index 44174cff..8ed9c1b5 100644
 --- a/src/core/LSPString.cpp
 +++ b/src/core/LSPString.cpp
-@@ -1418,7 +1418,8 @@ namespace lsp
+@@ -1651,7 +1651,8 @@ namespace lsp
              return true;
          }
  
@@ -28,7 +29,7 @@ index 8e0d72af..e8cf00ff 100644
          LSPString temp;
  
          // Open conversion
-@@ -1479,7 +1480,7 @@ namespace lsp
+@@ -1712,7 +1713,7 @@ namespace lsp
  
          // Close descriptor
          iconv_close(cd);
@@ -37,7 +38,7 @@ index 8e0d72af..e8cf00ff 100644
          return true;
      }
  #endif /* PLATFORM_WINDOWS */
-@@ -1641,7 +1642,9 @@ namespace lsp
+@@ -1878,7 +1879,9 @@ namespace lsp
          if (first >= last)
              return (last == first) ? "" : NULL;
  
@@ -47,8 +48,8 @@ index 8e0d72af..e8cf00ff 100644
 +/*        // Open conversion
          iconv_t cd = init_iconv_from_wchar_t(charset);
          if (cd == iconv_t(-1))
-             return NULL;
-@@ -1703,7 +1706,7 @@ namespace lsp
+             return get_utf8(first, last);
+@@ -1940,7 +1943,7 @@ namespace lsp
          if (!append_temp("\x00\x00\x00\x00", 4))
              return NULL;
  
@@ -57,6 +58,3 @@ index 8e0d72af..e8cf00ff 100644
      }
  #endif /* PLATFORM_WINDOWS */
  
--- 
-2.20.1
-

recipes-musicians/lsp-plugins/lsp-plugins/musl/0002-Fix-build-with-musl.patch

@@ -0,0 +1,32 @@
+From 436b33a805714d9030543b5617885701761488bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 25 Jun 2021 21:41:24 +0200
+Subject: [PATCH] Fix build with musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| /include/data/cvector.h:415:24: error: 'ssize_t' does not name a type; did you mean 'size_t'?
+
+Upstream-Status: Inappropriate[musl]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ include/data/cvector.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/data/cvector.h b/include/data/cvector.h
+index eccc94a6..d8a2b7d1 100644
+--- a/include/data/cvector.h
++++ b/include/data/cvector.h
+@@ -22,6 +22,7 @@
+ #ifndef DATA_CVECTOR_H_
+ #define DATA_CVECTOR_H_
+ 
++#include <unistd.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+2.31.1
+

recipes-musicians/lv2/lv2.inc

@@ -8,7 +8,7 @@ SRC_URI = " \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
 S = "${WORKDIR}/git"
-SRCREV = "5f40c5c421ffc50783962efb4cab151c8c2519dd"
-PV = "1.18.0"
+SRCREV = "cd152104c84bcee9fec22ef780cec2af7ba85d0c"
+PV = "1.18.2"
 
 inherit waf pkgconfig

recipes-musicians/mixxx/mixxx_git.bb

@@ -40,7 +40,7 @@ DEPENDS += " \
 #    gperftools
 
 SRC_URI = " \
-    git://github.com/mixxxdj/${BPN}.git \
+    git://github.com/mixxxdj/${BPN}.git;branch=main \
     file://0001-do-not-check-for-known-machine-types.patch \
     file://0002-force-using-system-soundtouch.patch \
     file://0003-align-path-of-qt-build-tools-to-our-needs.patch \

recipes-musicians/muse/muse.bb

@@ -1,7 +1,7 @@
 SUMMARY = "MusE is a digital audio workstation"
 HOMEPAGE = "http://muse-sequencer.org/"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://muse3/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d"
+LIC_FILES_CHKSUM = "file://src/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d"
 
 DEPENDS += " \
     qtbase \
@@ -28,17 +28,17 @@ SRC_URI = " \
     file://0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch \
     file://0002-muse-find-unused-wavs-convert-to-pythomn3.patch \
 "
-SRCREV = "2b479fecc447871c10b08dcd8aabb1ac9b0bdfc7"
-PV = "3.1.1"
+SRCREV = "3e79cbcbea4480a43dc6052fb0fc118c356fb404"
+PV = "4.0.0"
 S = "${WORKDIR}/git"
 
-OECMAKE_SOURCEPATH = "${S}/muse3"
+OECMAKE_SOURCEPATH = "${S}/src"
 
 EXTRA_OECMAKE += " \
     -DLIB_INSTALL_DIR=${libdir} \
     -DMODULES_BUILD_STATIC=1 \
     -DCMAKE_SHARED_LINKER_FLAGS='${LDFLAGS} -Wl,--no-undefined' \
-    -DVST_HEADER_PATH=${S}/muse3/vestige \
+    -DVST_HEADER_PATH=${S}/src/vestige \
     -DENABLE_VST_VESTIGE=1 \
     \
     -DENABLE_LV2=1 \
@@ -52,7 +52,7 @@ EXTRA_OECMAKE += " \
 do_install_append() {
     # remove python script to convert songs from very old muse to avoid
     # python rdeps
-    rm -f ${D}${datadir}/muse-3.1/utils/muse-song-convert.py
+    rm -f ${D}${datadir}/muse-4.0/utils/muse-song-convert.py
 }
 
 QT_TRANSLATION_FILES = "${datadir}/*/locale/*.qm"
@@ -61,8 +61,8 @@ FILES_${PN}-locale = "${datadir}/muse-3.0/locale"
 FILES_${PN} += " \
     ${datadir}/mime \
     ${datadir}/metainfo \
-    ${datadir}/muse-3.1 \
-    ${libdir}/muse-3.1 \
+    ${datadir}/muse-4.0 \
+    ${libdir}/muse-4.0 \
 "
 
 RDEPENDS_${PN} += "python3-core"

recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch

@@ -11,13 +11,13 @@ Upstream-Status: Inappropriate [OE-specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- muse3/CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/muse3/CMakeLists.txt b/muse3/CMakeLists.txt
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 2746a50f..ebf97d10 100644
---- a/muse3/CMakeLists.txt
-+++ b/muse3/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -451,7 +451,6 @@ SET (AEFFECT_H_FOUND FALSE)
  SET (VST_NATIVE_SUPPORT FALSE)
  

recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch

@@ -10,13 +10,13 @@ Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- muse3/utils/muse-find-unused-wavs | 46 +++++++++++++++----------------
+ src/utils/muse-find-unused-wavs | 46 +++++++++++++++----------------
  1 file changed, 23 insertions(+), 23 deletions(-)
 
-diff --git a/muse3/utils/muse-find-unused-wavs b/muse3/utils/muse-find-unused-wavs
+diff --git a/src/utils/muse-find-unused-wavs b/src/utils/muse-find-unused-wavs
 index 5aaf2707..3bc4e009 100755
---- a/muse3/utils/muse-find-unused-wavs
-+++ b/muse3/utils/muse-find-unused-wavs
+--- a/src/utils/muse-find-unused-wavs
++++ b/src/utils/muse-find-unused-wavs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3

recipes-musicians/non/non.bb

@@ -1,58 +0,0 @@
-SUMMARY = "Lightweight and modular DAW"
-HOMEPAGE = "http://non.tuxfamily.org/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS += " \
-    ntk-native \
-    ladspa-sdk \
-    ntk \
-    jack \
-    liblo \
-    libsndfile1 \
-    lrdf \
-    libsigc++-2.0 \
-"
-
-inherit waf pkgconfig features_check gtk-icon-cache
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "git://git.tuxfamily.org/gitroot/non/non.git"
-SRCREV = "d958df0486c7397c243f5ac36bf4acbc461a1e50"
-S = "${WORKDIR}/git"
-PV = "1.2.0+git${SRCPV}"
-
-NON_SIMD ?= "--disable-sse"
-
-EXTRA_OECONF = " \
-    ${NON_SIMD} \
-    --bindir=${bindir} \
-    --libdir=${libdir} \
-"
-
-python waf_preconfigure() {
-}
-
-do_configure_prepend() {
-    for pfile in `grep -rl '/usr/bin/env python$' ${S}`; do
-        sed -i 's:/usr/bin/env python:/usr/bin/env python3:' $pfile
-    done
-}
-
-FILES_${PN} += "${datadir}/non-sequencer"
-
-PACKAGES =+ "${PN}-session-manager"
-FILES_${PN}-session-manager = " \
-    ${datadir}/applications/non-session-manager.desktop \
-    ${datadir}/icons/hicolor/*/apps/non-session-manager.png \
-    ${datadir}/pixmaps/non-session-manager \
-    ${bindir}/jackpatch \
-    ${bindir}/non-session-manager \
-    ${bindir}/nsm-proxy \
-    ${bindir}/nsm-proxy-gui \
-    ${bindir}/nsmd \
-"
-
-RCONFLICTS_${PN}-session-manager = "new-session-manager"
-RREPLACES_${PN}-session-manager = "new-session-manager"

recipes-musicians/qmmp/qmmp_1.4.6.bb

@@ -34,7 +34,7 @@ SRC_URI = " \
     file://0001-Remove-freebsd-compilation-support.patch \
     file://0002-Hardcode-projectM-configuration-file-location.patch \
 "
-SRC_URI[sha256sum] = "cac9518c1fa7abd4558efb78cb8a8a637db065c66420e45f1b2f33902ce07fcf"
+SRC_URI[sha256sum] = "f513774357836ad4983fa216c84cf5db634284faebec48c461733838917fd664"
 
 inherit cmake_qt5 mime-xdg
 

recipes-musicians/rncbc/drumkv1.bb

@@ -12,27 +12,27 @@ DEPENDS += " \
     hydrogen \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
+inherit cmake_qt5 gtk-icon-cache mime
 
+do_convert_crlf_to_lf[depends] += "dos2unix-native:do_populate_sysroot"
+
+# Convert CRLF line terminators to LF for hydrogen2drumkv1 only
+do_convert_crlf_to_lf () {
+	find ${WORKDIR}/hydrogen2drumkv1 -type f -exec dos2unix {} \;
+}
+
+addtask convert_crlf_to_lf after do_unpack before do_patch
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+    file://0002-Avoid-stripping-CMake.patch \
     git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-    file://0002-Avoid-stripping.patch \
+    file://0001-Fix-for-python-3.9.patch;patchdir=../hydrogen2drumkv1 \
 "
-PV = "0.9.19"
-SRC_URI[sha256sum] = "2e63945c8f6d06550c7817c7cd6e0a8ed0d38d6b5f13c43ca8e279320ccb2e71"
+PV = "0.9.22"
+SRC_URI[sha256sum] = "fe67b6ff00bac86faef18f759100e325ce200f508093566f5d30174702a22330"
 
 SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e"
 
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
-
 do_install_append() {
     install -d ${D}${datadir}/${BPN}/presets
     # convert hydrogen drumkits to drumkv1

recipes-musicians/rncbc/drumkv1/0001-Fix-for-python-3.9.patch

@@ -0,0 +1,33 @@
+From a27b5d6badad46e044d4ecb688f76ab8a16b2fc7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 24 Apr 2021 22:13:20 +0200
+Subject: [PATCH] Fix for python >= 3.9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| AttributeError: 'xml.etree.ElementTree.Element' object has no attribute 'getiterator'
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ hydrogen2drumkv1.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hydrogen2drumkv1.py b/hydrogen2drumkv1.py
+index 0d2ff28..3f1e914 100644
+--- a/hydrogen2drumkv1.py
++++ b/hydrogen2drumkv1.py
+@@ -36,7 +36,7 @@ def main():
+     # strip namespace if present
+     namespace = '{http://www.hydrogen-music.org/drumkit}'
+     nsl = len(namespace)
+-    for elem in input_xml.getiterator():
++    for elem in input_xml.iter():
+         if elem.tag.startswith(namespace):
+             elem.tag = elem.tag[nsl:]
+ 
+-- 
+2.30.2
+

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

@@ -1,108 +0,0 @@
-From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 24 Nov 2018 16:30:08 +0100
-Subject: [PATCH] find native qt build tools by configure options - auto
- detection does not work
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [cross specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
----
- configure.ac | 43 ++++++++++++++++---------------------------
- 1 file changed, 16 insertions(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4713f05..a8317f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -285,23 +285,11 @@ if test -x $ac_qtchooser; then
-    export QT_SELECT=5
- fi
- 
--# Check for proper qmake path/version alternatives.
--AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
--if test "x$ac_qmake" = "xno"; then
--   AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
--   ac_qmake=$ac_cv_qmake
--fi
--if test "x$ac_qmake" = "xno"; then
--   AC_PATH_TOOL(ac_cv_qmake, qmake-qt6, [no], $ac_path)
--   ac_qmake=$ac_cv_qmake
--fi
-+AC_ARG_WITH(qmake,
-+  AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]),
-+  [ac_qmake="$withval"], [ac_qmake="no"])
- 
--# Check for proper Qt major version.
--AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
--   ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)
--   ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
--])
--ac_qt_version_major=$ac_cv_qt_version_major
-+ac_qt_version_major=5
- if test "x$ac_qmake" = "xno"; then
-    if test $ac_qt_version_major -lt 6; then
-       AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
-@@ -319,13 +307,6 @@ if test -d $ac_qt_install_path; then
-    ac_path="$ac_qt_install_path:$ac_path"
- fi
- 
--# Check it again, now with updated PATH, just in case...
--AC_PATH_TOOL(ac_cv_qmake, qmake, [no], $ac_path)
--ac_qmake=$ac_cv_qmake
--if test "x$ac_qmake" = "xno"; then
--   AC_MSG_ERROR([qmake $ac_errmsg])
--fi
--
- AC_SUBST(ac_qmake)
- 
- AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [
-@@ -361,14 +342,18 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
- ])
- 
- # Check for Qt moc utility.
--AC_PATH_TOOL(ac_moc, moc, [no], $ac_path)
-+AC_ARG_WITH(moc,
-+  AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]),
-+  [ac_moc="$withval"], [ac_moc="no"])
- if test "x$ac_moc" = "xno"; then
-    AC_MSG_ERROR([moc $ac_errmsg])
- fi
- AC_SUBST(ac_moc)
- 
- # Check for Qt uic utility.
--AC_PATH_TOOL(ac_uic, uic, [no], $ac_path)
-+AC_ARG_WITH(uic,
-+  AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]),
-+  [ac_uic="$withval"], [ac_uic="no"])
- if test "x$ac_uic" = "xno"; then
-    AC_MSG_ERROR([uic $ac_errmsg])
- fi
-@@ -376,7 +361,9 @@ AC_SUBST(ac_uic)
- 
- 
- # Check for Qt lupdate utility.
--AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path)
-+AC_ARG_WITH(lupdate,
-+  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
-+  [ac_lupdate="$withval"], [ac_lupdate="no"])
- if test "x$ac_lupdate" = "xno"; then
-    if test $ac_qt_version_major -lt 6; then
-       AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path)
-@@ -396,7 +383,9 @@ fi
- AC_SUBST(ac_lupdate)
- 
- # Check for Qt lrelease utility.
--AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path)
-+AC_ARG_WITH(lrelease,
-+  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
-+  [ac_lrelease="$withval"], [ac_lrelease="no"])
- if test "x$ac_lrelease" = "xno"; then
-    if test $ac_qt_version_major -lt 6; then
-       AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path)
--- 
-2.26.2

recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch

@@ -0,0 +1,42 @@
+From 7e4c32eebb1b074c4f3c2916a43340985bdbfea2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 24 Apr 2021 21:50:53 +0200
+Subject: [PATCH] Avoid stripping - CMake
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6af9d9f..1050391 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -169,10 +169,6 @@ if (CONFIG_LV2)
+   set_target_properties (${PROJECT_NAME}_lv2 PROPERTIES CXX_STANDARD 17)
+   target_link_libraries (${PROJECT_NAME}_lv2 PRIVATE ${PROJECT_NAME}_ui)
+   if (UNIX AND NOT APPLE)
+-    if (NOT CONFIG_DEBUG)
+-      add_custom_command(TARGET ${PROJECT_NAME}_lv2  POST_BUILD
+-        COMMAND strip lib${PROJECT_NAME}_lv2.so)
+-    endif ()
+     if (CONFIG_PREFIX MATCHES $ENV{HOME})
+       set (CONFIG_LV2DIR ${CONFIG_PREFIX}/.lv2)
+     else ()
+@@ -199,10 +195,6 @@ if (CONFIG_JACK)
+     target_link_libraries (${PROJECT_NAME}_jack PRIVATE PkgConfig::LIBLO)
+   endif ()
+   if (UNIX AND NOT APPLE)
+-    if (NOT CONFIG_DEBUG)
+-      add_custom_command(TARGET ${PROJECT_NAME}_jack POST_BUILD
+-        COMMAND strip ${PROJECT_NAME}_jack)
+-    endif ()
+     install (TARGETS ${PROJECT_NAME}_jack RUNTIME
+       DESTINATION ${CMAKE_INSTALL_BINDIR})
+     install (FILES ${PROJECT_NAME}.desktop
+-- 
+2.31.1
+

recipes-musicians/rncbc/files/0002-Avoid-stripping.patch

@@ -1,45 +0,0 @@
-From 4700026b6c22da972d4159a9116221b3feecd314 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 28 Dec 2019 13:37:41 +0100
-Subject: [PATCH] Avoid stripping
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| strip: Unable to recognise the format of the input file `drumkv1_jack'
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- src/src_jack.pro | 1 -
- src/src_lv2.pro  | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/src_jack.pro b/src/src_jack.pro
-index c5f0a02..879d39d 100644
---- a/src/src_jack.pro
-+++ b/src/src_jack.pro
-@@ -79,7 +79,6 @@ unix {
- 	mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
- 	mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
- 
--	CONFIG(release, debug|release):QMAKE_POST_LINK += strip $(TARGET)
- }
- 
- QT += widgets xml
-diff --git a/src/src_lv2.pro b/src/src_lv2.pro
-index fcf8c1c..ccc95e4 100644
---- a/src/src_lv2.pro
-+++ b/src/src_lv2.pro
-@@ -66,7 +66,6 @@ unix {
- 		$${TARGET_LV2UI}.ttl \
- 		$${NAME}.lv2/manifest.ttl
- 
--	CONFIG(release, debug|release):QMAKE_POST_LINK += strip $(TARGET);
- 	QMAKE_POST_LINK += $${QMAKE_COPY} -vp $(TARGET) $${TARGET_LV2}.so
- 
- 	QMAKE_CLEAN += $${TARGET_LV2}.so
--- 
-2.21.1
-

recipes-musicians/rncbc/padthv1.bb

@@ -12,29 +12,19 @@ DEPENDS += " \
     fftw \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
+inherit cmake_qt5 gtk-icon-cache mime
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+    file://0002-Avoid-stripping-CMake.patch \
     http://linuxsynths.com/Padthv1PatchesDemos/Padthv1Patches.tar.gz;name=linuxsynths-padthv1-presets;subdir=linuxsynths-padthv1-presets \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-    file://0002-Avoid-stripping.patch \
     file://padthv1.conf \
 "
-PV = "0.9.19"
-SRC_URI[sha256sum] = "279b3bc5d74449a02830768d940aed60264c2a9b969ac386d223ffde09cbd319"
+PV = "0.9.22"
+SRC_URI[sha256sum] = "dd445359803e9bbb6f43af53841054c80e77c197aca2d88c4172301cd24e7ef2"
 
-SRC_URI[linuxsynths-padthv1-presets.md5sum] = "951484ad2fe404d233a704d444147827"
 SRC_URI[linuxsynths-padthv1-presets.sha256sum] = "ad9eadc707784b6931955b1fc63308b9e5dc59d24903e6405e9d34d30794fd0b"
 
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
-
 do_install_append() {
     install -d ${D}/${datadir}/${BPN}
     install -d ${D}/${datadir}/${BPN}/presets

recipes-musicians/rncbc/qjackctl.bb

@@ -12,26 +12,16 @@ DEPENDS += " \
     portaudio-v19 \
 "
 
-# autotools-brokensep must be after qmake5_base!
-inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation
+inherit cmake_qt5 gtk-icon-cache qt5-translation
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
     file://QjackCtl.conf \
 "
 SRCREV = "c88e08a7d62be39ea541d26c8c7e1e7b82289cd3"
 
-SRC_URI[sha256sum] = "5196c5c01b7948c1a8ca37cd3198a7f0fe095a99a34a67086abd3466855b4abd"
-PV = "0.9.0"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
+SRC_URI[sha256sum] = "e9c2ffc219863c8c3dcdb05c4870d419b1625906852294f15c62d590b331bd18"
+PV = "0.9.3"
 
 FILES_${PN} += " \
     ${datadir}/metainfo \

recipes-musicians/rncbc/qmidictl.bb

@@ -9,23 +9,11 @@ DEPENDS += " \
     qtbase \
 "
 
-# autotools-brokensep must be after qmake5_base!
-inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation
+inherit cmake_qt5 gtk-icon-cache
 
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-"
-SRC_URI[sha256sum] = "83f445ef7191c02158b1bc5acc4c667fc68ce7539977592bdb71a9ed3c7dafd9"
-PV = "0.9.0"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
+SRC_URI[sha256sum] = "44d99946474e5609bb3dc8444966591d0193cfa3bf5b78b05de0dd277ef30b49"
+PV = "0.9.3"
 
 FILES_${PN} += " \
     ${datadir}/metainfo \

recipes-musicians/rncbc/qmidinet.bb

@@ -10,23 +10,11 @@ DEPENDS += " \
     jack \
 "
 
-# autotools-brokensep must be after qmake5_base!
-inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation
+inherit cmake_qt5 gtk-icon-cache
 
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-"
-SRC_URI[sha256sum] = "6be3b38ed5d5c66f99b34e50ab1b0828dc501ada055c6de1b5c3b43e5cf73c6e"
-PV = "0.9.0"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
+SRC_URI[sha256sum] = "3412f7da2642a2a1afc3432b770c496eb320e787bbb550aebc7f368c90f2e15f"
+PV = "0.9.3"
 
 FILES_${PN} += " \
     ${datadir}/metainfo \

recipes-musicians/rncbc/qsampler.bb

@@ -11,23 +11,11 @@ DEPENDS += " \
     libgig \
 "
 
-# autotools-brokensep must be after qmake5_base!
-inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation mime mime-xdg
+inherit cmake_qt5 gtk-icon-cache qt5-translation mime mime-xdg
 
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-"
-SRC_URI[sha256sum] = "5555fe57be6188bd27d0dd40f4c38a0415e33dc5f2e75737c9401bea4ee15e9c"
-PV = "0.9.0"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
+SRC_URI[sha256sum] = "cd772425ad18a9ee531e64fa7abc8492636fdc7c51f1d78f037a18fdf8008ed5"
+PV = "0.9.3"
 
 FILES_${PN} += " \
     ${datadir}/metainfo \

recipes-musicians/rncbc/qsynth.bb

@@ -11,23 +11,12 @@ DEPENDS += " \
     fluidsynth \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache features_check
+inherit cmake_qt5 pkgconfig gtk-icon-cache features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-"
-SRC_URI[sha256sum] = "72ab545c39b7ca518be3dfaaee61c8ce88b20d4c34dff946898a8ca7d8e85ae4"
-PV = "0.9.0"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
+SRC_URI[sha256sum] = "0cd6c09d4f7f02b0b487b4a01caab7965c9ca86c75945cf47659746cc3b75b29"
+PV = "0.9.3"
 
 FILES_${PN} += "${datadir}/metainfo"

recipes-musicians/rncbc/qtractor.bb

@@ -16,30 +16,18 @@ DEPENDS += " \
     aubio \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime mime-xdg qt5-translation
+inherit cmake_qt5 gtk-icon-cache mime mime-xdg qt5-translation
 
 SRC_URI = " \
     git://github.com/rncbc//qtractor.git;branch=midiimportx \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-    \
-    file://0001-do-nor-try-run-for-float-sse-detection.patch \
-    file://0002-do-nor-try-run-for-suil-libs-detection.patch \
     file://0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \
     \
     file://Qtractor.conf \
 "
-SRCREV = "bc76b761c96945213d1051a63e406ebb5e1e03d0"
-PV = "0.9.19+git${SRCPV}"
+SRCREV = "628d95225c39235a32b9fc019991a8a05d2bad70"
+PV = "0.9.22+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
-
 do_install_append() {
     install -d ${D}/${sysconfdir}/skel/.config/rncbc.org
     install -m 0644 ${WORKDIR}/Qtractor.conf ${D}/${sysconfdir}/skel/.config/rncbc.org/

recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch

@@ -1,57 +0,0 @@
-From 6fa680366dcfb6aa5e9121ed0759a81f9d6f6393 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 27 Nov 2016 21:52:14 +0100
-Subject: [PATCH] do nor try run for float / sse detection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e33d2cb2..a582410f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -606,13 +606,7 @@ fi
- AC_SUBST(ac_lrelease)
- 
- 
--# Check for IEEE 32bit float optimizations.
--AC_CHECK_SIZEOF(float)
--AC_CACHE_CHECK([for IEEE 32bit float optimizations],
--   ac_cv_float32, [
--   AS_IF([test "$ac_cv_sizeof_float" = 4], [ac_cv_float32="yes"], [ac_cv_float32="no"])
--])
--ac_float32=$ac_cv_float32
-+ac_float32=yes
- if test "x$ac_float32" = "xyes"; then
-    AC_DEFINE(CONFIG_FLOAT32, 1, [Define if IEEE 32bit float optimizations are enabled.])
- fi
-@@ -626,19 +620,13 @@ if test "x$ac_sse" = "xyes"; then
-    CPPFLAGS="$ac_sse_cflags $CPPFLAGS"
-    AC_CACHE_CHECK([for SSE optimization],
-       ac_cv_sse, [
--      AC_TRY_RUN([
-+      AC_TRY_COMPILE([
-          #include <xmmintrin.h>
-          #if !defined(__SSE__)
-          #error SSE optimization disabled.
-          #endif
-          int main() {
--            unsigned int a, b, c, d;
--            __asm__ __volatile__ (
--              "movl %%ebx, %%esi\n\t" \
--              "cpuid\n\t" \
--              "xchgl %%ebx, %%esi" \
--              : "=a" (a), "=S" (b), "=c" (c), "=d" (d) : "0" (1));
--            return ((d & (1 << 25)) ? 0 : 1);
-+            return 0;
-          }
-       ], ac_cv_sse="yes", ac_cv_sse="no")
-    ])
--- 
-2.21.1
-

recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch

@@ -1,55 +0,0 @@
-From a32a7af99c5f241a08840ce0775c9aaa0c37a792 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 19 Jan 2019 18:55:17 +0100
-Subject: [PATCH] do nor try run for suil libs feature detection
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- configure.ac | 24 ++----------------------
- 1 file changed, 2 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a582410f..0dbfc4f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1339,17 +1339,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then
- fi
- 
- if test "x$ac_libsuil" = "xyes"; then
--   AC_CACHE_CHECK([for LV2 UI GTK2 support (libsuil_gtk2_in_qt5)],
--      ac_cv_libsuil_gtk2_in_qt5, [
--      AC_TRY_RUN([
--         #include <suil/suil.h>
--         #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
--         #ifndef LV2_UI__Qt5UI
--         #define LV2_UI__Qt5UI LV2_UI_PREFIX "Qt5UI"
--         #endif
--         int main() { return !suil_ui_supported(LV2_UI__Qt5UI, LV2_UI__GtkUI); }
--      ], ac_cv_libsuil_gtk2_in_qt5="yes", ac_cv_libsuil_gtk2_in_qt5="no")
--   ])
-+   ac_cv_libsuil_gtk2_in_qt5="yes"
-    if test "x$ac_cv_libsuil_gtk2_in_qt5" = "xyes"; then
-       AC_DEFINE(CONFIG_LIBSUIL_GTK2_IN_QT5, 1, [Define if libsuil_gtk2_in_qt5 is available.])
-    #  ac_lv2_ui_gtk2="no"
-@@ -1367,17 +1357,7 @@ else
- fi
- 
- if test "x$ac_libsuil" = "xyes"; then
--   AC_CACHE_CHECK([for LV2 UI X11 support (libsuil_x11_in_qt5)],
--      ac_cv_libsuil_x11_in_qt5, [
--      AC_TRY_RUN([
--         #include <suil/suil.h>
--         #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
--         #ifndef LV2_UI__Qt5UI
--         #define LV2_UI__Qt5UI LV2_UI_PREFIX "Qt5UI"
--         #endif
--         int main() { return !suil_ui_supported(LV2_UI__Qt5UI, LV2_UI__X11UI); }
--      ], ac_cv_libsuil_x11_in_qt5="yes", ac_cv_libsuil_x11_in_qt5="no")
--   ])
-+   ac_cv_libsuil_x11_in_qt5="yes"
-    if test "x$ac_cv_libsuil_x11_in_qt5" = "xyes"; then
-       AC_DEFINE(CONFIG_LIBSUIL_X11_IN_QT5, 1, [Define if libsuil_x11_in_qt5 is available.])
-    #  ac_lv2_ui_x11="no"
--- 
-2.21.1
-

recipes-musicians/rncbc/samplv1.bb

@@ -11,23 +11,14 @@ DEPENDS += " \
     liblo \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
+inherit cmake_qt5 gtk-icon-cache mime
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-    file://0002-Avoid-stripping.patch \
-"
-PV = "0.9.19"
-SRC_URI[sha256sum] = "64f35209853b683a148e5135cabe32756944833a2a6cecb199e16ea7079a9bbb"
-
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
+    file://0002-Avoid-stripping-CMake.patch \
 "
+PV = "0.9.22"
+SRC_URI[sha256sum] = "2fdd96d6fe9d7b4c3780bfb02fb4b0933a4d2a4eb940eabea252f0d23eb752a5"
 
 FILES_${PN} += " \
     ${datadir}/appdata \

recipes-musicians/rncbc/synthv1.bb

@@ -5,40 +5,30 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS += " \
     qtbase-native \
+    qttools-native \
     qtbase \
     jack \
     lv2 \
     liblo \
 "
 
-inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime
+inherit cmake_qt5 gtk-icon-cache mime
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+    file://0002-Avoid-stripping-CMake.patch \
     ${SOURCEFORGE_MIRROR}/project/autostatic/autostatic-synthv1-presets/autostatic-synthv1-presets1.tar.gz;name=autostatic-synthv1-presets1 \
     http://linuxsynths.com/Synthv1PatchesDemos/Synthv1Patches06.tar.gz;name=linuxsynths-synthv1-presets;subdir=linuxsynths-synthv1-presets \
-    file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \
-    file://0002-Avoid-stripping.patch \
     \
     file://synthv1.conf \
 "
-PV = "0.9.19"
-SRC_URI[sha256sum] = "b61adf4a5a827386824ec03cfc41120565d63047560414df01b606b015fc519f"
+PV = "0.9.22"
+SRC_URI[sha256sum] = "319932091e748a580bfae4f670726acbec35da59ec10964fb2d8cf099d5ebd32"
 
-SRC_URI[autostatic-synthv1-presets1.md5sum] = "02210e5576310554cfe316fb72e88b74"
 SRC_URI[autostatic-synthv1-presets1.sha256sum] = "587ac8cb4cb645fc71603d1b4b351b24f3e4d9f15a53aca59c0f30cc9f66e253"
 
-SRC_URI[linuxsynths-synthv1-presets.md5sum] = "88997ed87dd6adf929668751d11d91d2"
 SRC_URI[linuxsynths-synthv1-presets.sha256sum] = "cd444ccecafa9c03b890b3662455e3c1f36e18cd8f2f9b5c269bf1e4eb6cfa72"
 
-EXTRA_OECONF = " \
-    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
-    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
-    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
-    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
-    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
-"
-
 do_install_append() {
     install -d ${D}/${datadir}/${BPN}/presets
     cp ${WORKDIR}/autostatic-synthv1-presets1/*.synthv1 ${D}/${datadir}/${BPN}/presets

recipes-musicians/rubberband/rubberband_1.9.0.bb

@@ -1,37 +0,0 @@
-SUMMARY = "Rubber Band Library library for audio time-stretching and pitch-shifting"
-HOMEPAGE = "http://breakfastquay.com/rubberband/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=28f6289fba0406b8f491e9b2d5767488"
-
-inherit autotools-brokensep pkgconfig
-
-DEPENDS += " \
-    fftw \
-    libsamplerate0 \
-    vamp-plugin-sdk \
-    ladspa-sdk \
-"
-
-# fftwf is neon accelerated -> force SINGLE precision
-SINGLEPATCH = "${@bb.utils.contains('TUNE_FEATURES', 'neon', 'file://0001-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch', '', d)}"
-
-SRC_URI = " \
-    https://breakfastquay.com/files/releases/${BPN}-${PV}.tar.bz2 \
-    ${SINGLEPATCH} \
-"
-SRC_URI[sha256sum] = "4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026"
-
-EXTRA_OEMAKE += " \
-    INSTALL_LIBDIR=${libdir} \
-    INSTALL_VAMPDIR=${libdir}/vamp \
-    INSTALL_LADSPADIR=${libdir}/ladspa \
-    INSTALL_PKGDIR=${libdir}/pkgconfig \
-"
-
-CPPFLAGS += "-ftree-vectorize -DPROCESS_SAMPLE_TYPE=float"
-
-FILES_${PN} += " \
-    ${datadir}/ladspa \
-    ${libdir}/ladspa \
-    ${libdir}/vamp \
-"

recipes-musicians/rubberband/rubberband_1.9.1.bb

@@ -0,0 +1,24 @@
+SUMMARY = "Rubber Band Library library for audio time-stretching and pitch-shifting"
+HOMEPAGE = "http://breakfastquay.com/rubberband/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=28f6289fba0406b8f491e9b2d5767488"
+
+inherit meson
+
+DEPENDS += " \
+    fftw \
+    libsamplerate0 \
+    vamp-plugin-sdk \
+    ladspa-sdk \
+"
+
+SRC_URI = "https://breakfastquay.com/files/releases/${BPN}-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "fc474878f6823c27ef5df1f9616a8c8b6a4c01346132ea7d1498fe5245e549e3"
+
+EXTRA_OEMESON = "-Dfft=fftw"
+
+FILES_${PN} += " \
+    ${datadir}/ladspa \
+    ${libdir}/ladspa \
+    ${libdir}/vamp \
+"

recipes-musicians/sjaehn/bchoppr.bb

@@ -14,9 +14,9 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/sjaehn/BChoppr.git"
-SRCREV = "7fb0af3aa84bbcbbf67957a7292f1791c84e0ffc"
+SRCREV = "98da08ea7be3bc439c3773c5e0653d37cdbeb19d"
 S = "${WORKDIR}/git"
-PV = "1.8.0"
+PV = "1.10.8"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bjumblr.bb

@@ -14,10 +14,13 @@ DEPENDS += " \
     lv2 \
 "
 
-SRC_URI = "git://github.com/sjaehn/BJumblr.git"
-SRCREV = "fd90faed2dc511fdacdf2dd61952dbda5d87dc2a"
+SRC_URI = " \
+    git://github.com/sjaehn/BJumblr.git \
+    file://0001-Allow-parallel-build.patch \
+"
+SRCREV = "bf1a0a076c15a641f6d213afcb0f4b9245c87d18"
 S = "${WORKDIR}/git"
-PV = "1.4.2"
+PV = "1.6.6"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bjumblr/0001-Allow-parallel-build.patch

@@ -0,0 +1,25 @@
+From f0e8de8bd963d8766d6ed53d20b1575dad7bc9f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 30 Apr 2021 21:55:54 +0200
+Subject: [PATCH] Allow parallel build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 6c026f7..0c094ad 100644
+--- a/makefile
++++ b/makefile
+@@ -170,4 +170,3 @@ clean:
+ 
+ .PHONY: all install install-strip uninstall clean
+ 
+-.NOTPARALLEL:
+-- 
+2.30.2
+

recipes-musicians/sjaehn/boops.bb

@@ -15,9 +15,10 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/sjaehn/BOops.git"
-SRCREV = "4a7b422f8afdb282301f11e046d27a625fb4b849"
+SRCREV = "eb705aacb57724efa13d6571cac6804a73810ab9"
 S = "${WORKDIR}/git"
-PV = "1.2.0"
+PE = "1"
+PV = "1.6.0"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bschaffl.bb

@@ -15,9 +15,9 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/sjaehn/BSchaffl.git"
-SRCREV = "0c0658c783b135d08f4ecdf76c8d9c9fb536911c"
+SRCREV = "cf507ccb6c733e7acb24886d359a244f348ba703"
 S = "${WORKDIR}/git"
-PV = "1.2.0"
+PV = "1.4.6"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bsequencer.bb

@@ -14,9 +14,9 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/sjaehn/BSEQuencer.git"
-SRCREV = "3cb8e1cf83ba3f4dd6e6b281237952b6e402f7a6"
+SRCREV = "56932f930628ff8b316305382dfc2772b9e6a0ef"
 S = "${WORKDIR}/git"
-PV = "1.8.4"
+PV = "1.8.8"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bshapr.bb

@@ -14,9 +14,9 @@ DEPENDS += " \
 "
 
 SRC_URI = "git://github.com/sjaehn/BShapr.git"
-SRCREV = "dbb6e2e2429e1ea3a2dc31a46951289347216681"
+SRCREV = "38f4f68fda1b1bb26f50040ea5f18a4f8970cf91"
 S = "${WORKDIR}/git"
-PV = "0.9"
+PV = "0.13"
 
 do_install() {
     DESTDIR=${D} PREFIX=${prefix} oe_runmake install

recipes-musicians/sjaehn/bslizr.bb

@@ -0,0 +1,25 @@
+SUMMARY = "Sequenced audio slicing effect LV2 plugin"
+HOMEPAGE = "https://github.com/sjaehn/BSlizr"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit pkgconfig features_check
+
+DEPENDS += " \
+    virtual/libx11 \
+    cairo \
+    lv2 \
+"
+
+SRC_URI = "git://github.com/sjaehn/BSlizr.git"
+SRCREV = "8622533bbbd8eed3c9fb10e216a72591846d3807"
+S = "${WORKDIR}/git"
+PV = "1.2.16"
+
+do_install() {
+    DESTDIR=${D} PREFIX=${prefix} oe_runmake install
+}
+
+FILES_${PN} += "${libdir}/lv2"

recipes-musicians/sjaehn/bspacr.bb

@@ -0,0 +1,25 @@
+SUMMARY = "No loss LV2 sound effect plugin"
+HOMEPAGE = "https://github.com/sjaehn/BSpacr"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+inherit pkgconfig features_check
+
+DEPENDS += " \
+    virtual/libx11 \
+    cairo \
+    lv2 \
+"
+
+SRC_URI = "git://github.com/sjaehn/BSpacr.git;branch=main"
+SRCREV = "61dfb32bb669067a7c96fda9224b6263ef09ba6c"
+S = "${WORKDIR}/git"
+PV = "1.2.0"
+
+do_install() {
+    DESTDIR=${D} PREFIX=${prefix} oe_runmake install
+}
+
+FILES_${PN} += "${libdir}/lv2"

recipes-musicians/smbolton/hexter.bb

@@ -17,7 +17,8 @@ SRC_URI = " \
     file://hexter.desktop \
     file://hexter.png \
 "
-SRCREV = "737dbb04c407184fae0e203c1d73be8ad3fd55ba"
+SRCREV = "1cf1bfea5962f7c9726e0cf809b762b3b2655225"
+PV = "1.1.1"
 S = "${WORKDIR}/git"
 
 do_compile_append() {

recipes-musicians/soundfont-collection/soundfont-collection_0.0.3.bb

@@ -83,7 +83,7 @@ SRC_URI[rabs-new-construction-kit.sha256sum] = "b3fce24ba733c78afb9bbf12e973d2d8
 SRC_URI[rabs-organs.sha256sum] = "14765b576626e440caf054c7b3a502b03cd95b451d4e8bf53f623705de8a5174"
 SRC_URI[rabs-stratocaster.sha256sum] = "1966c40643b0de18f825fb26f10fdf5aabb298b69268be43d0e5b5c434fd6621"
 SRC_URI[rabs-wwgtr.sha256sum] = "a17be1dff75bf76af0ac78e9fec75313a7375ac1e388709546c4e732c1ca1652"
-SRC_URI[rabs-meta.sha256sum] = "74ff57376b6ce383e0fe3a0b6c391774a7d926585112f7a8650b5bef55bf169a"
+SRC_URI[rabs-meta.sha256sum] = "d3b10719b9bf41f598f7cd9d555c6d4852e0eb3c734ef9694fba0451d091e778"
 
 
 do_unpack[depends] += "p7zip-native:do_populate_sysroot"

recipes-musicians/supercollider/supercollider.bb

@@ -3,9 +3,9 @@ HOMEPAGE = "http://supercollider.github.io/"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "gitsm://github.com/supercollider/supercollider.git"
+SRC_URI = "gitsm://github.com/supercollider/supercollider.git;branch=develop"
 SRCREV = "206f24d865efa37264a0b42594f536ed834c1493"
-PV = "3.11.1"
+PV = "3.11.2"
 S = "${WORKDIR}/git"
 
 inherit cmake_qt5 features_check mime mime-xdg

recipes-musicians/surge/surge.bb

@@ -19,13 +19,13 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = " \
     gitsm://github.com/surge-synthesizer/surge.git;branch=main \
     file://0001-arm-native.cmake-adjust-to-oe.patch \
-    file://0002-CMakeLists.txt-adjust-python-python3.patch \
-    file://0003-package-vst3.sh-Do-not-try-to-strip-antive.patch \
-    file://0004-Do-not-generate-manifest-it-won-t-work-cross.patch \
+    file://0002-package-vst3.sh-Do-not-try-to-strip-antive.patch \
+    file://0003-Do-not-generate-manifest-it-won-t-work-cross.patch \
+    file://0004-emit-vector-piggy-adjust-python-python3.patch \
 "
-SRCREV = "5270cfb97a51570f81f29c1e641c0c6def901448"
+SRCREV = "91069f8d0c0269e962fa3b5f932b4511aa07e451"
 S = "${WORKDIR}/git"
-PV = "1.7.1"
+PV = "1.9.0"
 
 EXTRA_OECMAKE_append_arm = " -DARM_NATIVE=native"
 EXTRA_OECMAKE_append_aarch64 = " -DARM_NATIVE=native"

recipes-musicians/surge/surge/0001-arm-native.cmake-adjust-to-oe.patch

@@ -1,6 +1,6 @@
 From 776564ce4049f44bcbe9804e2bb3c81b154f9731 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 5 Dec 2020 22:25:57 +0100
+Date: Sun, 7 Feb 2021 20:23:03 +0100
 Subject: [PATCH] arm-native.cmake: adjust to oe
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,12 +14,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/cmake/arm-native.cmake b/cmake/arm-native.cmake
-index de92a619..8b1e07c6 100644
+index 9d0b7044..c4073fba 100644
 --- a/cmake/arm-native.cmake
 +++ b/cmake/arm-native.cmake
 @@ -1,7 +1,5 @@
  set( LINUX_ON_ARM True )
- set(LINUX_ON_ARM_COMPILE_OPTIONS
+ set(FLAGS
 -  -march=native
 -  -mcpu=native
    -Wno-psabi

recipes-musicians/surge/surge/0002-CMakeLists.txt-adjust-python-python3.patch

@@ -1,31 +0,0 @@
-From c6e21a51788f9777e8acd00a2fd1936392380940 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 5 Dec 2020 22:31:16 +0100
-Subject: [PATCH] CMakeLists.txt: adjust python -> python3
-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 872ff0ed..d75e30a1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -379,7 +379,7 @@ elseif( UNIX AND NOT APPLE )
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-     DEPENDS ${PIGGY_INPUTS}
-     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/lintemp
--    COMMAND python ${CMAKE_SOURCE_DIR}/scripts/linux/emit-vector-piggy.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/lintemp
-+    COMMAND python3 ${CMAKE_SOURCE_DIR}/scripts/linux/emit-vector-piggy.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/lintemp
-     )
-   
-   if( LINUX_ON_ARM )
--- 
-2.26.2
-

recipes-musicians/surge/surge/0002-package-vst3.sh-Do-not-try-to-strip-antive.patch

@@ -1,6 +1,6 @@
 From f8586a2671012c2392b78361b96d17cdd9cfbd44 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 5 Dec 2020 22:43:17 +0100
+Date: Sun, 25 Apr 2021 23:05:40 +0200
 Subject: [PATCH] package-vst3.sh: Do not try to strip (antive)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,19 +10,23 @@ Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- scripts/linux/package-vst3.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ scripts/linux/package-vst3.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/scripts/linux/package-vst3.sh b/scripts/linux/package-vst3.sh
-index b91adc74..409ebf8e 100755
+index 2f112814..63d2f520 100755
 --- a/scripts/linux/package-vst3.sh
 +++ b/scripts/linux/package-vst3.sh
-@@ -17,4 +17,4 @@ fi
- VST_SO_DIR="$BUNDLE_DIR/Contents/${ARCH}-linux"
- mkdir -p "$VST_SO_DIR"
+@@ -20,8 +20,7 @@ mkdir -p "$VST_SO_DIR"
  cp $1 "$VST_SO_DIR"/Surge.so
--strip -s "$VST_SO_DIR"/Surge.so
-+
+ if [[ -z ${NOSTRIP} ]]; 
+ then
+-  echo "  Stripping ${VST_SO_DIR}/Surge.so"
+-  strip -s "$VST_SO_DIR"/Surge.so
++  echo "  Not stripping in oe-builds"
+ else
+   echo "  Skipping strip phase for debug build"
+ fi
 -- 
-2.26.2
+2.30.2
 

recipes-musicians/surge/surge/0003-Do-not-generate-manifest-it-won-t-work-cross.patch

@@ -1,7 +1,7 @@
 From 9cee76f8433b1dbc024d16212c9d566df04aaf58 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 5 Dec 2020 23:16:35 +0100
-Subject: [PATCH 2/2] Do not generate manifest - it won't work cross
+Date: Sun, 25 Apr 2021 23:20:06 +0200
+Subject: [PATCH] Do not generate manifest - it won't work cross
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -17,18 +17,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d75e30a1..318e59fe 100644
+index 4ad951dd..545b6ead 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -878,7 +878,7 @@ if( BUILD_LV2 )
-       COMMAND echo "Packaging up LV2 component"
-       COMMAND ${CMAKE_COMMAND} -E make_directory ${SURGE_PRODUCT_DIR}/Surge.lv2
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/libsurge-lv2-dll.so ${SURGE_PRODUCT_DIR}/Surge.lv2/Surge.so
--      COMMAND python scripts/linux/generate-lv2-ttl.py ${SURGE_PRODUCT_DIR}/Surge.lv2/Surge.so
+@@ -1012,7 +1012,7 @@ if( BUILD_LV2 )
+       COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:surge-lv2-dll> ${SURGE_PRODUCT_DIR}/Surge.lv2/Surge.so
+       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/lintemp
+       COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/resources/data ${CMAKE_BINARY_DIR}/lintemp/surge
+-      COMMAND XDG_DATA_HOME=${CMAKE_BINARY_DIR}/lintemp scripts/linux/generate-lv2-ttl ${SURGE_PRODUCT_DIR}/Surge.lv2/Surge.so
 +      COMMAND echo ${SURGE_PRODUCT_DIR}/Surge.lv2/Surge.so >> LV2_PLUGIN_INFO_FILE
        )
    endif()
  
 -- 
-2.26.2
+2.30.2
 

recipes-musicians/surge/surge/0004-emit-vector-piggy-adjust-python-python3.patch

@@ -0,0 +1,28 @@
+From aefd7ccb614ceb55d3b6369daf2f53c27d7599cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 7 Feb 2021 20:42:45 +0100
+Subject: [PATCH] emit-vector-piggy: adjust python -> python3
+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>
+---
+ scripts/linux/emit-vector-piggy | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/linux/emit-vector-piggy b/scripts/linux/emit-vector-piggy
+index 762b3fe4..2d434076 100755
+--- a/scripts/linux/emit-vector-piggy
++++ b/scripts/linux/emit-vector-piggy
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # This python script auto-generates the files
+ #
+-- 
+2.26.2
+

recipes-musicians/x42/avldrums.lv2.bb

@@ -15,8 +15,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/avldrums.lv2.git"
-SRCREV = "c1e168df0830a6b84295ebdd30cd48726a791103"
-PV = "0.4.1"
+SRCREV = "501af33133e49ad4869b2ee9d538607fa790f5a7"
+PV = "0.4.2"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/darc.lv2.bb

@@ -15,8 +15,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/darc.lv2.git"
-SRCREV = "9664de8016069409e0a4a8ec8ab6b75a7786df72"
-PV = "0.5.1"
+SRCREV = "4bddab4c184af4695fb3248796e77fb5fb7e54b5"
+PV = "0.5.4"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/dpl.lv2.bb

@@ -14,8 +14,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/dpl.lv2.git"
-SRCREV = "302482fe50f1384e6c5bcae007f5642742c95690"
-PV = "0.4.0"
+SRCREV = "67593cd22f531879f9461ce022cb564b0d3ab173"
+PV = "0.5.1"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/fat1.lv2.bb

@@ -14,8 +14,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/fat1.lv2.git"
-SRCREV = "825aef0f16256c7dd48fb4ee054ce1b01cfa8d52"
-PV = "0.6.2"
+SRCREV = "49209f070e94b12c2948be425c58f414369a200f"
+PV = "0.6.5"
 S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"

recipes-musicians/x42/fil4.lv2.bb

@@ -17,8 +17,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/fil4.lv2.git"
-SRCREV = "066b648e56bf04c7fd94d5c5c5ef25e47e147b4e"
-PV = "0.7.1"
+SRCREV = "98191b28c2ba193c6f12f4962dc5963d647941b7"
+PV = "0.7.4"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/meters.lv2.bb

@@ -17,8 +17,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/meters.lv2.git"
-SRCREV = "3a74e5661d346c86d99251db16a6c1f3929fde08"
-PV = "0.9.15"
+SRCREV = "7416ef980c2e7e0fb484460ba40c05ca37a22cde"
+PV = "0.9.18"
 S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"

recipes-musicians/x42/mixtri.lv2.bb

@@ -14,8 +14,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/mixtri.lv2.git;protocol=https"
-SRCREV = "4a1abfdfc3f00160c3cefdce490ad35b69253f9a"
-PV = "0.4.0"
+SRCREV = "4bfbeba3f0146b1cc3e87f3fd0a8917e55452bf1"
+PV = "0.4.3"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/sisco.lv2.bb

@@ -13,8 +13,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/sisco.lv2.git"
-SRCREV = "ce8139f989a182f4968911494a1c72940f9f53ee"
-PV = "0.9.0"
+SRCREV = "7db71571db1c6eea3470bc166658c2c03b6036b4"
+PV = "0.9.3"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/x42/tuna.lv2.bb

@@ -17,8 +17,8 @@ DEPENDS += " \
 "
 
 SRC_URI = "gitsm://github.com/x42/tuna.lv2.git"
-SRCREV = "a1499bce55e138dfabe8c4ecf804b6ff34d18f09"
-PV = "0.5.2"
+SRCREV = "624075b2567f4558923edf493f2019e37f46c9f5"
+PV = "0.5.5"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \

recipes-musicians/yoshimi/yoshimi.bb

@@ -21,9 +21,9 @@ DEPENDS += " \
     libxft \
 "
 
-PV = "1.7.3"
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/1.7/${BPN}-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "9cb9537f15962ac2acbc0612c5aa631010c40680e31ba9a4a3a23e57f114abc7"
+PV = "2.0.2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/2.0/${BPN}-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "0b5149dab7b2da15757be9f56384344868774edfee1736d80bd4c6def6c2853e"
 
 OECMAKE_SOURCEPATH = "${S}/src"
 

recipes-musicians/zyn/mruby-zest-native.bb

@@ -6,9 +6,7 @@ DEPENDS += " \
     libuv-native \
 "
 
-SRC_URI += "file://0004-Native-Do-not-build-X11-dependent-zest-libzest.so.patch"
-
 do_install() {
     install -d ${D}${bindir}
-    install -m 755 ${B}/mruby/build/host/bin/mrbc ${D}${bindir}/mrbc-zest
+    install -m 755 ${B}/mruby/build/host-debug/bin/mrbc ${D}${bindir}/mrbc-zest
 }