From f56a50a1105b4f24ef4da0266f24704fd69464eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 9 Aug 2020 10:29:41 +0200 Subject: [PATCH] qtractor: upgrade 0.9.15 -> 0.9.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/rncbc/qtractor.bb | 4 +- ...uild-tools-by-configure-options-auto.patch | 107 ++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 recipes-musicians/rncbc/qtractor/0001-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-musicians/rncbc/qtractor.bb b/recipes-musicians/rncbc/qtractor.bb index 0d71387..1f43911 100644 --- a/recipes-musicians/rncbc/qtractor.bb +++ b/recipes-musicians/rncbc/qtractor.bb @@ -28,8 +28,8 @@ SRC_URI = " \ \ file://Qtractor.conf \ " -SRCREV = "a488c968068204bb1ad4ebc53995c67bc8f959c6" -PV = "0.9.15+git${SRCPV}" +SRCREV = "675b1a47e173eda97741565249967d5f644fc399" +PV = "0.9.16+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OECONF = " \ diff --git a/recipes-musicians/rncbc/qtractor/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/qtractor/0001-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 0000000..2e2b1eb --- /dev/null +++ b/recipes-musicians/rncbc/qtractor/0001-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 b4a3934c..4ae9d465 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -522,23 +522,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 -lt 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)]) +@@ -553,13 +539,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], [ +@@ -595,14 +574,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 +@@ -610,7 +593,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 +@@ -622,7 +607,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.26.2 +