aboutsummaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorYuqing Zhu <carol.zhu@nxp.com>2017-06-27 17:10:12 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2017-06-28 15:21:18 -0300
commita1c88d1b14e12eda0cfae3a516b3b20244cd6d4d (patch)
tree1c7f08c6dc76a3de24ca07561bd130f27eb194cb /dynamic-layers
parent111997c8d1243f39031841ecb457a3e56fb25877 (diff)
downloadmeta-freescale-a1c88d1b14e12eda0cfae3a516b3b20244cd6d4d.tar.gz
meta-freescale-a1c88d1b14e12eda0cfae3a516b3b20244cd6d4d.tar.bz2
meta-freescale-a1c88d1b14e12eda0cfae3a516b3b20244cd6d4d.zip
qtbase: Fix QT5.8 build error "Platform not recognized" in egl header
Gain the platform value through pkg-config and pass it through QMAKE_CFLAGS_EGL. Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch32
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend4
2 files changed, 35 insertions, 1 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch
new file mode 100644
index 00000000..7e625fd1
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch
@@ -0,0 +1,32 @@
+From 3f9703fecd670b36030e1093466f6d11b370c19f Mon Sep 17 00:00:00 2001
+From: Yuqing Zhu <carol.zhu@nxp.com>
+Date: Mon, 27 Mar 2017 15:33:35 +0800
+Subject: [PATCH] egl.prf: Fix build error when egl headers need platform
+ definition
+
+Gain the value through pkg-config and pass it through QMAKE_CFLAGS_EGL.
+
+Upstream-Status: Pending
+
+Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
+---
+ mkspecs/features/egl.prf | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
+index 9fa0c9e..85d5852 100644
+--- a/mkspecs/features/egl.prf
++++ b/mkspecs/features/egl.prf
+@@ -1,3 +1,9 @@
++# egl headers need a definition
++PKG_CONFIG = $$pkgConfigExecutable()
++PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
++PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
++QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
++
+ INCLUDEPATH += $$QMAKE_INCDIR_EGL
+ LIBS_PRIVATE += $$QMAKE_LIBS_EGL
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
+--
+1.9.1
+
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index ff120b76..a0bb301f 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -6,7 +6,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_use-mainline-bsp = " file://Environment-variable-enabling-the-workaround-FBO-rea.patch"
-SRC_URI_append_imxgpu2d = "file://0014-Add-IMX-GPU-support.patch"
+SRC_URI_append_imxgpu2d = "file://0014-Add-IMX-GPU-support.patch \
+ file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
+"
SRC_URI_append_imxgpu3d = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
'file://0015-Add-eglfs-to-IMX-GPU.patch \