diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-12 14:54:38 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-15 13:52:07 -0800 |
| commit | 2f44ba5a42966ac2cee77485209ec239123d7aa5 (patch) | |
| tree | 0135c5185f8c6a99cf4a6fd3db767d58f6e726ca /meta-xilinx-bsp/recipes-graphics | |
| parent | cd447cabee3052ab4c084a55149f5d9a232b380d (diff) | |
| download | meta-xilinx-2f44ba5a42966ac2cee77485209ec239123d7aa5.tar.gz | |
Convert to new override syntax
Fix various overrides that have been missed in previous conversion.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/recipes-graphics')
7 files changed, 12 insertions, 12 deletions
diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend index 6343c38f..68805315 100644 --- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | PACKAGECONFIG_mali400 = "${@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 | 4 | # OpenGL comes from libmali |
| 5 | DEPENDS:append_mali400 = " libmali-xlnx" | 5 | DEPENDS:append:mali400 = " libmali-xlnx" |
| 6 | 6 | ||
| 7 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" | 7 | PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}" |
diff --git a/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend index c3f773d6..bb792de2 100644 --- a/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | # Has a dependency on libmali | 1 | # Has a dependency on libmali |
| 2 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" | 2 | PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}" |
diff --git a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend index 47cefc74..54fb4298 100644 --- a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | # OpenGL comes from libmali, adjust parameters | 1 | # OpenGL comes from libmali, adjust parameters |
| 2 | DEPENDS:append_mali400 = " virtual/libgles2" | 2 | DEPENDS:append:mali400 = " virtual/libgles2" |
| 3 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" | 3 | PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}" |
diff --git a/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend index fd8a07e2..c3b20716 100644 --- a/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | # Has a dependency on libmali | 1 | # Has a dependency on libmali |
| 2 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" | 2 | PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}" |
| 3 | 3 | ||
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend index af5dec9e..ca910830 100644 --- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend | |||
| @@ -1,4 +1,4 @@ | |||
| 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 | DEPENDS:append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}" | 2 | DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}" |
| 3 | 3 | ||
| 4 | PACKAGE_ARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" | 4 | PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" |
diff --git a/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend b/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend index c3f773d6..bb792de2 100644 --- a/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | # Has a dependency on libmali | 1 | # Has a dependency on libmali |
| 2 | PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}" | 2 | PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}" |
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend index 26b3d389..caa49063 100644 --- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend | |||
| @@ -3,12 +3,12 @@ FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" | |||
| 3 | SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" | 3 | SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" |
| 4 | 4 | ||
| 5 | # OpenGL comes from libmali on ev/eg, when egl is enabled | 5 | # OpenGL comes from libmali on ev/eg, when egl is enabled |
| 6 | DEPENDS:append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}" | 6 | DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}" |
| 7 | 7 | ||
| 8 | # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific | 8 | # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific |
| 9 | SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}" | 9 | SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}" |
| 10 | ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}" | 10 | ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}" |
| 11 | # But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali | 11 | # But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali |
| 12 | ZYNQMP_PKGARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}" | 12 | ZYNQMP_PKGARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}" |
| 13 | 13 | ||
| 14 | PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}" | 14 | PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}" |
