[v2,44/44] weston: upgrade 10.0.1 -> 10.0.2

Drop dont-use-plane-add-prop.patch as issue is fixed elsewhere
(see the link in the patch).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../weston/dont-use-plane-add-prop.patch      | 32 -------------------
 .../{weston_10.0.1.bb => weston_10.0.2.bb}    |  4 +--
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
 rename meta/recipes-graphics/wayland/{weston_10.0.1.bb => weston_10.0.2.bb} (97%)

On 8/7/22 11:42 PM, Alexander Kanavin wrote:
> Drop dont-use-plane-add-prop.patch as issue is fixed elsewhere
> (see the link in the patch).
> 

I think this needs some verification if this implied patch really fixes 
the problem. I will see if I can test it out in coming week.

> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../weston/dont-use-plane-add-prop.patch      | 32 -------------------
>   .../{weston_10.0.1.bb => weston_10.0.2.bb}    |  4 +--
>   2 files changed, 1 insertion(+), 35 deletions(-)
>   delete mode 100644 meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
>   rename meta/recipes-graphics/wayland/{weston_10.0.1.bb => weston_10.0.2.bb} (97%)
> 
> diff --git a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
> deleted file mode 100644
> index 1ac0695222..0000000000
> --- a/meta/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From ece4c3d261aeec230869c0304ed1011ff6837c16 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 12 Sep 2020 14:04:04 -0700
> -Subject: [PATCH] Fix atomic modesetting with musl
> -
> -atomic modesetting seems to fail with drm weston backend and this patch fixes
> -it, below errors are seen before weston exits
> -
> -atomic: couldn't commit new state: Invalid argument
> -
> -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ----
> - libweston/backend-drm/kms.c | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/libweston/backend-drm/kms.c b/libweston/backend-drm/kms.c
> -index 780d007..9994da1 100644
> ---- a/libweston/backend-drm/kms.c
> -+++ b/libweston/backend-drm/kms.c
> -@@ -1142,8 +1142,8 @@ drm_pending_state_apply_atomic(struct drm_pending_state *pending_state,
> - 		wl_list_for_each(plane, &b->plane_list, link) {
> - 			drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n",
> - 				  (unsigned long) plane->plane_id);
> --			plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
> --			plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
> -+			//plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0);
> -+			//plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0);
> - 		}
> -
> - 		flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
> diff --git a/meta/recipes-graphics/wayland/weston_10.0.1.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb
> similarity index 97%
> rename from meta/recipes-graphics/wayland/weston_10.0.1.bb
> rename to meta/recipes-graphics/wayland/weston_10.0.2.bb
> index e27dac164e..f81a33fd1e 100644
> --- a/meta/recipes-graphics/wayland/weston_10.0.1.bb
> +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb
> @@ -13,9 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo
>              file://systemd-notify.weston-start \
>              "
>   
> -SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch "
> -
> -SRC_URI[sha256sum] = "8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115"
> +SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7"
>   
>   UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#169068): https://lists.openembedded.org/g/openembedded-core/message/169068
> Mute This Topic: https://lists.openembedded.org/mt/92887040/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>