From c2be9fc72af87fb702ac2f7cecc56ad029f7bf94 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 12 Feb 2020 14:00:20 -0500 Subject: meta-agl-profile-cluster-qt5: disable qtbase patches The patches to qtbase for supporting the qtcompositor cluster demo on dra7xx-evm do not apply against 5.13.2 and it is not clear if they are still required, disable them for now until someone with the hardware can investigate. Note that this change is required to unblock building the regular cluster demo. Bug-AGL: SPEC-2932 Change-Id: I47b7de17a0d2da5155b2c58f89bbe78ab516c4e1 Signed-off-by: Scott Murray --- meta-agl-profile-cluster-qt5/recipes-qt/qt5/qtbase_%.bbappend | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-agl-profile-cluster-qt5') diff --git a/meta-agl-profile-cluster-qt5/recipes-qt/qt5/qtbase_%.bbappend b/meta-agl-profile-cluster-qt5/recipes-qt/qt5/qtbase_%.bbappend index 50db225c1..e94ef03ae 100644 --- a/meta-agl-profile-cluster-qt5/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-agl-profile-cluster-qt5/recipes-qt/qt5/qtbase_%.bbappend @@ -2,9 +2,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += " file://0001-fixed-eglfs_kms-fails-to-build.patch \ - file://0002-fixed-invalid-conversion-from-EGLNativeDisplayType-to-void.patch \ - " +# FIXME: Disabled as they do not apply against 5.13.2, and it is +# unclear if they are still required for building dra7xx-evm, +# which fails for what looks like a different reason. +#SRC_URI += " file://0001-fixed-eglfs_kms-fails-to-build.patch \ +# file://0002-fixed-invalid-conversion-from-EGLNativeDisplayType-to-void.patch \ +# " PACKAGECONFIG_GL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' eglfs kms gbm', '', d)}" -- cgit 1.2.3-korg