e6109b8597
Update to 5.2.0 final OBS-URL: https://build.opensuse.org/request/show/210884 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=10
116 lines
3.9 KiB
Diff
116 lines
3.9 KiB
Diff
From bad2e9fad4b9574528b02e8b60a03672f41ebe35 Mon Sep 17 00:00:00 2001
|
|
From: Jorgen Lind <jorgen.lind@digia.com>
|
|
Date: Tue, 12 Nov 2013 09:25:23 +0100
|
|
Subject: [PATCH 1/1] Fix configure script to not dictate OpenGL ES 2 when EGL
|
|
is enabled
|
|
|
|
Change-Id: I4d940ef436f21fd915f3d03558fd4fb4c7b3e5b7
|
|
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
|
(cherry picked from commit 20272ad6e5c56db87146f85f98c560099bfdbb75)
|
|
|
|
Conflicts:
|
|
configure
|
|
---
|
|
configure | 34 +++++++---------------------------
|
|
1 file changed, 7 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index a330dd6..a83aeb7 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2419,7 +2419,7 @@ Additional options:
|
|
* -xcb ............... Compile Xcb support.
|
|
|
|
-no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support.
|
|
- * -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support).
|
|
+ * -eglfs ............. Compile EGLFS support.
|
|
|
|
-no-directfb ....... Do not compile DirectFB support.
|
|
* -directfb .......... Compile DirectFB support.
|
|
@@ -2428,7 +2428,7 @@ Additional options:
|
|
* -linuxfb ........... Compile Linux Framebuffer support.
|
|
|
|
-no-kms ............ Do not compile KMS support.
|
|
- * -kms ............... Compile KMS support (Requires EGL and OpenGL ES 2 support).
|
|
+ * -kms ............... Compile KMS support (Requires EGL support).
|
|
|
|
-qpa <name> ......... Sets the default QPA platform (e.g xcb, cocoa, windows).
|
|
|
|
@@ -4423,11 +4423,6 @@ if [ "$CFG_EGLFS" = "yes" ]; then
|
|
echo "The EGLFS plugin requires EGL support and cannot be built"
|
|
exit 101
|
|
fi
|
|
- if [ "$CFG_OPENGL" != "es2" ]; then
|
|
- echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built"
|
|
- exit 101
|
|
- fi
|
|
- CFG_OPENGL="es2"
|
|
CFG_EGL=yes
|
|
fi
|
|
|
|
@@ -4436,10 +4431,6 @@ if [ "$CFG_KMS" = "yes" ]; then
|
|
echo "The KMS plugin requires EGL support and cannot be built"
|
|
exit 101
|
|
fi
|
|
- if [ "$CFG_OPENGL" != "es2" ]; then
|
|
- echo "The KMS plugin requires OpenGL ES 2 support and cannot be built"
|
|
- exit 101
|
|
- fi
|
|
fi
|
|
|
|
# auto-detect SQL-modules support
|
|
@@ -5269,17 +5260,10 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then
|
|
fi
|
|
|
|
# EGL Support
|
|
-if [ "$CFG_OPENGL" != "es2" ]; then
|
|
- if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "desktop" ]; then
|
|
- echo "EGL support was requested but Qt is being configured for desktop OpenGL."
|
|
- echo "Either disable EGL support or enable OpenGL ES support."
|
|
- exit 101
|
|
- elif [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then
|
|
- echo "EGL support was requested but OpenGL ES support is disabled."
|
|
+if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then
|
|
+ echo "EGL support was requested but OpenGL support is disabled."
|
|
echo "Either disable EGL support or enable OpenGL ES support."
|
|
exit 101
|
|
- fi
|
|
- CFG_EGL=no
|
|
elif [ "$CFG_EGL" != "no" ]; then
|
|
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
|
|
QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
|
|
@@ -5302,7 +5286,7 @@ elif [ "$CFG_EGL" != "no" ]; then
|
|
fi
|
|
|
|
if [ "$CFG_EGLFS" != "no" ]; then
|
|
- if [ "$CFG_OPENGL" = "es2" ] && [ "$XPLATFORM_QNX" = "no" ]; then
|
|
+ if [ "$XPLATFORM_QNX" = "no" ]; then
|
|
CFG_EGLFS="$CFG_EGL"
|
|
else
|
|
CFG_EGLFS="no"
|
|
@@ -5310,7 +5294,7 @@ if [ "$CFG_EGLFS" != "no" ]; then
|
|
fi
|
|
|
|
if [ "$CFG_KMS" = "yes" ]; then
|
|
- if [ "$CFG_OPENGL" = "es2" ] && [ "$CFG_EGL" = "yes" ]; then
|
|
+ if [ "$CFG_EGL" = "yes" ]; then
|
|
CFG_KMS="yes"
|
|
else
|
|
CFG_KMS="no"
|
|
@@ -5694,11 +5678,7 @@ else
|
|
fi
|
|
|
|
if [ "$CFG_OPENGL" = "es2" ]; then
|
|
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES"
|
|
-fi
|
|
-
|
|
-if [ "$CFG_OPENGL" = "es2" ]; then
|
|
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2"
|
|
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES QT_OPENGL_ES_2"
|
|
QT_CONFIG="$QT_CONFIG opengles2"
|
|
fi
|
|
|
|
--
|
|
1.8.4.4
|
|
|