zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-09-12 12:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

qmidictl: upgrade 0.6.2 -> 0.6.3

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-08-03 22:18:41 +02:00
parent 7e67d427f0
commit 6082e91300
2 changed files with 3 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
recipes-musicians/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch
View File

@@ -1,107 +0,0 @@
From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
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 <schnitzeltony@gmail.com>
---
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

7
recipes-musicians/rncbc/qmidictl.bb
View File

@@ -14,11 +14,10 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
"
SRC_URI[md5sum] = "61440e33e1d7405808e86ab8aa8c5250"
SRC_URI[sha256sum] = "bac2e3cf8fcc1b777f5a0b87bd5ee4a744b2405410d791857b5890769b457627"
PV = "0.6.2"
SRC_URI[sha256sum] = "7e94751f5a070d02916a21fdaa1e466cea54dcb6ccb6da29b9872e996f482c8c"
PV = "0.6.3"
EXTRA_OECONF = " \
--with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \