From 1fb65f0864899f80ead38458739936f65102baa8 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 30 Dec 2019 16:49:56 +0100 Subject: [PATCH] qtbase: apply imxgpu2d patches to imx8mn platforms as well The .bbappend file in meta-freescale only applies these patches to platforms with imxqpu2d, but they are necessary to build framebuffer images for the ccimx8mn. Using the same approach as NXP in meta-fsl-bsp-release (applying the patches to imxgpu platforms) duplicates the patches for platforms that are both imxgpu and imxgpu2d, so append them for imx8mn platforms exclusively. While at it, remove a patch that is no longer necessary, since the latest versions of qtbase already have the patch's change in them. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index 8b78e6616..3e243fdf1 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -8,6 +8,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " file://qt5.sh" +# Technically, we should add the following patches to imxgpu platforms, but +# doing so duplicates them for imxgpu2d platforms and causes build errors. +# As of now, the only SoC that is imxgpu and not imxgpu2d is the i.MX8MN, so +# append the patches to that SoC only. +SRC_URI_append_mx8mn = " \ + file://0014-Add-IMX-GPU-support.patch \ + file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ +" + +SRC_URI_remove_imxgpu3d = "file://0016-Configure-eglfs-with-egl-pkg-config.patch" + PACKAGECONFIG_GL_imxpxp = "gles2" PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', '', d)}" PACKAGECONFIG_GL_imxgpu3d = "gles2"