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

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

recipes-musicians/rncbc/drumkv1.bb

@@ -12,27 +12,19 @@ DEPENDS += " \
     hydrogen \
 "
 
-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 \
     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.21"
 SRC_URI[sha256sum] = "35952d6ed82cde9c0d8b516addd2e2f376b94b6d777f2b2a6ffd3978b49da7fa"
 
 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/0002-Avoid-stripping-CMake.patch

@@ -0,0 +1,33 @@
+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 | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 31ce7b8..0cd903a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -173,12 +173,6 @@ if (CONFIG_LIBLO)
+ endif ()
+ 
+ 
+-if (UNIX AND NOT APPLE AND NOT CONFIG_DEBUG)
+-  add_custom_command(TARGET ${PROJECT_NAME}_lv2  POST_BUILD
+-    COMMAND strip lib${PROJECT_NAME}_lv2.so)
+-  add_custom_command(TARGET ${PROJECT_NAME}_jack POST_BUILD
+-    COMMAND strip ${PROJECT_NAME}_jack)
+-endif ()
+ 
+ 
+ if (UNIX AND NOT APPLE)
+-- 
+2.30.2
+