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
Signed-off-by: Denys Dmytriyenko <[email protected]> --- ...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%) diff --git a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch index c6ddf8a1f9..d402fbf8b4 100644 --- a/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ b/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -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)) diff --git a/meta/recipes-graphics/wayland/wayland/0001-tests-Remove-event_loop_timer-test.patch b/meta/recipes-graphics/wayland/wayland/0001-tests-Remove-event_loop_timer-test.patch index e662d6cfd2..b225bec96d 100644 --- a/meta/recipes-graphics/wayland/wayland/0001-tests-Remove-event_loop_timer-test.patch +++ b/meta/recipes-graphics/wayland/wayland/0001-tests-Remove-event_loop_timer-test.patch @@ -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; diff --git a/meta/recipes-graphics/wayland/wayland_1.24.0.bb b/meta/recipes-graphics/wayland/wayland_1.25.0.bb 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 --- a/meta/recipes-graphics/wayland/wayland_1.24.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.25.0.bb @@ -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+)" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236520): https://lists.openembedded.org/g/openembedded-core/message/236520 Mute This Topic: https://lists.openembedded.org/mt/119165708/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
