From 626e271bd66d3320c5a386c43979a27117c9bd87 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 26 May 2020 14:39:47 -0500 Subject: qtbase: Add i.MX 8 configuration - 8M Quad has 3D but no 2D, so fix the override for GPU patches - Add gbm and kms for all i.MX 8 with GPU - Add vulkan for all i.MX 8 with GPU except 8M Mini Signed-off-by: Tom Hochstein (cherry picked from commit b37a332b130389d8f4429fbb9d87d26b65cfc386) --- .../qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 68eab915..8c2a5ea9 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu2d = " \ +SRC_URI_append_imxgpu = " \ file://0014-Add-IMX-GPU-support.patch \ file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ " @@ -16,9 +16,14 @@ SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '${SRC_URI_APPEND_3D_NOT_X11}', d)} \ " +PACKAGECONFIG_GL_IMX_GPU = "" +PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms" + PACKAGECONFIG_GL_imxpxp = "gles2" -PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}" -PACKAGECONFIG_GL_imxgpu3d = "gles2" +PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ + ${PACKAGECONFIG_GL_IMX_GPU}" +PACKAGECONFIG_GL_imxgpu3d = "gles2 \ + ${PACKAGECONFIG_GL_IMX_GPU}" PACKAGECONFIG_GL_append_use-mainline-bsp = " gbm kms" PACKAGECONFIG_PLATFORM = "" @@ -29,3 +34,9 @@ PACKAGECONFIG_PLATFORM_imxgpu3d = " \ 'eglfs', d), d)}" PACKAGECONFIG_PLATFORM_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" + +PACKAGECONFIG_VULKAN_IMX_GPU = "" +PACKAGECONFIG_VULKAN_IMX_GPU_mx8 = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU_mx8mm = "" +PACKAGECONFIG_VULKAN_imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" -- cgit v1.2.3-54-g00ecf