Skip to contentSkip to conversation

wayland: upgrade 1.24.0 -> 1.25.0

PATCH In review Denys Dmytriyenko 2 participants 3 messages May 5

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 wayland: upgrade 1.24.0 -> 1.25.0

Massage existing patches to remove fuzz and apply to the new version.

Release notes:
https://lore.freedesktop.org/wayland-devel/Xc5mzCaUxqhO0w-Dls241-PmLXWdFT2DLLkz0Lhr4LAhDTZxiZfrDZeq9lCGGn2V8nxqcMZDTn6vSCdClRYkQ7vCUMPKwQokYhCjf93xRx4=@emersion.fr/T/#u

---
 ...build-Fix-strndup-detection-on-MinGW.patch |  7 +++---
 ...1-tests-Remove-event_loop_timer-test.patch | 24 +++++++++----------
 .../{wayland_1.24.0.bb => wayland_1.25.0.bb}  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland_1.24.0.bb => wayland_1.25.0.bb} (96%)
meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +4 -3
index c6ddf8a1f9..d402fbf8b4 100644
@@ -1,4 +1,4 @@
-From a90bfa622f7323074c715674b368cba80bc7d196 Mon Sep 17 00:00:00 2001
+From b4a3b9f913e06f9b71966cd695df1ab14a031ed0 Mon Sep 17 00:00:00 2001
 From: Joshua Watt <[email protected]>
 Date: Thu, 20 Feb 2020 15:20:45 -0600
 Subject: [PATCH] build: Fix strndup detection on MinGW
@@ -20,14 +20,15 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 8e28f2a..b56ba91 100644
+index 33653e7..e05eaef 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -45,11 +45,11 @@ have_funcs = [
+@@ -49,12 +49,12 @@ have_funcs = [
  	'prctl',
  	'memfd_create',
  	'mremap',
 -	'strndup',
+ 	'gettid',
  ]
  foreach f: have_funcs
  	config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
meta/recipes-graphics/wayland/wayland/0001-tests-Remove-event_loop_timer-test.patch +11 -13
index e662d6cfd2..b225bec96d 100644
@@ -1,4 +1,4 @@
-From 61fa7e7d9c282798988907cf3b8928c88d7a7930 Mon Sep 17 00:00:00 2001
+From 46da8d01e695f415aeb4a8442dbc13ae0898912c Mon Sep 17 00:00:00 2001
 From: Joshua Watt <[email protected]>
 Date: Thu, 6 Nov 2025 08:35:26 -0700
 Subject: [PATCH] tests: Remove event_loop_timer test
@@ -13,30 +13,28 @@ way to increase the timing constraints.
 
 Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Joshua Watt <[email protected]>
+Signed-off-by: Denys Dmytriyenko <[email protected]>
 ---
  tests/event-loop-test.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c
-index a51ba8f..0c39b09 100644
+index be15a34..3f5f476 100644
 --- a/tests/event-loop-test.c
 +++ b/tests/event-loop-test.c
-@@ -238,6 +238,7 @@ TEST(event_loop_multiple_same_signals)
- 	wl_event_loop_destroy(loop);
- }
+@@ -245,6 +245,7 @@ struct timer_update_context {
+ 	int count;
+ };
  
 +#if 0 /* Timing requirements are too tight for qemu testing */
  static int
- timer_callback(void *data)
+ timer_update_callback_1(void *data)
  {
-@@ -280,6 +281,7 @@ TEST(event_loop_timer)
- 	wl_event_source_remove(source2);
+@@ -323,6 +324,7 @@ TEST(event_loop_timer_updates)
+ 	wl_event_source_remove(context.source2);
  	wl_event_loop_destroy(loop);
  }
 +#endif
  
- #define MSEC_TO_USEC(msec) ((msec) * 1000)
- 
--- 
-2.51.1
-
+ struct timer_order_data {
+ 	struct wl_event_source *source;
meta/recipes-graphics/wayland/wayland_1.25.0.bb renamed from meta/recipes-graphics/wayland/wayland_1.24.0.bb +1 -1
similarity index 96%
rename from meta/recipes-graphics/wayland/wayland_1.24.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.25.0.bb
index de7ee516bb..a0bc13df56 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downl
            file://0001-build-Fix-strndup-detection-on-MinGW.patch \
            file://0001-tests-Remove-event_loop_timer-test.patch \
            "
-SRC_URI[sha256sum] = "82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536"
+SRC_URI[sha256sum] = "c065f040afdff3177680600f249727e41a1afc22fccf27222f15f5306faa1f03"
 
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags"
 UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 weston: upgrade 15.0.0 -> 15.0.1

Remove previously backported patches.

Release notes:
https://lore.freedesktop.org/wayland-devel/aespQ3LKAOy5O3Hx@xpredator/T/#u

---
 ...e-asserts-relying-on-shader-compiler.patch |  47 ------
 ...guard-surface-output-creation-with-b.patch | 151 ------------------
 .../{weston_15.0.0.bb => weston_15.0.1.bb}    |   4 +-
 3 files changed, 1 insertion(+), 201 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-vulkan-renderer-guard-surface-output-creation-with-b.patch
 rename meta/recipes-graphics/wayland/{weston_15.0.0.bb => weston_15.0.1.bb} (96%)
meta/recipes-graphics/wayland/weston/0001-gl-shaders-Remove-asserts-relying-on-shader-compiler.patch deleted +0 -47
deleted file mode 100644
index 4c9b740bd2..0000000000
@@ -1,47 +0,0 @@
-From 5c49563ef49a502a6b8fae44f8778e109d32c2d9 Mon Sep 17 00:00:00 2001
-From: Robert Mader <[email protected]>
-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 <[email protected]>
----
- 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
-
meta/recipes-graphics/wayland/weston/0001-vulkan-renderer-guard-surface-output-creation-with-b.patch deleted +0 -151

151 lines not on this page · raw message

meta/recipes-graphics/wayland/weston_15.0.1.bb renamed from meta/recipes-graphics/wayland/weston_15.0.0.bb +1 -3
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
@@ -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+)"
Signature · 1 line
2.25.1
#2 lore raw

Patchtest results for [PATCH 1/2] wayland: upgrade 1.24.0 -> 1.25.0

In reply to Denys Dmytriyenko

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/1-2-wayland-upgrade-1.24.0---1.25.0.patch

FAIL: test commit message user tags: Mbox includes one or more GitHub-style username tags. Ensure that any "@" symbols are stripped out of usernames (test_mbox.TestMbox.test_commit_message_user_tags)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!