From 4c5386817fb3ad9e1de43aa27366f05122e26b54 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 18 May 2021 14:25:49 -0700 Subject: cairo: Fix enabling egl and glesv2 on Mali400 platforms Issue: CR-1099768 The original patch mistakenly tried to append for only zynqmp. However, it instead overwrote the original value. Make this clear that we are setting the value, not adding to an existing one. Additionally, as the items are all mali400 specific, we ensure that the dependency and PACKAGE_ARCH are set properly in this case. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend index bfade4aa..d00e696a 100644 --- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -1,9 +1,7 @@ -PACKAGECONFIG_zynqmp += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ +PACKAGECONFIG_mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ egl glesv2" -# OpenGL comes from libmali on ev/eg -DEPENDS_append_zynqmp-ev = " libmali-xlnx" -DEPENDS_append_zynqmp-eg = " libmali-xlnx" +# OpenGL comes from libmali +DEPENDS_append_mali400 = " libmali-xlnx" -PACKAGE_ARCH_zynqmp-ev = "${SOC_VARIANT_ARCH}" -PACKAGE_ARCH_zynqmp-eg = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" -- cgit v1.2.3-54-g00ecf