qtbase: Include Sololite changes.

Sololite x11 backend only supports mesa software rendering GL but
does not support GLES. Sololite non-x11 backends (fb, wayland
and dfb) do not support GL and GLES.

Change qtbase recipe to support sololite qt for all backends.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 20fc15fea09407893df51b55cf6ee2977ca51307..64966c2924c04ae0dd1231464bcb7ba0842e7aff 100644 (file)
--- a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -6,12 +6,21 @@ SRC_URI += "file://Force_egl_visual_ID_33.patch"
 
 HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
 
+IS_MX6SL = "0"
+IS_MX6SL_mx6sl = "1"
+
 PACKAGECONFIG_GL_mx5 = "gles2"
 PACKAGECONFIG_append_mx5 = " tslib icu examples"
 
-PACKAGECONFIG_GL_mx6 = "gles2"
+PACKAGECONFIG_GL_mx6q = "gles2"
+PACKAGECONFIG_GL_mx6dl = "gles2"
+PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
+                            ' gl', '', d)}"
 PACKAGECONFIG_append_mx6 = " tslib icu examples"
-QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
+                            ' -no-eglfs', ' -no-opengl -linuxfb -no-icu -no-eglfs', d)}"
 
 do_configure_prepend_mx5() {
     sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
@@ -36,10 +45,17 @@ do_configure_prepend_mx6() {
        # adapt qmake.conf to our needs
        sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
     if test ${HAS_X11} -eq 0; then
+   if test ${IS_MX6SL} -eq 0; then
+    
                cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
 IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
 EOF
+   else
+cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
+IMX6_CFLAGS             = -DLINUX=1
+EOF
+fi
                # copy the hook in the mkspecs directory OE is using
                cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp ${S}/mkspecs/linux-oe-g++/
        else