diff --git a/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch b/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch deleted file mode 100644 index 1062fdc..0000000 --- a/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 - ---- - 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 diff --git a/recipes-musicians/rncbc/files/0002-Avoid-stripping.patch b/recipes-musicians/rncbc/files/0002-Avoid-stripping.patch deleted file mode 100644 index 1e3663e..0000000 --- a/recipes-musicians/rncbc/files/0002-Avoid-stripping.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4700026b6c22da972d4159a9116221b3feecd314 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - diff --git a/recipes-musicians/rncbc/qtractor.bb b/recipes-musicians/rncbc/qtractor.bb index 73f51ef..189bc56 100644 --- a/recipes-musicians/rncbc/qtractor.bb +++ b/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 = "f03b649c87a1af7a4498fa8205157c16c567937c" -PV = "0.9.21+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/ diff --git a/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch b/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch deleted file mode 100644 index f004bd9..0000000 --- a/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6fa680366dcfb6aa5e9121ed0759a81f9d6f6393 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 -@@ -645,13 +645,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 -@@ -666,19 +660,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 - #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", ac_cv_sse=cross) - ]) diff --git a/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch b/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch deleted file mode 100644 index 2ecd1bf..0000000 --- a/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a32a7af99c5f241a08840ce0775c9aaa0c37a792 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 -- #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 -- #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 -