weston: Update to 12.x

9.0.0 and 12.x no longer can use the same ARG8888 patch, break this up by
version.

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

5 files changed, 42 insertions, 4 deletions

diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
index 4a9bae3b..2713de2d 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
@@ -7,7 +7,11 @@ Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same
 as opaque substitute.
 
 Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-Status : Inappropriate [Xilinx specific]
+Upstream-Status: Inappropriate [Xilinx specific]
+
+Reworked the patch for the newer weston
+
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
 ---
  libweston/pixel-formats.c | 1 -
  1 file changed, 1 deletion(-)
diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
new file mode 100644
index 00000000..6b5f53b0
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/files/9.0.0/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
@@ -0,0 +1,29 @@
+From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001
+From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
+Date: Fri, 11 Dec 2020 16:21:38 -0800
+Subject: [PATCH] libweston: Remove substitute format for ARGB8888
+
+Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same
+as opaque substitute.
+
+Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
+Upstream-Status: Inappropriate [Xilinx specific]
+---
+ libweston/pixel-formats.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
+index 79dc709..ec2d3b7 100644
+--- a/libweston/pixel-formats.c
++++ b/libweston/pixel-formats.c
+@@ -193,7 +193,6 @@ static const struct pixel_format_info pixel_format_table[] = {
+        {
+                DRM_FORMAT(ARGB8888),
+                BITS_RGBA_FIXED(8, 8, 8, 8),
+-               .opaque_substitute = DRM_FORMAT_XRGB8888,
+                .depth = 32,
+                .bpp = 32,
+                GL_FORMAT(GL_BGRA_EXT),
+-- 
+2.17.1
+
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston.inc
index edb77fc5..7ecd6e44 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston.inc
@@ -1,5 +1,3 @@
-FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
-
 SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
 
 # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_12.%.bbappend
index 18396c5e..3ee9cafa 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_12.%.bbappend
@@ -1,8 +1,12 @@
+FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
+
+require weston.inc
+
 ZYNQMP_WARN_DEFAULT = "0"
 ZYNQMP_WARN_DEFAULT:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '0', d)}"
 ZYNQMP_WARN = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${ZYNQMP_WARN_DEFAULT}', '0', d)}"
 
 python() {
     if d.getVar('ZYNQMP_WARN') == "1":
-        raise bb.parse.SkipRecipe("Weston 10.0.0.2 requires GLES 3 interfaces which are not available when libmali enabled.  Use Weston 9.0.0.0 instead.")
+        raise bb.parse.SkipRecipe("Weston %s requires GLES 3 interfaces which are not available when libmali enabled.  Use Weston 9.0.0.0 instead." % (d.getVar('PV')))
 }
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend
new file mode 100644
index 00000000..80512ac3
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files/9.0.0:${THISDIR}/files:"
+
+require weston.inc