qtractor: Fix LV2 detection

Instead of backporting patches merge current master branch into midiimportx
branch and get sources temporarily from my git fork. Merge request was sent out
[1] - so I expect we soon get back to Rui's git sources.

[1] https://github.com/rncbc/qtractor/pull/189

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-01-20 00:15:36 +01:00
parent 51aa6cbb6b
commit 55d43bf9b9
2 changed files with 11 additions and 28 deletions

View File

@@ -1,36 +1,18 @@
From a32a7af99c5f241a08840ce0775c9aaa0c37a792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 16 Feb 2017 23:36:22 +0100
Subject: [PATCH] do nor try run for suil libs detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Date: Sat, 19 Jan 2019 18:55:17 +0100
Subject: [PATCH] do nor try run for suil libs feature detection
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
configure.ac | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/configure.ac b/configure.ac
index 009a9d74..1d3e50c3 100644
index b3de5acd..09d2ef06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,12 +256,12 @@ AC_ARG_ENABLE(lv2-ui-show,
AC_ARG_ENABLE(lv2-ui-gtk2,
AS_HELP_STRING([--enable-lv2-ui-gtk2], [enable LV2 plug-in UI GTK2 native support (default=yes)]),
[ac_lv2_ui_gtk2="$enableval"],
- [ac_lv2_ui_gtk2="no"])
+ [ac_lv2_ui_gtk2="yes"])
AC_ARG_ENABLE(lv2-ui-x11,
AS_HELP_STRING([--enable-lv2-ui-x11], [enable LV2 plug-in UI X11 native support (default=yes)]),
[ac_lv2_ui_x11="$enableval"],
- [ac_lv2_ui_x11="no"])
+ [ac_lv2_ui_x11="yes"])
# Enable JACK session support.
AC_ARG_ENABLE(jack-session,
@@ -1232,17 +1232,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then
@@ -1229,17 +1229,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then
fi
if test "x$ac_suil" = "xyes"; then
@@ -49,7 +31,7 @@ index 009a9d74..1d3e50c3 100644
if test "x$ac_cv_suil_gtk2_in_qt5" = "xyes"; then
AC_DEFINE(CONFIG_LIBSUIL_GTK2_IN_QT5, 1, [Define if libsuil_gtk2_in_qt5 is available.])
# ac_lv2_ui_gtk2="no"
@@ -1260,17 +1250,7 @@ if test "x$ac_lv2_ui_gtk2" = "xyes"; then
@@ -1257,17 +1247,7 @@ else
fi
if test "x$ac_suil" = "xyes"; then
@@ -69,5 +51,5 @@ index 009a9d74..1d3e50c3 100644
AC_DEFINE(CONFIG_LIBSUIL_X11_IN_QT5, 1, [Define if libsuil_x11_in_qt5 is available.])
# ac_lv2_ui_x11="no"
--
2.14.5
2.20.1

View File

@@ -18,15 +18,16 @@ DEPENDS += " \
inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime qt5-translation
SRC_URI = " \
git://github.com/rncbc//qtractor.git;branch=midiimportx \
git://github.com/schnitzeltony/qtractor.git;branch=midiimportx \
file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \
\
file://0001-do-nor-try-run-for-float-sse-detection.patch \
file://0002-do-nor-try-run-for-suil-libs-detection.patch \
file://0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \
\
file://Qtractor.conf \
"
SRCREV = "c199ad418be3f3b6efbc8f330f1ae0708e682ede"
SRCREV = "e0570aa1519b25da89fca56e70b2ff61a6645145"
PV = "0.9.3+git${SRCPV}"
S = "${WORKDIR}/git"