]> code.ossystems Code Review - meta-freescale.git/commitdiff
qtbase: Allow to build eglfs with x11 in DISTRO_FEATURES
authorMartin Jansa <martin.jansa@gmail.com>
Mon, 29 Feb 2016 17:22:28 +0000 (18:22 +0100)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 19 Apr 2016 18:03:26 +0000 (15:03 -0300)
* even when x11 is in DISTRO_FEATURES someone might configure qtbase
  to build with eglfs, that works OK with Qt 5.5.1, because
  -DEGL_API_FB=1 is also passed through
  mkspecs/devices/linux-imx6-g++/qmake.conf
  but with 5.6 and 5.7 it fails when X11 headers are include with their
  own Status enum (the same errors like before
  https://codereview.qt-project.org/#/c/105116/2)
  Adding -DEGL_API_FB=1 like linux-imx6-g++/qmake.conf does is simplest
  workaround to prevent imx-gpu-viv from including Xlib from
  EGL/eglvivante.h

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

index f157c4dc7637bf70949d7b596192df91aa0b7d28..b18bf1711c7f4631fca4091e3e37e0ffbcf1f437 100644 (file)
@@ -32,7 +32,7 @@ EOF
         fi
     else
         cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1
+IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
 EOF
     fi
     cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF