aboutsummaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-01-10 17:39:25 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2017-01-11 10:56:36 -0200
commit0d82059f6c8f7e7cddc409adb093f2d523ebc437 (patch)
treecdfad9cf6cfc0c38f16c9a18f7f66eea0667b792 /dynamic-layers
parent59885ab98339c11e4144e07f98f7e1d578d3f740 (diff)
downloadmeta-freescale-0d82059f6c8f7e7cddc409adb093f2d523ebc437.tar.gz
meta-freescale-0d82059f6c8f7e7cddc409adb093f2d523ebc437.tar.bz2
meta-freescale-0d82059f6c8f7e7cddc409adb093f2d523ebc437.zip
qtbase: Configure eglfs with EGL pkg-config
A build error occurred because eglfs needs to be configured with the EGL pkg-config. Signed-off-by: Tom Hochstein <tom.hochstein@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/0016-Configure-eglfs-with-egl-pkg-config.patch13
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend5
2 files changed, 17 insertions, 1 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch
new file mode 100644
index 00000000..a245d79a
--- /dev/null
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch
@@ -0,0 +1,13 @@
+Index: git/src/plugins/platforms/eglfs/eglfs-plugin.pro
+===================================================================
+--- git.orig/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:54:05.000000000 -0600
++++ git/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:56:25.000000000 -0600
+@@ -2,6 +2,8 @@
+
+ QT += platformsupport-private eglfs_device_lib-private
+
++CONFIG += egl
++
+ SOURCES += $$PWD/qeglfsmain.cpp
+
+ OTHER_FILES += $$PWD/eglfs.json
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 03748711..a69dbec8 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,12 +1,15 @@
# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
# Copyright (C) 2016 O.S. Systems Software LTDA.
# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017 NXP
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_imxgpu2d = "file://0014-Add-IMX-GPU-support.patch"
SRC_URI_append_imxgpu3d = " \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://0015-Add-eglfs-to-IMX-GPU.patch', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
+ 'file://0015-Add-eglfs-to-IMX-GPU.patch \
+ file://0016-Configure-eglfs-with-egl-pkg-config.patch', d)} \
"
PACKAGECONFIG_GL_imxpxp = "gles2"