[meta-freescale] [PATCH 2/3] qtwayland: Fix xkb and waylandeglclientbufferintegration build error

[Yuqing Zhu]

There are two build errors in wayland backend:
-qwaylandxkb: error: undefined reference to 'xkb_keysym_to_utf32'
 Enable xkbcommon-evdev for wayland

-Compiling waylandeglclientbufferintegration.cpp ..
 The included file: eglplatform.h: fatal error: X11/Xlib.h: No such file
 Some EGL CFLAGS are missing.
 Add egl to do pkg config to gain "-DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM"

Signed-off-by: Yuqing Zhu <carol.zhu at nxp.com>
---
 .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend     |  3 ++
 ....pri-Fix-waylandeglclientbufferintegratio.patch | 34 ++++++++++++++++++++++
 .../qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend  |  3 ++
 3 files changed, 40 insertions(+)
 create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
 create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 6d8b951..90c5893 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -29,3 +29,6 @@ QT_CONFIG_FLAGS_APPEND_imxgpu3d = "\
             '-eglfs', d), d)}"
 
 QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND}"
+
+PACKAGECONFIG_WAYLAND ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xkbcommon-evdev', '', d)}"
+PACKAGECONFIG += "${PACKAGECONFIG_WAYLAND}"
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
new file mode 100644
index 0000000..024e5ea
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland/0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch
@@ -0,0 +1,34 @@
+From 456fb82378ec975413c30572fcfe7d3981e67c37 Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu <carol.zhu at nxp.com>
+Date: Wed, 27 Sep 2017 01:37:53 +0800
+Subject: [PATCH] wayland-egl.pri: Fix waylandeglclientbufferintegration
+ compiling error [YOCIMX-1785]
+
+With wayland backend build, there is a build break.
+
+In included file: eglplatform.h: fatal error: X11/Xlib.h: No such file
+
+The EGL CFLAGS are missing, which should be gained when doing pkg config.
+
+Add egl into QMAKE_USE_PRIVATE to gain -DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM.
+
+Signed-off-by: Yuqing Zhu <carol.zhu at nxp.com>
+---
+ src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+index df3aead..e20c680 100644
+--- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
++++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+@@ -1,6 +1,6 @@
+ INCLUDEPATH += $$PWD
+ 
+-QMAKE_USE_PRIVATE += wayland-server wayland-egl
++QMAKE_USE_PRIVATE += egl wayland-server wayland-egl
+ 
+ QT += egl_support-private
+ 
+-- 
+2.7.4
+
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
new file mode 100644
index 0000000..a043cff
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-wayland-egl.pri-Fix-waylandeglclientbufferintegratio.patch', '', d)}"
+
-- 
2.7.4