diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-05-18 14:25:49 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-07-14 15:01:47 -0700 |
| commit | 4c5386817fb3ad9e1de43aa27366f05122e26b54 (patch) | |
| tree | d956b6b31ec746a5e1645528a0ab973b71d19549 | |
| parent | f87ac7bcd63e31d92b05a6bfe8e33c2c8ede1697 (diff) | |
| download | meta-xilinx-4c5386817fb3ad9e1de43aa27366f05122e26b54.tar.gz | |
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 <mark.hatle@xilinx.com>
| -rw-r--r-- | meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend | 10 |
1 files 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 @@ | |||
| 1 | PACKAGECONFIG_zynqmp += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ | 1 | PACKAGECONFIG_mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ |
| 2 | egl glesv2" | 2 | egl glesv2" |
| 3 | 3 | ||
| 4 | # OpenGL comes from libmali on ev/eg | 4 | # OpenGL comes from libmali |
| 5 | DEPENDS_append_zynqmp-ev = " libmali-xlnx" | 5 | DEPENDS_append_mali400 = " libmali-xlnx" |
| 6 | DEPENDS_append_zynqmp-eg = " libmali-xlnx" | ||
| 7 | 6 | ||
| 8 | PACKAGE_ARCH_zynqmp-ev = "${SOC_VARIANT_ARCH}" | 7 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" |
| 9 | PACKAGE_ARCH_zynqmp-eg = "${SOC_VARIANT_ARCH}" | ||