Added -force-eglx option to configure script.

Tizen mobile 2.2* has broken eglplatform.h header so that eglx
test does not pass. eglplatform.h does not contains
MESA_EGL_NO_X11_HEADERS ifdef.

Change-Id: I8f956051f2145a60a0f6e429230a9d731c8c2dc0
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

diff --git a/configure b/configure
index 8e8680b472bfeff2ff214061fbb3ca58f8566f32..7ec0d4f25af3eb7e42342ab49209062cf429a83d 100755 (executable)
--- a/configure
+++ b/configure
@@ -644,6 +644,7 @@ CFG_OPENVG_SHIVA=auto
 CFG_OPENVG_ON_OPENGL=auto
 CFG_EGL=auto
 CFG_EGL_X=auto
+CFG_FORCE_EGL_X=no
 CFG_FONTCONFIG=auto
 CFG_FREETYPE=auto
 CFG_HARFBUZZ=qt
@@ -1586,6 +1587,13 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
+    force-eglx)
+       if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+            CFG_FORCE_EGL_X=yes
+        else
+            UNKNOWN_OPT=yes
+       fi
+        ;;
     pch)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
             CFG_PRECOMPILE="$VAL"
@@ -5676,7 +5684,7 @@ if [ "$CFG_EGL" != "no" ]; then
     fi       # detect EGL support
     if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
         CFG_EGL=yes
-        if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+        if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL || [ "$CFG_FORCE_EGL_X" == "yes" ]; then
             CFG_EGL_X=yes
         else
             CFG_EGL_X=no

diff --git a/packaging/qt5.spec b/packaging/qt5.spec
index 34f7c9ba532e3ce9ca1fca55ba0f8af899c1f064..c2f326042ea8ae13b2e6d664289e2df476f66c50 100644 (file)
--- a/packaging/qt5.spec
+++ b/packaging/qt5.spec
@@ -33,6 +33,7 @@
 %define profile mobile
 %define _with_x 1
 %define xkb_config_root -xkb-config-root /etc/X11/xkb
+%define _force_eglx 1
 %ifnarch armv7l armv7el
 %define _repository emulator
 %endif
@@ -649,6 +650,9 @@ MAKEFLAGS=%{?_smp_mflags} \
     %{xkb_config_root} \
 %if %{with x}
     -xcb \
+%if 0%{?_force_eglx:1}
+    -force-eglx \
+%endif
     -qt-xcb
 %else 
     -no-xcb