cairo: Preserve stock configuration for lima, only override for libmali

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
index 3ee90344..c46e8550 100644
--- a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,9 +1,14 @@
 # OpenGL comes from libmali on ev/eg, when egl is enabled
-PACKAGECONFIG = " \
+# Adjust the configuration if we're using libmali for this distro
+DEFAULT_PACKAGECONFIG := "${PACKAGECONFIG}"
+
+PACKAGECONFIG_LIBMALI = " \
   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
   egl glesv2 \
 "
 
+PACKAGECONFIG = "${@'${PACKAGECONFIG_LIBMALI}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGECONFIG}'}"
+
 # Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
 DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
 MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}"