weston: The package uses different sources when build on zynqmp

Issue: CR-1099768

Combine two different weston bbappends to avoid confusion and conflicts
between the two.

Adjust the parameters of the original bbappend to use the mali400 override,
as well as define a new zynqmp (non-mali) PACKAGE_ARCH due to the SRC_URI
patch that is also zynqmp specific.

The end result will be:
  not-zynqmp:  TUNE_PKGARCH
  zynqmp w/o mali: SOC_FAMILY_ARCH
  zynqmp w/ mali: SOC_VARIANT_ARCH

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

5 files changed, 11 insertions, 9 deletions

diff --git a/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-bsp/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
index 33d33b0f..33d33b0f 100644
--- a/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini b/meta-xilinx-bsp/recipes-graphics/wayland/files/weston.ini
index 2ff81795..2ff81795 100644
--- a/meta-xilinx-bsp/recipes-graphics/weston/files/weston.ini
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/files/weston.ini
diff --git a/meta-xilinx-bsp/recipes-graphics/weston/weston-init%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
index aaee7f5d..aaee7f5d 100644
--- a/meta-xilinx-bsp/recipes-graphics/weston/weston-init%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
index 9644aa1b..19d8ac6c 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
@@ -1,9 +1,14 @@
+FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:"
+
+SRC_URI_append_zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
+
 # OpenGL comes from libmali on ev/eg, when egl is enabled
-DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}"
-PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+DEPENDS_append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-DEPENDS_append_zynqmp-ev = " ${DEPENDS_MALI_XLNX}"
-DEPENDS_append_zynqmp-eg = " ${DEPENDS_MALI_XLNX}"
+# Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
+SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}"
+ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}"
+# But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali
+ZYNQMP_PKGARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}"
 
-PACKAGE_ARCH_zynqmp-ev = "${PKG_ARCH_XLNX}"
-PACKAGE_ARCH_zynqmp-eg = "${PKG_ARCH_XLNX}"
+PACKAGE_ARCH_zynqmp = "${ZYNQMP_PKGARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend
deleted file mode 100644
index d1912a81..00000000
--- a/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:"
-
-SRC_URI_append_zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"