From dd1e2f113924c97d0ec6b3d3d6813550acaa3be7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 11 Oct 2018 12:17:08 -0500 Subject: qtbase: Fix QT_CONFIG_FLAGS for non-mainline-bsp - Enable eglfs only for 3D parts and framebuffer backend - Disable opengl and enable linuxfb for 2D parts with no 3D Signed-off-by: Tom Hochstein --- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'dynamic-layers/qt5-layer') diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index d6f3b109..7d9b775b 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -22,10 +22,13 @@ PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl PACKAGECONFIG_GL_imxgpu3d = "gles2" PACKAGECONFIG_GL_append_use-mainline-bsp = " gbm kms" -QT_CONFIG_FLAGS_APPEND = "" -QT_CONFIG_FLAGS_APPEND_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}" -QT_CONFIG_FLAGS_APPEND_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-no-opengl -linuxfb -no-eglfs', d)}" -QT_CONFIG_FLAGS_APPEND_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}" +QT_CONFIG_FLAGS_APPEND = "" +QT_CONFIG_FLAGS_APPEND_imxpxp = "-no-eglfs" +QT_CONFIG_FLAGS_APPEND_imxgpu2d = "-no-eglfs -no-opengl -linuxfb" +QT_CONFIG_FLAGS_APPEND_imxgpu3d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', \ + bb.utils.contains('DISTRO_FEATURES', 'wayland', '-no-eglfs', \ + '-eglfs', d), d)}" QT_CONFIG_FLAGS_APPEND_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}" QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND}" -- cgit v1.2.3-54-g00ecf