From 8122ebfb5b8564ef7f3f4e8e56bc22ea0cdf06a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Oct 2020 22:30:56 +0100 Subject: [PATCH] drumkv1 padthv1 samplv1 synthv1: upgrade 0.9.17 -> 0.9.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/rncbc/drumkv1.bb | 6 +- ...-tools-by-configure-options-auto-qt6.patch | 108 ++++++++++++++++++ recipes-musicians/rncbc/padthv1.bb | 6 +- recipes-musicians/rncbc/samplv1.bb | 6 +- recipes-musicians/rncbc/synthv1.bb | 6 +- 5 files changed, 120 insertions(+), 12 deletions(-) create mode 100644 recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch diff --git a/recipes-musicians/rncbc/drumkv1.bb b/recipes-musicians/rncbc/drumkv1.bb index a4eb93a..29b0a9d 100644 --- a/recipes-musicians/rncbc/drumkv1.bb +++ b/recipes-musicians/rncbc/drumkv1.bb @@ -17,11 +17,11 @@ 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-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ file://0002-Avoid-stripping.patch \ " -PV = "0.9.17" -SRC_URI[sha256sum] = "a2071c7335ebd819a5dbe407dfeab0a4fa67d3087e1b14753ac64ade0af30ea5" +PV = "0.9.18" +SRC_URI[sha256sum] = "25db8b111d3326340041245fdd4d5385fec9443cf5232573dc3774accf57f3af" SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e" 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 new file mode 100644 index 0000000..1062fdc --- /dev/null +++ b/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch @@ -0,0 +1,108 @@ +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/padthv1.bb b/recipes-musicians/rncbc/padthv1.bb index 4d02ac1..d696467 100644 --- a/recipes-musicians/rncbc/padthv1.bb +++ b/recipes-musicians/rncbc/padthv1.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 \ 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.patch \ + file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ file://0002-Avoid-stripping.patch \ file://padthv1.conf \ " -PV = "0.9.17" -SRC_URI[sha256sum] = "633555ac1a79fdcbb5c679d84c85816cff131e7a98c617b2b35a3fc61d9a0e25" +PV = "0.9.18" +SRC_URI[sha256sum] = "e5ba942d75233f7dc540a1655e2d1d837ddbeda079907c795c59c6b1f2cd59cd" SRC_URI[linuxsynths-padthv1-presets.md5sum] = "951484ad2fe404d233a704d444147827" SRC_URI[linuxsynths-padthv1-presets.sha256sum] = "ad9eadc707784b6931955b1fc63308b9e5dc59d24903e6405e9d34d30794fd0b" diff --git a/recipes-musicians/rncbc/samplv1.bb b/recipes-musicians/rncbc/samplv1.bb index 903c958..d32ed23 100644 --- a/recipes-musicians/rncbc/samplv1.bb +++ b/recipes-musicians/rncbc/samplv1.bb @@ -15,11 +15,11 @@ inherit qmake5_base autotools-brokensep pkgconfig 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.patch \ + file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ file://0002-Avoid-stripping.patch \ " -PV = "0.9.17" -SRC_URI[sha256sum] = "420cfa7c7d10783548c90a846c46bf565ff5372b959a4ebc9447802ac4c941ec" +PV = "0.9.18" +SRC_URI[sha256sum] = "78f84cf4e4cb269d566b60fd6350eaabfebd5a5121129de287dc8d508254e58e" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-musicians/rncbc/synthv1.bb b/recipes-musicians/rncbc/synthv1.bb index 226cfb2..e537d64 100644 --- a/recipes-musicians/rncbc/synthv1.bb +++ b/recipes-musicians/rncbc/synthv1.bb @@ -17,13 +17,13 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ ${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.patch \ + file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ file://0002-Avoid-stripping.patch \ \ file://synthv1.conf \ " -PV = "0.9.17" -SRC_URI[sha256sum] = "539b170bf36c17efb4ce6a64f5eba85f80fb41f430ccdab7514aff56666e8249" +PV = "0.9.18" +SRC_URI[sha256sum] = "cc28130807859c48716cb8306bb48f4ea40a5ea30395b7acedfe36c6b58aefe9" SRC_URI[autostatic-synthv1-presets1.md5sum] = "02210e5576310554cfe316fb72e88b74" SRC_URI[autostatic-synthv1-presets1.sha256sum] = "587ac8cb4cb645fc71603d1b4b351b24f3e4d9f15a53aca59c0f30cc9f66e253"