weston: sync with meta-fsl-bsp-release branch sumo-4.14.98-2.1.0

Update SRCREV and remove outdated patches.

https://jira.digi.com/browse/DEL-6722

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>

meta-digi-dey/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch

@@ -1,26 +0,0 @@
-From 186ec0c80410b2120b8f31c211cb44a836c84522 Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Wed, 4 Jul 2018 16:05:20 +0800
-Subject: [PATCH] weston.ini: using argb8888 as gbm default on mscale 850D
-
-mscale 850D video playback need using pixel alpha for graphic layer
-
-upstream status: imx specific
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
-
----
- weston.ini.in | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: git/weston.ini.in
-===================================================================
---- git.orig/weston.ini.in
-+++ git/weston.ini.in
-@@ -2,6 +2,7 @@
- # i.MX: Disable idle timeout
- idle-time=0
- #use-g2d=1
-+gbm-format=argb8888
- 
- [libinput]
- touchscreen_calibrator=true

meta-digi-dey/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch

@@ -1,28 +0,0 @@
-From 3012798d7e9c9e624024fc962d749a960289ad8b Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Wed, 11 Jul 2018 17:47:47 +0800
-Subject: [PATCH] weston.ini: configure desktop shell size in weston configure
- file
-
-mscale 850D need set desktop shell to 1080p
-
-upstream status: imx specific
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
-
----
- weston.ini.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/weston.ini.in b/weston.ini.in
-index bd8abe4..077155b 100644
---- a/weston.ini.in
-+++ b/weston.ini.in
-@@ -8,6 +8,8 @@ gbm-format=argb8888
- #mode=1920x1080@60
- #transform=90
- 
-+[shell]
-+size=1920x1080
- 
- #[output]
- #name=HDMI-A-2

meta-digi-dey/recipes-graphics/wayland/weston_5.0.0.imx.bb

@@ -17,11 +17,7 @@ SRC_URI = "${WESTON_SRC};branch=${SRCBRANCH} \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
            file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \
 "
-# Use argb8888 as gbm-format for i.MX8MQ only
-SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \
-                         file://0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch \
-"
-SRCREV = "fb563901657b296c7c7c86d26602a622429e334f"
+SRCREV = "b85441fbc9e321931fb7ca833555d740beca054d"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
@@ -111,6 +107,17 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl"
 # Weston with imxgpu hardware
 PACKAGECONFIG[imxgpu] = "--enable-imxgpu,--disable-imxgpu"
 
+SOCNAME       = "none"
+SOCNAME_mx8mq = "8mq"
+SOCNAME_mx8mm = "8mm"
+
+uncomment() {
+    if ! (grep "^#$1" $2); then
+        bbfatal "Commented setting '#$1' not found in file $PWD/$2"
+    fi
+    sed -i -e 's,^#'"$1"','"$1"',g' $2
+}
+
 do_install_append() {
     # Weston doesn't need the .la files to load modules, so wipe them
     rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la
@@ -137,6 +144,18 @@ do_install_append() {
     if [ -z "${@bb.utils.filter('BBFILE_COLLECTIONS', 'aglprofilegraphical', d)}" ]; then
         install -d ${WESTON_INI_DEST_DIR}
         install -m 0644 ${WESTON_INI_SRC} ${WESTON_INI_DEST_DIR}
+        cd ${WESTON_INI_DEST_DIR}
+        case ${SOCNAME} in
+        8mq)
+            uncomment "gbm-format=argb8888" weston.ini
+            uncomment "\\[shell\\]"         weston.ini
+            uncomment "size=1920x1080"      weston.ini
+            ;;
+        8mm)
+            uncomment "use-g2d=1"           weston.ini
+            ;;
+        esac
+        cd -
     fi
 }