drumkv1: update 0.8.6 -> 0.9.0

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-03-07 20:54:03 +01:00
parent 5ef3c83458
commit d5ee79d712
2 changed files with 2 additions and 131 deletions

View File

@@ -1,129 +0,0 @@
From f9970bc20b4ceb864c98a3d5550c27500db60520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 26 Nov 2016 00:46:10 +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@googlemail.com>
---
configure.ac | 66 +++++++++++++++---------------------------------------------
1 file changed, 16 insertions(+), 50 deletions(-)
diff --git a/configure.ac b/configure.ac
index 05c7eb3..753908c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,18 +258,10 @@ done
# A common error message:
ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
-if test "x$ac_qt4" = "xyes"; then
- AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path)
-else
- AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
-fi
-if test "x$ac_qmake" = "xno"; then
- AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
- ac_qmake=$ac_cv_qmake
-fi
-if test "x$ac_qmake" = "xno"; then
- AC_MSG_ERROR([qmake $ac_errmsg])
-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], [
@@ -296,13 +288,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_PROG(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], [
@@ -324,56 +309,37 @@ if test -d $ac_qt_install_libs; then
ac_libs="-L$ac_qt_install_libs $ac_libs"
fi
-# Finally, check for proper Qt4/5 version.
-if test "x$ac_qt4" = "xyes"; then
- AC_CACHE_CHECK([for Qt library version >= 4.4],
- ac_cv_qtversion, [
- AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
- #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
- #error Qt library 4.4 or greater required.
- #endif
- ], ac_cv_qtversion="yes", [
- echo "no; Qt 4.4 or greater is required"
- exit 1
- ])
- ])
-else
- AC_CACHE_CHECK([for Qt library version >= 5.1],
- ac_cv_qtversion, [
- AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
- #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
- #error Qt library 5.1 or greater required.
- #endif
- ], ac_cv_qtversion="yes", [
- echo "no; Qt 5.1 or greater is required"
- exit 1
- ])
- ])
-fi
-
# Check for Qt moc utility.
-AC_PATH_PROG(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_PROG(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
AC_SUBST(ac_uic)
# Check for Qt lupdate utility.
-AC_PATH_PROG(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_MSG_ERROR([lupdate $ac_errmsg])
fi
AC_SUBST(ac_lupdate)
# Check for Qt lrelease utility.
-AC_PATH_PROG(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_release" = "xno"; then
AC_MSG_ERROR([lrelease $ac_errmsg])
fi
--
2.5.5

View File

@@ -19,8 +19,8 @@ SRC_URI = " \
git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \
file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
"
SRC_URI[md5sum] = "1c3efd8bbb222f8771fe6c0793178113"
SRC_URI[sha256sum] = "9821570e17770cedd99e99426e8891b9c16a86e495fc5fcfa9449570bdcb9d3b"
SRC_URI[md5sum] = "970725490a28ee8e35d1ab78321278c9"
SRC_URI[sha256sum] = "4bb54f7a0c170c1935d282881615cbe6f5d0a508f43aef0c8b6d7a3a66a6a8ee"
SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e"