qtractor: Move to upstream branch midiimportx
Branch 'midiimportx' contains latest master and Midi import extension. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
@@ -1,6 +1,6 @@
|
||||
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
|
||||
From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 18 Jan 2018 00:42:33 +0100
|
||||
Subject: [PATCH] find native qt build tools by configure options - auto
|
||||
detection does not work
|
||||
MIME-Version: 1.0
|
||||
@@ -9,44 +9,61 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 66 +++++++++++++++---------------------------------------------
|
||||
1 file changed, 16 insertions(+), 50 deletions(-)
|
||||
configure.ac | 55 +++++++++++++++----------------------------------------
|
||||
1 file changed, 15 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 05c7eb3..753908c 100644
|
||||
index 60673c2..9f48fdd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -258,18 +258,10 @@ done
|
||||
@@ -180,36 +180,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
|
||||
-# Check for proper qmake path/version alternatives.
|
||||
-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
|
||||
+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
|
||||
-if test "x$ac_qmake" = "xno"; then
|
||||
- if test "x$ac_qt4" = "xyes"; then
|
||||
- AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
|
||||
- ac_qmake=$ac_cv_qmake
|
||||
- else
|
||||
- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
|
||||
- ac_qmake=$ac_cv_qmake
|
||||
- fi
|
||||
-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 "x$ac_qt4" = "xyes"; then
|
||||
- if test $ac_qt_version_major -ne 4; then
|
||||
- AC_PATH_TOOL(ac_cv_qmake, qmake-qt4, [no], $ac_path)
|
||||
- ac_qmake=$ac_cv_qmake
|
||||
- fi
|
||||
-else
|
||||
- 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
|
||||
-fi
|
||||
|
||||
if test "x$ac_qmake" = "xno"; then
|
||||
if test "x$ac_qt4" = "xyes"; then
|
||||
@@ -228,13 +202,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_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])
|
||||
@@ -55,39 +72,11 @@ index 05c7eb3..753908c 100644
|
||||
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"
|
||||
@@ -284,28 +251,36 @@ else
|
||||
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_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"])
|
||||
@@ -97,7 +86,7 @@ index 05c7eb3..753908c 100644
|
||||
AC_SUBST(ac_moc)
|
||||
|
||||
# Check for Qt uic utility.
|
||||
-AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
|
||||
-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"])
|
||||
@@ -107,7 +96,7 @@ index 05c7eb3..753908c 100644
|
||||
AC_SUBST(ac_uic)
|
||||
|
||||
# Check for Qt lupdate utility.
|
||||
-AC_PATH_PROG(ac_lupdate, lupdate, [no], $ac_path)
|
||||
-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"])
|
||||
@@ -117,7 +106,7 @@ index 05c7eb3..753908c 100644
|
||||
AC_SUBST(ac_lupdate)
|
||||
|
||||
# Check for Qt lrelease utility.
|
||||
-AC_PATH_PROG(ac_lrelease, lrelease, [no], $ac_path)
|
||||
-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"])
|
||||
@@ -125,5 +114,5 @@ index 05c7eb3..753908c 100644
|
||||
AC_MSG_ERROR([lrelease $ac_errmsg])
|
||||
fi
|
||||
--
|
||||
2.5.5
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -18,12 +18,12 @@ DEPENDS += " \
|
||||
inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime qt5-translation
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/schnitzeltony/qtractor.git;branch=work-2017-12 \
|
||||
git://github.com/rncbc/qtractor.git;branch=midiimportx \
|
||||
file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
|
||||
file://0002-do-nor-try-run-for-float-sse-detection.patch \
|
||||
file://0003-do-nor-try-run-for-suil-libs-detection.patch \
|
||||
"
|
||||
SRCREV = "c57cd061cb8edc04761ca1400fff071c81939602"
|
||||
SRCREV = "e3b12b6238755e4e78092bd89e074b42314da6a2"
|
||||
PV = "0.8.5+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user