4 files changed, 6 insertions, 72 deletions

diff --git a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
index 676d0338..39439ce1 100644
--- a/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
+++ b/recipes-graphics/wayland/weston/0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch
@@ -1,4 +1,4 @@
-From 77eba6f6b04ff21b77c41500657495b4fd12a5f6 Mon Sep 17 00:00:00 2001
+From 3aa4024ac4107e68552be4dfe5fce511900629c9 Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Mon, 11 Jul 2022 19:38:19 +0000
 Subject: [PATCH] Revert "protocol: no found wayland-scanner with Yocto
@@ -26,7 +26,7 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/protocol/meson.build b/protocol/meson.build
-index bdd322ac..e50b23bb 100644
+index e8698530..ba52089b 100644
 --- a/protocol/meson.build
 +++ b/protocol/meson.build
 @@ -1,4 +1,4 @@
@@ -34,7 +34,7 @@ index bdd322ac..e50b23bb 100644
 +dep_scanner = dependency('wayland-scanner', native: true)
  prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
  
- dep_wp = dependency('wayland-protocols', version: '>= 1.24')
+ dep_wp = dependency('wayland-protocols', version: '>= 1.26',
 -- 
-2.17.1
+2.25.1
 
diff --git a/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch b/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch
deleted file mode 100644
index b9cb31fb..00000000
--- a/recipes-graphics/wayland/weston/0001-g2d-renderer.c-Include-sys-stat.h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4afe9b2f9ef24ce0c9bf1cd41f94ca45afa4f445 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 12 Sep 2022 20:58:14 -0700
-Subject: [PATCH] g2d-renderer.c: Include sys/stat.h
-
-This is needed for getting stat() prototype, its flagged with clang-15
-as error.
-
-| ../git/libweston/renderer-g2d/g2d-renderer.c:2057:6: error: call to undeclared function 'stat'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-|         if (stat(gr->drm_device, &dev_stat) != 0) {
-|             ^
-| 1 error generated.
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libweston/renderer-g2d/g2d-renderer.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c
-index f59fc4ee..36a458fc 100644
---- a/libweston/renderer-g2d/g2d-renderer.c
-+++ b/libweston/renderer-g2d/g2d-renderer.c
-@@ -41,6 +41,7 @@
- #include <drm_fourcc.h>
- #include <poll.h>
- #include <errno.h>
-+#include <sys/stat.h> /* stat() */
- 
- #include <libweston/libweston.h>
- #include "g2d-renderer.h"
--- 
-2.37.3
-
diff --git a/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch b/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch
deleted file mode 100644
index 46538600..00000000
--- a/recipes-graphics/wayland/weston/0001-tests-Add-dependency-on-screenshooter-client-protoco.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2ac6b6b084a877adde64db7faff2ed22eb3ea97a Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Tue, 8 Feb 2022 22:39:42 +0000
-Subject: [PATCH] tests: Add dependency on screenshooter client protocol
-
-Given that the test-helper code relies on the screenshooter protocol,
-make sure it's available for us to build, and the dependency ensures we
-build in order.
-
-Fixes: #588
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
----
- tests/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 2d464ddcc..222091cd1 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -29,8 +29,9 @@ lib_test_client = static_library(
-                'weston-test-client-helper.c',
-                'weston-test-fixture-compositor.c',
-                weston_test_client_protocol_h,
--               weston_screenshooter_protocol_c,
-                weston_test_protocol_c,
-+               weston_screenshooter_client_protocol_h,
-+               weston_screenshooter_protocol_c,
-                viewporter_client_protocol_h,
-                viewporter_protocol_c,
-                'color_util.h',
-
-
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start
index db384b1a..342ac8d1 100644
--- a/recipes-graphics/wayland/weston/xwayland.weston-start
+++ b/recipes-graphics/wayland/weston/xwayland.weston-start
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 if type Xwayland  >/dev/null 2>/dev/null; then
-        mkdir -p /tmp/.X11-unix
+        mkdir -m 775 -p /tmp/.X11-unix
+        chown root:video /tmp/.X11-unix
 fi