diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-01-23 17:33:06 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-01-25 07:24:20 -0800 |
commit | eeefde3b1e83fd46578fba01ea499edff47920d3 (patch) | |
tree | f8ed84f376ad23ef489600f83de0074faf8d39ce /meta-xilinx-core/recipes-graphics | |
parent | 13071f99ebd0db1b3b1a5ac1f5b77b096434d250 (diff) | |
download | meta-xilinx-eeefde3b1e83fd46578fba01ea499edff47920d3.tar.gz |
cairo: Preserve stock configuration for lima, only override for libmali
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/recipes-graphics')
-rw-r--r-- | meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend | 7 |
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 @@ | |||
1 | # OpenGL comes from libmali on ev/eg, when egl is enabled | 1 | # OpenGL comes from libmali on ev/eg, when egl is enabled |
2 | PACKAGECONFIG = " \ | 2 | # Adjust the configuration if we're using libmali for this distro |
3 | DEFAULT_PACKAGECONFIG := "${PACKAGECONFIG}" | ||
4 | |||
5 | PACKAGECONFIG_LIBMALI = " \ | ||
3 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ | 6 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ |
4 | egl glesv2 \ | 7 | egl glesv2 \ |
5 | " | 8 | " |
6 | 9 | ||
10 | PACKAGECONFIG = "${@'${PACKAGECONFIG_LIBMALI}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGECONFIG}'}" | ||
11 | |||
7 | # Links to libmali-xlnx, so it becomes MACHINE_ARCH specific | 12 | # Links to libmali-xlnx, so it becomes MACHINE_ARCH specific |
8 | DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}" | 13 | DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}" |
9 | MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}" | 14 | MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}" |