[2/2] weston: upgrade 15.0.0 -> 15.0.1

diff --git a/meta/recipes-graphics/wayland/weston/0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch b/meta/recipes-graphics/wayland/weston/0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch
deleted file mode 100644
index 4c9b740bd2..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
-From 5c49563ef49a502a6b8fae44f8778e109d32c2d9 Mon Sep 17 00:00:00 2001
-From: Robert Mader <robert.mader@collabora.com>
-Date: Mon, 2 Mar 2026 13:11:05 +0100
-Subject: [PATCH] gl-shaders: Remove asserts relying on shader compiler
- behavior
-
-yuv_coefficients and yuv_offsets should get optimized away by shader
-compilers as the related code paths can never be reached. This seems to
-work well on Mesa but not necessarily with other drivers.
-
-While on it, assert that the uniforms *are* present, unless the
-yuv-to-rgb conversion is handled by the driver.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/commit/5c49563ef49a502a6b8fae44f8778e109d32c2d9]
-Signed-off-by: Robert Mader <robert.mader@collabora.com>
----
- libweston/renderer-gl/gl-shaders.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/libweston/renderer-gl/gl-shaders.c b/libweston/renderer-gl/gl-shaders.c
-index 98041882..18eeedf6 100644
---- a/libweston/renderer-gl/gl-shaders.c
-+++ b/libweston/renderer-gl/gl-shaders.c
-@@ -762,8 +762,18 @@ gl_shader_load_config_representation(struct weston_compositor *compositor,
- 
- 	if (sconf->yuv_coefficients == WESTON_COLOR_MATRIX_COEF_UNSET ||
- 	    sconf->yuv_coefficients == WESTON_COLOR_MATRIX_COEF_IDENTITY) {
--		assert(shader->yuv_coefficients_uniform == -1);
--		assert(shader->yuv_offsets_uniform == -1);
-+		/*
-+		 * In this case the yuv_coefficients and yuv_offsets uniforms
-+		 * should never be used and thus get optimized away by the
-+		 * shader compiler. Unfortunately on some drivers this is not
-+		 * the case, so we can't assert on it.
-+		 */
-+		return;
-+	}
-+
-+	if (shader->yuv_coefficients_uniform == -1 ||
-+	    shader->yuv_offsets_uniform == -1) {
-+		assert(shader->key.variant == SHADER_VARIANT_EXTERNAL);
- 		return;
- 	}
- 
--- 
-2.34.1
-
diff --git a/meta/recipes-graphics/wayland/weston/0001-vulkan-renderer-guard-surface-output-creation-with-b.patch b/meta/recipes-graphics/wayland/weston/0001-vulkan-renderer-guard-surface-output-creation-with-b.patch
deleted file mode 100644
index 2d69ae2106..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-vulkan-renderer-guard-surface-output-creation-with-b.patch
+++ /dev/null
@@ -1,151 +0,0 @@ 
-From ba10e6d81462fc8628dd340ba9404e13745eae18 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Thu, 5 Mar 2026 17:29:06 +0100
-Subject: [PATCH] vulkan-renderer: guard surface output creation with backend
- defines
-
-Fix compilation errors when compiling with x11 or wayland backends
-disabled or not available.
-
-Fixes: 8f56d03d ("libweston: Vulkan renderer")
-
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
-Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/weston/commit/?id=ba10e6d81]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
----
- .../vulkan-renderer-internal.h                | 17 ++++++++++----
- libweston/renderer-vulkan/vulkan-renderer.c   | 22 +++++++++++++++----
- 2 files changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/libweston/renderer-vulkan/vulkan-renderer-internal.h b/libweston/renderer-vulkan/vulkan-renderer-internal.h
-index aadfc6e4..f8604227 100644
---- a/libweston/renderer-vulkan/vulkan-renderer-internal.h
-+++ b/libweston/renderer-vulkan/vulkan-renderer-internal.h
-@@ -35,17 +35,21 @@
- #include <stdbool.h>
- #include <time.h>
- 
--#include <wayland-util.h>
- #include <vulkan/vulkan.h>
- #include "shared/helpers.h"
- #include "libweston/libweston.h"
- #include "libweston/libweston-internal.h"
--#include <xcb/xcb.h>
- 
--#define VK_USE_PLATFORM_XCB_KHR
-+#if defined(BUILD_WAYLAND_COMPOSITOR)
- #define VK_USE_PLATFORM_WAYLAND_KHR
- #include <vulkan/vulkan_wayland.h>
-+#endif
-+
-+#if defined(BUILD_X11_COMPOSITOR)
-+#define VK_USE_PLATFORM_XCB_KHR
-+#include <xcb/xcb.h>
- #include <vulkan/vulkan_xcb.h>
-+#endif
- 
- #define MAX_NUM_IMAGES 5
- #define MAX_CONCURRENT_FRAMES 2
-@@ -173,10 +177,15 @@ struct vulkan_renderer {
- 	struct wl_list pipeline_list;
- 	struct dmabuf_allocator *allocator;
- 
-+#if defined(BUILD_WAYLAND_COMPOSITOR)
- 	PFN_vkCreateWaylandSurfaceKHR create_wayland_surface;
--	PFN_vkCreateXcbSurfaceKHR create_xcb_surface;
- 	PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR get_wayland_presentation_support;
-+#endif
-+
-+#if defined(BUILD_X11_COMPOSITOR)
-+	PFN_vkCreateXcbSurfaceKHR create_xcb_surface;
- 	PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR get_xcb_presentation_support;
-+#endif
- 
- 	PFN_vkGetImageMemoryRequirements2KHR get_image_memory_requirements2;
- 	PFN_vkGetMemoryFdPropertiesKHR get_memory_fd_properties;
-diff --git a/libweston/renderer-vulkan/vulkan-renderer.c b/libweston/renderer-vulkan/vulkan-renderer.c
-index 9f701913..b15eff46 100644
---- a/libweston/renderer-vulkan/vulkan-renderer.c
-+++ b/libweston/renderer-vulkan/vulkan-renderer.c
-@@ -303,16 +303,20 @@ static const struct vulkan_extension_table vulkan_inst_ext_table[] = {
- 		.name = VK_KHR_SURFACE_EXTENSION_NAME,
- 		.flag = EXTENSION_KHR_SURFACE,
- 	},
-+#if defined(BUILD_WAYLAND_COMPOSITOR)
- 	{
- 		.name = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
- 		.flag = EXTENSION_KHR_WAYLAND_SURFACE,
- 		.instance_dep = EXTENSION_KHR_SURFACE,
- 	},
-+#endif
-+#if defined(BUILD_X11_COMPOSITOR)
- 	{
- 		.name = VK_KHR_XCB_SURFACE_EXTENSION_NAME,
- 		.flag = EXTENSION_KHR_XCB_SURFACE,
- 		.instance_dep = EXTENSION_KHR_SURFACE,
- 	},
-+#endif
- };
- 
- /* Keep in sync with vulkan-renderer-internal.h. */
-@@ -3455,9 +3459,12 @@ vulkan_renderer_output_window_create_swapchain(struct weston_output *output,
- 	struct vulkan_renderer *vr = get_renderer(ec);
- 	struct vulkan_output_state *vo = get_output_state(output);
- 	VkResult result;
--	VkBool32 supported;
-+	VkBool32 supported = 0;
- 	assert(vulkan_instance_has(vr, EXTENSION_KHR_SURFACE));
- 
-+	vo->swapchain.surface = VK_NULL_HANDLE;
-+
-+#if defined(BUILD_WAYLAND_COMPOSITOR)
- 	if (options->wayland_display && options->wayland_surface) {
- 		assert(vulkan_instance_has(vr, EXTENSION_KHR_WAYLAND_SURFACE));
- 
-@@ -3472,7 +3479,10 @@ vulkan_renderer_output_window_create_swapchain(struct weston_output *output,
- 		result = vr->create_wayland_surface(vr->inst, &wayland_surface_create_info, NULL,
- 						    &vo->swapchain.surface);
- 		check_vk_success(result, "vkCreateWaylandSurfaceKHR");
--	} else if (options->xcb_connection && options->xcb_window) {
-+	}
-+#endif
-+#if defined(BUILD_X11_COMPOSITOR)
-+	if (options->xcb_connection && options->xcb_window) {
- 		assert(vulkan_instance_has(vr, EXTENSION_KHR_XCB_SURFACE));
- 
- 		supported = vr->get_xcb_presentation_support(vr->phys_dev, 0, options->xcb_connection, options->xcb_visualid);
-@@ -3486,9 +3496,9 @@ vulkan_renderer_output_window_create_swapchain(struct weston_output *output,
- 		result = vr->create_xcb_surface(vr->inst, &xcb_surface_create_info, NULL,
- 						&vo->swapchain.surface);
- 		check_vk_success(result, "vkCreateXcbSurfaceKHR");
--	} else {
--		assert(0);
- 	}
-+#endif
-+	assert(vo->swapchain.surface != VK_NULL_HANDLE);
- 
- 	vkGetPhysicalDeviceSurfaceSupportKHR(vr->phys_dev, 0, vo->swapchain.surface, &supported);
- 	assert(supported);
-@@ -4190,15 +4200,19 @@ load_instance_proc(struct vulkan_renderer *vr, const char *func, void *proc_ptr)
- static void
- vulkan_renderer_setup_instance_extensions(struct vulkan_renderer *vr)
- {
-+#if defined(BUILD_WAYLAND_COMPOSITOR)
- 	if (vulkan_instance_has(vr, EXTENSION_KHR_WAYLAND_SURFACE)) {
- 		load_instance_proc(vr, "vkCreateWaylandSurfaceKHR", &vr->create_wayland_surface);
- 		load_instance_proc(vr, "vkGetPhysicalDeviceWaylandPresentationSupportKHR", &vr->get_wayland_presentation_support);
- 	}
-+#endif
- 
-+#if defined(BUILD_X11_COMPOSITOR)
- 	if (vulkan_instance_has(vr, EXTENSION_KHR_XCB_SURFACE)) {
- 		load_instance_proc(vr, "vkCreateXcbSurfaceKHR", &vr->create_xcb_surface);
- 		load_instance_proc(vr, "vkGetPhysicalDeviceXcbPresentationSupportKHR", &vr->get_xcb_presentation_support);
- 	}
-+#endif
- }
- 
- static void
--- 
-2.51.0
-
diff --git a/meta/recipes-graphics/wayland/weston_15.0.0.bb b/meta/recipes-graphics/wayland/weston_15.0.1.bb
similarity index 96%
rename from meta/recipes-graphics/wayland/weston_15.0.0.bb
rename to meta/recipes-graphics/wayland/weston_15.0.1.bb
index da347659f1..c4158e7ea3 100644
--- a/meta/recipes-graphics/wayland/weston_15.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_15.0.1.bb
@@ -7,15 +7,13 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     "
 
 SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
-           file://0001-vulkan-renderer-guard-surface-output-creation-with-b.patch \
-           file://0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
            file://systemd-notify.weston-start \
            "
 
-SRC_URI[sha256sum] = "58c6186d29a5d2f0be0dec4882af71cc190a11da803f6ed1bf0b2c74120da973"
+SRC_URI[sha256sum] = "551d039bfb0c837ba5a4d027cdb8ee16bded0eedb789821f8025d8a64b791f6d"
 
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
 UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"