From 0d82059f6c8f7e7cddc409adb093f2d523ebc437 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 10 Jan 2017 17:39:25 -0600 Subject: 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 Signed-off-by: Otavio Salvador --- .../qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch | 13 +++++++++++++ dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch 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" -- cgit v1.2.3-54-g00ecf