From 1579bc7b7f9dc14e786b50fade9dd17e85c85f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 24 Apr 2021 22:32:04 +0200
Subject: [PATCH] drumkv1: Build with 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>
---
 recipes-musicians/rncbc/drumkv1.bb            | 13 ++------
 .../files/0002-Avoid-stripping-CMake.patch    | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch

diff --git a/recipes-musicians/rncbc/drumkv1.bb b/recipes-musicians/rncbc/drumkv1.bb
index 0c545be..412df9b 100644
--- a/recipes-musicians/rncbc/drumkv1.bb
+++ b/recipes-musicians/rncbc/drumkv1.bb
@@ -12,27 +12,18 @@ 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 \
 "
 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
diff --git a/recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch b/recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch
new file mode 100644
index 0000000..1f8d660
--- /dev/null
+++ b/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
+