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
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 95ffd606f8a632a8a963486ce340e7e1b707be0a Mon Sep 17 00:00:00 2001
|
|
From: Albert Astals Cid <albert.astals@canonical.com>
|
|
Date: Tue, 19 Nov 2013 16:53:21 +0100
|
|
Subject: [PATCH 1/1] Do not disable egl on desktop gl automatically
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
desktop opengl and egl are not incompatible with eachother, so there
|
|
is no need to disable egl when on desktop opengl
|
|
|
|
Task-number: QTBUG-34949
|
|
|
|
Change-Id: I757c38674a480910d1cb23853c255eb993e107ff
|
|
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
|
|
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
|
|
---
|
|
configure | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index 120150c..72c13ab 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5267,11 +5267,13 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then
|
|
fi
|
|
|
|
# EGL Support
|
|
-if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then
|
|
+if [ "$CFG_EGL" != "no" ]; then
|
|
+ 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."
|
|
+ echo "Either disable EGL support or enable OpenGL support."
|
|
exit 101
|
|
-elif [ "$CFG_EGL" != "no" ]; then
|
|
+ fi
|
|
+
|
|
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'`
|
|
QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
|
|
--
|
|
1.8.4.4
|
|
|