[meta-freescale] [PATCH 2/2] qtbase: Fix build error when using EGL

Tom Hochstein tom.hochstein at nxp.com
Mon Jun 26 15:09:26 PDT 2017


A build error was occurring due to missing EGL configuration.
Fixed by adding the necessary ties to the EGL pkg-config.

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
 ...-build-error-when-egl-headers-need-platfo.patch | 32 ++++++++++++++++++++++
 .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend     |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0017-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch

diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0017-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0017-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch
new file mode 100644
index 0000000..7e625fd
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0017-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 at 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 at 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 ff120b7..a78eea2 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -12,6 +12,7 @@ SRC_URI_append_imxgpu3d = " \
                                                    'file://0015-Add-eglfs-to-IMX-GPU.patch \
                                                     file://0016-Configure-eglfs-with-egl-pkg-config.patch', d)} \
 "
+SRC_URI_append_imxgpu2d = "file://0017-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch"
 
 PACKAGECONFIG_GL_imxpxp   = "gles2"
 PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
-- 
1.9.1



More information about the meta-freescale mailing list