34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
From 64dccb0fdd71075e37e03c4b52a0c9f5bb749d3f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jean-Baptiste Kempf <jb@videolan.org>
|
||
|
|
Date: Mon, 16 Nov 2015 14:54:35 +0100
|
||
|
|
Subject: [PATCH 1/1] Configure: Refuse Qt 5.5.0 and 5.5.1
|
||
|
|
|
||
|
|
If you are a packager, I'm sorry for you, but you MUST patch Qt5.5 with
|
||
|
|
https://codereview.qt-project.org/#/c/139066/1
|
||
|
|
and then revert this commit.
|
||
|
|
You can also lobby for a Qt5.5.2
|
||
|
|
---
|
||
|
|
configure.ac | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 63a0577..d90097c 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -3735,6 +3735,11 @@ AS_IF([test "${enable_qt}" != "no"], [
|
||
|
|
],[
|
||
|
|
AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
|
||
|
|
])
|
||
|
|
+
|
||
|
|
+ PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
|
||
|
|
+ AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
|
||
|
|
+ ])
|
||
|
|
+
|
||
|
|
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
|
||
|
|
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
|
||
|
|
AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|
||
|
|
|