diff --git a/recipes-musicians/rncbc/drumkv1.bb b/recipes-musicians/rncbc/drumkv1.bb index e76ab05..2ae92de 100644 --- a/recipes-musicians/rncbc/drumkv1.bb +++ b/recipes-musicians/rncbc/drumkv1.bb @@ -17,12 +17,12 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \ - file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://0002-Remove-extra-rpath.patch \ " -PV = "0.9.9" -SRC_URI[md5sum] = "2a2c6287685a3f9f2c317e597c0a9681" -SRC_URI[sha256sum] = "03a59ce0785dd4a763747bea8dbdef6ba8b7fb2bc878fae3718c3fd95c124a0b" +PV = "0.9.10" +SRC_URI[md5sum] = "17012c1f1e0d6b747f7d707b8b73c525" +SRC_URI[sha256sum] = "765c6260d3e2e1f916d9023de548bf55f181fa658eb9639eb2b40d81b7c90840" SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e" diff --git a/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch b/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch index 3931a1b..e6de8ca 100644 --- a/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch +++ b/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch @@ -13,11 +13,10 @@ Signed-off-by: Andreas Müller src/src_jack.pro | 2 +- src/src_lv2.pro | 2 +- src/src_lv2ui.pro | 2 +- - src/src_ui.pro | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src_jack.pro b/src/src_jack.pro -index 4aa3349..d9d4415 100644 +index 25d3aed..8034b8b 100644 --- a/src/src_jack.pro +++ b/src/src_jack.pro @@ -75,7 +75,7 @@ unix { @@ -30,7 +29,7 @@ index 4aa3349..d9d4415 100644 QT += widgets xml diff --git a/src/src_lv2.pro b/src/src_lv2.pro -index 069e1ee..6eb8485 100644 +index b9e5565..8d28f61 100644 --- a/src/src_lv2.pro +++ b/src/src_lv2.pro @@ -59,7 +59,7 @@ unix { @@ -43,28 +42,18 @@ index 069e1ee..6eb8485 100644 QT -= gui diff --git a/src/src_lv2ui.pro b/src/src_lv2ui.pro -index 50f5798..7b0bad4 100644 +index 078d180..57c128f 100644 --- a/src/src_lv2ui.pro +++ b/src/src_lv2ui.pro @@ -59,7 +59,7 @@ unix { QMAKE_CLEAN += $${TARGET_LV2UI}.so -- LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2 +- LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR} + LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 } QT += widgets xml -diff --git a/src/src_ui.pro b/src/src_ui.pro -index 081e3af..132d5b4 100644 ---- a/src/src_ui.pro -+++ b/src/src_ui.pro -@@ -69,7 +69,7 @@ unix { - - target.path = $${LIBDIR} - -- LIBS += -l$${NAME} -Wl,-rpath,$${LIBDIR} -+ LIBS += -l$${NAME} - } - - QT += widgets xml +-- +2.21.0 + diff --git a/recipes-musicians/rncbc/files/0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/files/0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 0000000..6579a9d --- /dev/null +++ b/recipes-musicians/rncbc/files/0002-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch @@ -0,0 +1,107 @@ +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, 15 insertions(+), 28 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a6156ef..f99502d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -266,23 +266,9 @@ 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 +- +-# 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 +-if test $ac_qt_version_major -ne 5; then +- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [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"]) + + if test "x$ac_qmake" = "xno"; then + AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)]) +@@ -297,13 +283,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], [ +@@ -339,14 +318,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 +@@ -354,7 +337,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 + AC_PATH_TOOL(ac_cv_lupdate, lupdate-qt5, [no], $ac_path) + if test "x$ac_cv_lupdate" = "xno"; then +@@ -366,7 +351,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 + AC_PATH_TOOL(ac_cv_lrelease, lrelease-qt5, [no], $ac_path) + if test "x$ac_cv_lrelease" = "xno"; then +-- +2.21.0 +