From 373ca6b1b16e798333c038980df2b7a56a54d4f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:08:37 +0000 Subject: [PATCH 01/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index a4fe887..b20f820 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -5,7 +5,7 @@ Name: wlroots Version: 0.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -140,6 +140,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.18.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 11 2024 Aleksei Bavshin - 0.18.2-1 - Update to 0.18.2 (#2331871) From f55f4ba70e948503974ed0843a59486edf1f4542 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 10 Feb 2025 09:59:49 -0500 Subject: [PATCH 02/18] Rebuild for libdisplay-info 0.2.0 Rebuild for libdisplay-info 0.2.0 --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index b20f820..c7b4953 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -5,7 +5,7 @@ Name: wlroots Version: 0.18.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -140,6 +140,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Mon Feb 10 2025 Neal Gompa - 0.18.2-3 +- Rebuild for libdisplay-info 0.2.0 + * Sun Jan 19 2025 Fedora Release Engineering - 0.18.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6eb9ee592059f70eea4ca0e5cccee10899b25238 Mon Sep 17 00:00:00 2001 From: Sam Day Date: Sat, 15 Feb 2025 16:13:34 +0100 Subject: [PATCH 03/18] Add MR!4985 backport patch needed by phoc 0.45 This patch has already merged into mainline and the 0.18 branch upstream, but has not yet been released. It can be dropped in 0.18.3 Signed-off-by: Sam Day --- 4985.patch | 38 ++++++++++++++++++++++++++++++++++++++ wlroots.spec | 7 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 4985.patch diff --git a/4985.patch b/4985.patch new file mode 100644 index 0000000..96e4955 --- /dev/null +++ b/4985.patch @@ -0,0 +1,38 @@ +From d9818603142c42eea7d10fb656aaca857a179cf0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Mon, 27 Jan 2025 17:48:39 +0100 +Subject: [PATCH] seat: Don't forget to destroy touch points on touch up +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise the number of touch points goes up constantly and d'n'd via +touch can't work as validation always fails. + +Fixes 75ecba44 ("seat: add serials to touch up events") + +Signed-off-by: Guido Günther +(cherry picked from commit fef4f3637a5dfb7022887dfb36ccdd69932d2753) +--- + types/seat/wlr_seat_touch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/types/seat/wlr_seat_touch.c b/types/seat/wlr_seat_touch.c +index 09f33d667..cc5b7c826 100644 +--- a/types/seat/wlr_seat_touch.c ++++ b/types/seat/wlr_seat_touch.c +@@ -214,9 +214,10 @@ uint32_t wlr_seat_touch_notify_up(struct wlr_seat *seat, uint32_t time, + return 0; + } + +- return grab->interface->up(grab, time, point); ++ uint32_t serial = grab->interface->up(grab, time, point); + + touch_point_destroy(point); ++ return serial; + } + + void wlr_seat_touch_notify_motion(struct wlr_seat *seat, uint32_t time, +-- +GitLab + diff --git a/wlroots.spec b/wlroots.spec index c7b4953..917bad3 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -5,7 +5,7 @@ Name: wlroots Version: 0.18.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -40,6 +40,8 @@ Source3: examples.meson.build # Fedora patches # Following patch is required for phoc. Patch: Revert-layer-shell-error-on-0-dimension-without-anch.patch +# Needed by phoc 0.45.0+, can be dropped in wlroots 0.18.3 +Patch: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4985.patch BuildRequires: gcc BuildRequires: glslang @@ -140,6 +142,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sat Feb 15 2025 Sam Day - 0.18.2-4 +- Add wlroots!4985 patch needed by phoc 0.45.0 + * Mon Feb 10 2025 Neal Gompa - 0.18.2-3 - Rebuild for libdisplay-info 0.2.0 From 6442a76f36e2cd1e4df33da8a7a1a1e69c931391 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Fri, 16 May 2025 18:32:23 -0700 Subject: [PATCH 04/18] Update to 0.19.0 (#2359256) --- 4985.patch | 38 --------------- ...ll-error-on-0-dimension-without-anch.patch | 47 +++++++------------ sources | 4 +- wlroots.spec | 28 ++++++----- 4 files changed, 35 insertions(+), 82 deletions(-) delete mode 100644 4985.patch diff --git a/4985.patch b/4985.patch deleted file mode 100644 index 96e4955..0000000 --- a/4985.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d9818603142c42eea7d10fb656aaca857a179cf0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Guido=20G=C3=BCnther?= -Date: Mon, 27 Jan 2025 17:48:39 +0100 -Subject: [PATCH] seat: Don't forget to destroy touch points on touch up -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise the number of touch points goes up constantly and d'n'd via -touch can't work as validation always fails. - -Fixes 75ecba44 ("seat: add serials to touch up events") - -Signed-off-by: Guido Günther -(cherry picked from commit fef4f3637a5dfb7022887dfb36ccdd69932d2753) ---- - types/seat/wlr_seat_touch.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/types/seat/wlr_seat_touch.c b/types/seat/wlr_seat_touch.c -index 09f33d667..cc5b7c826 100644 ---- a/types/seat/wlr_seat_touch.c -+++ b/types/seat/wlr_seat_touch.c -@@ -214,9 +214,10 @@ uint32_t wlr_seat_touch_notify_up(struct wlr_seat *seat, uint32_t time, - return 0; - } - -- return grab->interface->up(grab, time, point); -+ uint32_t serial = grab->interface->up(grab, time, point); - - touch_point_destroy(point); -+ return serial; - } - - void wlr_seat_touch_notify_motion(struct wlr_seat *seat, uint32_t time, --- -GitLab - diff --git a/Revert-layer-shell-error-on-0-dimension-without-anch.patch b/Revert-layer-shell-error-on-0-dimension-without-anch.patch index 4df421b..a9112d9 100644 --- a/Revert-layer-shell-error-on-0-dimension-without-anch.patch +++ b/Revert-layer-shell-error-on-0-dimension-without-anch.patch @@ -1,44 +1,33 @@ -From ed19a7f8b2fb32e1919d7910041dac5f07fca75e Mon Sep 17 00:00:00 2001 +From e021326f7de0505fcae85f5732885848b21edf9c Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 25 Jun 2022 21:22:08 -0700 Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors" This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3. --- - types/wlr_layer_shell_v1.c | 20 -------------------- - 1 file changed, 20 deletions(-) + types/wlr_layer_shell_v1.c | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c -index a59f1104..75a19314 100644 +index 2d838498..c3c50d78 100644 --- a/types/wlr_layer_shell_v1.c +++ b/types/wlr_layer_shell_v1.c -@@ -335,26 +335,6 @@ static void layer_surface_role_client_commit(struct wlr_surface *wlr_surface) { - "layer_surface has never been configured"); +@@ -358,6 +358,7 @@ static void layer_surface_role_client_commit(struct wlr_surface *wlr_surface) { + + uint32_t anchor = surface->pending.anchor; + ++#if 0 + const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | + ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; + if (surface->pending.desired_width == 0 && (anchor & horiz) != horiz) { +@@ -375,6 +376,7 @@ static void layer_surface_role_client_commit(struct wlr_surface *wlr_surface) { + "height 0 requested without setting top and bottom anchors"); return; } -- -- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | -- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; -- if (surface->pending.desired_width == 0 && -- (surface->pending.anchor & horiz) != horiz) { -- wlr_surface_reject_pending(wlr_surface, surface->resource, -- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE, -- "width 0 requested without setting left and right anchors"); -- return; -- } -- -- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | -- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; -- if (surface->pending.desired_height == 0 && -- (surface->pending.anchor & vert) != vert) { -- wlr_surface_reject_pending(wlr_surface, surface->resource, -- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE, -- "height 0 requested without setting top and bottom anchors"); -- return; -- } - } ++#endif - static void layer_surface_role_commit(struct wlr_surface *wlr_surface) { + if ((anchor & surface->pending.exclusive_edge) != surface->pending.exclusive_edge) { + wlr_surface_reject_pending(wlr_surface, surface->resource, -- -2.45.2 +2.49.0 diff --git a/sources b/sources index 7ed4928..84d4aff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.18.2.tar.gz) = a03826f51dbca287ecbb217aadc361a1dedbbe5e225ee7b9ca22779456156c1035acaea7301ca509c410bfef9d0c33cf94cba140bba25d979608b14a99be8c8a -SHA512 (wlroots-0.18.2.tar.gz.sig) = 93716a0347eafa65675c257080152b0adb2f8145c63f4c1ee55ab3f3972f943dc9b103788cb19905536d7b9c7ff91be7826d82bde9c98666f48ee8fbcb70939b +SHA512 (wlroots-0.19.0.tar.gz) = f48055b9bf480f05c97d1d65597697ac9a68cc0529f09bd8667e86555eea5c4635613045076017f87dee6a1b72419b9828d3493991e563ac7b9e614684d7bcde +SHA512 (wlroots-0.19.0.tar.gz.sig) = cb9b2298c0a9529b439648e9cb73629a74e692fa8f076c7caa9857ef20b56fcc827e4bf6a76a3e5c7a4ab0f060e9ff474f2c3965734994e9a48e2ae19cbab882 diff --git a/wlroots.spec b/wlroots.spec index 917bad3..ee8434b 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -1,11 +1,12 @@ # Version of the .so library -%global abi_ver 0.18 +%global abi_ver 0.19 # libliftoff does not bump soname on API changes -%global liftoff_ver %[0%{?fedora} >= 41 ? "0.5.0" : "0.4.1" ] +%global liftoff_ver 0.5.0 +%global tag 0.19.0 Name: wlroots -Version: 0.18.2 -Release: 4%{?dist} +Version: 0.19.0 +Release: 1%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -25,8 +26,8 @@ Summary: A modular Wayland compositor library # the underlying licenses. License: MIT URL: https://gitlab.freedesktop.org/wlroots/wlroots -Source0: %{url}/-/releases/%{version}/downloads/%{name}-%{version}.tar.gz -Source1: %{url}/-/releases/%{version}/downloads/%{name}-%{version}.tar.gz.sig +Source0: %{url}/-/releases/%{tag}/downloads/%{name}-%{tag}.tar.gz +Source1: %{url}/-/releases/%{tag}/downloads/%{name}-%{tag}.tar.gz.sig # 0FDE7BE0E88F5E48: emersion Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rkjfnghbjxug6b19#/gpgkey-0FDE7BE0E88F5E48.gpg @@ -40,13 +41,11 @@ Source3: examples.meson.build # Fedora patches # Following patch is required for phoc. Patch: Revert-layer-shell-error-on-0-dimension-without-anch.patch -# Needed by phoc 0.45.0+, can be dropped in wlroots 0.18.3 -Patch: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4985.patch BuildRequires: gcc BuildRequires: glslang BuildRequires: gnupg2 -BuildRequires: meson >= 0.59.0 +BuildRequires: meson >= 1.3 BuildRequires: (pkgconfig(libdisplay-info) >= 0.1.1 with pkgconfig(libdisplay-info) < 0.3) BuildRequires: (pkgconfig(libliftoff) >= %{liftoff_ver} with pkgconfig(libliftoff) < 0.6) @@ -59,12 +58,12 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.122 BuildRequires: pkgconfig(libinput) >= 1.21.0 BuildRequires: pkgconfig(libseat) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(pixman-1) >= 0.42.0 +BuildRequires: pkgconfig(pixman-1) >= 0.43.0 BuildRequires: pkgconfig(vulkan) >= 1.2.182 BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.35 +BuildRequires: pkgconfig(wayland-protocols) >= 1.41 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.23 +BuildRequires: pkgconfig(wayland-server) >= 1.23.1 BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-composite) @@ -104,7 +103,7 @@ Development files for %{name}. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -N +%autosetup -N -n %{name}-%{tag} # apply unconditional patches (0..99) %autopatch -p1 -M99 # apply conditional patches (100..) @@ -142,6 +141,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Fri May 16 2025 Aleksei Bavshin - 0.19.0-1 +- Update to 0.19.0 (#2359256) + * Sat Feb 15 2025 Sam Day - 0.18.2-4 - Add wlroots!4985 patch needed by phoc 0.45.0 From b11c779550d1f668ae946d4767c86a303f4c2d3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:29:00 +0000 Subject: [PATCH 05/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index ee8434b..06a7bd2 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -6,7 +6,7 @@ Name: wlroots Version: 0.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -141,6 +141,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 16 2025 Aleksei Bavshin - 0.19.0-1 - Update to 0.19.0 (#2359256) From 00b7c19be8ac76e8ad1b4b419014c10a7f0f0cea Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 21 Sep 2025 14:52:42 -0700 Subject: [PATCH 06/18] Update to 0.19.1 (#2397203) --- sources | 4 ++-- wlroots.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 84d4aff..f5c8ac6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.19.0.tar.gz) = f48055b9bf480f05c97d1d65597697ac9a68cc0529f09bd8667e86555eea5c4635613045076017f87dee6a1b72419b9828d3493991e563ac7b9e614684d7bcde -SHA512 (wlroots-0.19.0.tar.gz.sig) = cb9b2298c0a9529b439648e9cb73629a74e692fa8f076c7caa9857ef20b56fcc827e4bf6a76a3e5c7a4ab0f060e9ff474f2c3965734994e9a48e2ae19cbab882 +SHA512 (wlroots-0.19.1.tar.gz) = 2aac7ca61d6bae71268b114a2348fcd4d5b5734e245c1e6decf5d8230ea24245e30e48f79634aaea2743b89a89721a8fb2d74cd5e9c8da8f1525f30d410b420c +SHA512 (wlroots-0.19.1.tar.gz.sig) = 60f53a1304106c8fb694048101c6ad881c52213681285cfd17505446659d90c033c5d79fe574a2296dd4a6e6cde71cb9737d030374f254b44407f853196ed475 diff --git a/wlroots.spec b/wlroots.spec index 06a7bd2..1e38508 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -2,11 +2,11 @@ %global abi_ver 0.19 # libliftoff does not bump soname on API changes %global liftoff_ver 0.5.0 -%global tag 0.19.0 +%global tag 0.19.1 Name: wlroots -Version: 0.19.0 -Release: 2%{?dist} +Version: 0.19.1 +Release: 1%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -47,13 +47,13 @@ BuildRequires: glslang BuildRequires: gnupg2 BuildRequires: meson >= 1.3 -BuildRequires: (pkgconfig(libdisplay-info) >= 0.1.1 with pkgconfig(libdisplay-info) < 0.3) BuildRequires: (pkgconfig(libliftoff) >= %{liftoff_ver} with pkgconfig(libliftoff) < 0.6) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) >= 17.1.0 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libdisplay-info) BuildRequires: pkgconfig(libdrm) >= 2.4.122 BuildRequires: pkgconfig(libinput) >= 1.21.0 BuildRequires: pkgconfig(libseat) @@ -141,6 +141,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sun Sep 21 2025 Aleksei Bavshin - 0.19.1-1 +- Update to 0.19.1 (#2397203) + * Fri Jul 25 2025 Fedora Release Engineering - 0.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a034b0be85a4db64b9365feac46cee1a8931a135 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 28 Sep 2025 14:39:43 -0700 Subject: [PATCH 07/18] Apply upstream patch for crash on disabling outputs --- ...end-commit-events-after-applying-all.patch | 73 +++++++++++++++++++ wlroots.spec | 6 +- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch diff --git a/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch b/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch new file mode 100644 index 0000000..17b8c8f --- /dev/null +++ b/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch @@ -0,0 +1,73 @@ +From 7392b3313a7b483c61f4fea648ba8f2aa4ce8798 Mon Sep 17 00:00:00 2001 +From: Simon Ser +Date: Tue, 12 Aug 2025 19:00:11 +0200 +Subject: [PATCH] backend, output: send commit events after applying all in + wlr_backend_commit() + +We were iterating over involved outputs, applying the new state and +sending the commit event for each one. This resulted in commit +events being fired while we weren't done applying the new state for +all outputs. + +Fix this by first applying all of the states, then firing all of +the events. + +Closes: https://github.com/swaywm/sway/issues/8829 +--- + backend/backend.c | 5 +++++ + include/types/wlr_output.h | 1 + + types/output/output.c | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/backend/backend.c b/backend/backend.c +index a130d9045a..3d84aa636f 100644 +--- a/backend/backend.c ++++ b/backend/backend.c +@@ -485,5 +485,10 @@ bool wlr_backend_commit(struct wlr_backend *backend, + output_apply_commit(state->output, &state->base); + } + ++ for (size_t i = 0; i < states_len; i++) { ++ const struct wlr_backend_output_state *state = &states[i]; ++ output_send_commit_event(state->output, &state->base); ++ } ++ + return true; + } +diff --git a/include/types/wlr_output.h b/include/types/wlr_output.h +index f901505afc..d59b05f0b9 100644 +--- a/include/types/wlr_output.h ++++ b/include/types/wlr_output.h +@@ -27,6 +27,7 @@ void output_defer_present(struct wlr_output *output, struct wlr_output_event_pre + + bool output_prepare_commit(struct wlr_output *output, const struct wlr_output_state *state); + void output_apply_commit(struct wlr_output *output, const struct wlr_output_state *state); ++void output_send_commit_event(struct wlr_output *output, const struct wlr_output_state *state); + + void output_state_get_buffer_src_box(const struct wlr_output_state *state, + struct wlr_fbox *out); +diff --git a/types/output/output.c b/types/output/output.c +index 636d155d21..1fb0347a0b 100644 +--- a/types/output/output.c ++++ b/types/output/output.c +@@ -759,7 +759,9 @@ void output_apply_commit(struct wlr_output *output, const struct wlr_output_stat + } + + output_apply_state(output, state); ++} + ++void output_send_commit_event(struct wlr_output *output, const struct wlr_output_state *state) { + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + struct wlr_output_event_commit event = { +@@ -801,6 +803,7 @@ bool wlr_output_commit_state(struct wlr_output *output, + } + + output_apply_commit(output, &pending); ++ output_send_commit_event(output, &pending); + + if (new_back_buffer) { + wlr_buffer_unlock(pending.buffer); +-- +GitLab + diff --git a/wlroots.spec b/wlroots.spec index 1e38508..d4a76d8 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -6,7 +6,7 @@ Name: wlroots Version: 0.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -37,6 +37,7 @@ Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk Source3: examples.meson.build # Upstream patches +Patch: %{url}/-/commit/7392b331.patch#/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch # Fedora patches # Following patch is required for phoc. @@ -141,6 +142,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sun Sep 28 2025 Aleksei Bavshin - 0.19.1-2 +- Apply upstream patch for crash on disabling outputs + * Sun Sep 21 2025 Aleksei Bavshin - 0.19.1-1 - Update to 0.19.1 (#2397203) From 69922850bd02e72bee44ac2b8b561303872da49c Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 21 Oct 2025 23:14:08 -0700 Subject: [PATCH 08/18] Update to 0.19.2 (#2405567) --- sources | 4 +- ...end-commit-events-after-applying-all.patch | 73 ------------------- wlroots.spec | 10 ++- 3 files changed, 8 insertions(+), 79 deletions(-) delete mode 100644 wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch diff --git a/sources b/sources index f5c8ac6..84a6c9a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.19.1.tar.gz) = 2aac7ca61d6bae71268b114a2348fcd4d5b5734e245c1e6decf5d8230ea24245e30e48f79634aaea2743b89a89721a8fb2d74cd5e9c8da8f1525f30d410b420c -SHA512 (wlroots-0.19.1.tar.gz.sig) = 60f53a1304106c8fb694048101c6ad881c52213681285cfd17505446659d90c033c5d79fe574a2296dd4a6e6cde71cb9737d030374f254b44407f853196ed475 +SHA512 (wlroots-0.19.2.tar.gz) = 8228bdd463f3b79c02cc36311f93eb3a2fe2c8406222316a9996abebfbefa39cc4a9587ea800d677961d59b27c82ae906e538dceaf565403bbb3f2b1ae19eff1 +SHA512 (wlroots-0.19.2.tar.gz.sig) = c9f2bc6413c19e1fd52f151779a80513a72f0b9d1df706ad3d77df74f0736c22e12122fe08c3f24c908649ca1f3adad5aee8f8cc65fa0b24155353ca66f6e240 diff --git a/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch b/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch deleted file mode 100644 index 17b8c8f..0000000 --- a/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7392b3313a7b483c61f4fea648ba8f2aa4ce8798 Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Tue, 12 Aug 2025 19:00:11 +0200 -Subject: [PATCH] backend, output: send commit events after applying all in - wlr_backend_commit() - -We were iterating over involved outputs, applying the new state and -sending the commit event for each one. This resulted in commit -events being fired while we weren't done applying the new state for -all outputs. - -Fix this by first applying all of the states, then firing all of -the events. - -Closes: https://github.com/swaywm/sway/issues/8829 ---- - backend/backend.c | 5 +++++ - include/types/wlr_output.h | 1 + - types/output/output.c | 3 +++ - 3 files changed, 9 insertions(+) - -diff --git a/backend/backend.c b/backend/backend.c -index a130d9045a..3d84aa636f 100644 ---- a/backend/backend.c -+++ b/backend/backend.c -@@ -485,5 +485,10 @@ bool wlr_backend_commit(struct wlr_backend *backend, - output_apply_commit(state->output, &state->base); - } - -+ for (size_t i = 0; i < states_len; i++) { -+ const struct wlr_backend_output_state *state = &states[i]; -+ output_send_commit_event(state->output, &state->base); -+ } -+ - return true; - } -diff --git a/include/types/wlr_output.h b/include/types/wlr_output.h -index f901505afc..d59b05f0b9 100644 ---- a/include/types/wlr_output.h -+++ b/include/types/wlr_output.h -@@ -27,6 +27,7 @@ void output_defer_present(struct wlr_output *output, struct wlr_output_event_pre - - bool output_prepare_commit(struct wlr_output *output, const struct wlr_output_state *state); - void output_apply_commit(struct wlr_output *output, const struct wlr_output_state *state); -+void output_send_commit_event(struct wlr_output *output, const struct wlr_output_state *state); - - void output_state_get_buffer_src_box(const struct wlr_output_state *state, - struct wlr_fbox *out); -diff --git a/types/output/output.c b/types/output/output.c -index 636d155d21..1fb0347a0b 100644 ---- a/types/output/output.c -+++ b/types/output/output.c -@@ -759,7 +759,9 @@ void output_apply_commit(struct wlr_output *output, const struct wlr_output_stat - } - - output_apply_state(output, state); -+} - -+void output_send_commit_event(struct wlr_output *output, const struct wlr_output_state *state) { - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - struct wlr_output_event_commit event = { -@@ -801,6 +803,7 @@ bool wlr_output_commit_state(struct wlr_output *output, - } - - output_apply_commit(output, &pending); -+ output_send_commit_event(output, &pending); - - if (new_back_buffer) { - wlr_buffer_unlock(pending.buffer); --- -GitLab - diff --git a/wlroots.spec b/wlroots.spec index d4a76d8..f5aab06 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -2,11 +2,11 @@ %global abi_ver 0.19 # libliftoff does not bump soname on API changes %global liftoff_ver 0.5.0 -%global tag 0.19.1 +%global tag 0.19.2 Name: wlroots -Version: 0.19.1 -Release: 2%{?dist} +Version: 0.19.2 +Release: 1%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -37,7 +37,6 @@ Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk Source3: examples.meson.build # Upstream patches -Patch: %{url}/-/commit/7392b331.patch#/wlroots-0.19.1-backend-output-send-commit-events-after-applying-all.patch # Fedora patches # Following patch is required for phoc. @@ -142,6 +141,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Tue Oct 21 2025 Aleksei Bavshin - 0.19.2-1 +- Update to 0.19.2 (#2405567) + * Sun Sep 28 2025 Aleksei Bavshin - 0.19.1-2 - Apply upstream patch for crash on disabling outputs From 4b409cc451006a9230947ffaf562a88752a85d45 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 22 Dec 2025 23:45:46 -0500 Subject: [PATCH 09/18] Fix discarded const qualifier warnings with GCC 15 https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5203 --- Fix-discarded-const-qualifier.patch | 30 +++++++++++++++++++++++++++++ wlroots.spec | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 Fix-discarded-const-qualifier.patch diff --git a/Fix-discarded-const-qualifier.patch b/Fix-discarded-const-qualifier.patch new file mode 100644 index 0000000..fd74c75 --- /dev/null +++ b/Fix-discarded-const-qualifier.patch @@ -0,0 +1,30 @@ +From 47486545b196987f6f07fffe2929bba8f515b8e9 Mon Sep 17 00:00:00 2001 +From: Dale Turner +Date: Wed, 3 Dec 2025 20:02:29 -0400 +Subject: [PATCH] =?UTF-8?q?Add=20"const"=20to=20eliminate=20"error:=20init?= + =?UTF-8?q?ialization=20discards=20=E2=80=98const=E2=80=99=20qualifier=20f?= + =?UTF-8?q?rom=20pointer=20target=20type"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + xcursor/xcursor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c +index b5edb9de86..6627fb6cd7 100644 +--- a/xcursor/xcursor.c ++++ b/xcursor/xcursor.c +@@ -602,7 +602,7 @@ xcursor_build_fullname(const char *dir, const char *subdir, const char *file) + static const char * + xcursor_next_path(const char *path) + { +- char *colon = strchr(path, ':'); ++ const char *colon = strchr(path, ':'); + + if (!colon) + return NULL; +-- +GitLab + diff --git a/wlroots.spec b/wlroots.spec index f5aab06..8ce0dea 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -37,6 +37,8 @@ Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk Source3: examples.meson.build # Upstream patches +# https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5203 +Patch: Fix-discarded-const-qualifier.patch # Fedora patches # Following patch is required for phoc. From 6d290402fb44787280e8284ab51bc72597ca065e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:18:14 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index 8ce0dea..6892b3e 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -6,7 +6,7 @@ Name: wlroots Version: 0.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.19.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Oct 21 2025 Aleksei Bavshin - 0.19.2-1 - Update to 0.19.2 (#2405567) From 2ea14ebe8e6d3741dfcf11409e2c898d41425216 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 24 Jan 2026 16:45:59 -0800 Subject: [PATCH 11/18] Rebuild for libdisplay-info 0.3.0 --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index 6892b3e..2215c59 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -6,7 +6,7 @@ Name: wlroots Version: 0.19.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sat Jan 24 2026 Aleksei Bavshin - 0.19.2-3 +- Rebuild for libdisplay-info 0.3.0 + * Sat Jan 17 2026 Fedora Release Engineering - 0.19.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5035af13d432d55e0a7d32f355d57e7040a8c578 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 12 Feb 2026 19:15:32 -0800 Subject: [PATCH 12/18] Apply upstream patch for libinput 1.31 compatibility --- ...ibinput-fix-build-with-libinput-1.31.patch | 48 +++++++++++++++++++ wlroots.spec | 6 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 backend-libinput-fix-build-with-libinput-1.31.patch diff --git a/backend-libinput-fix-build-with-libinput-1.31.patch b/backend-libinput-fix-build-with-libinput-1.31.patch new file mode 100644 index 0000000..ff30e78 --- /dev/null +++ b/backend-libinput-fix-build-with-libinput-1.31.patch @@ -0,0 +1,48 @@ +From c1452d88114710f5772662b1d8efb9c71edaa34c Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin +Date: Sat, 7 Feb 2026 17:48:16 -0800 +Subject: [PATCH] backend/libinput: fix build with libinput 1.31 + +--- + backend/libinput/meson.build | 4 ++++ + backend/libinput/switch.c | 5 +++++ + 2 files changed, 9 insertions(+) + +diff --git a/backend/libinput/meson.build b/backend/libinput/meson.build +index c244eb77a..091b0e0eb 100644 +--- a/backend/libinput/meson.build ++++ b/backend/libinput/meson.build +@@ -29,3 +29,7 @@ features += { 'libinput-backend': true } + wlr_deps += libinput + + internal_config.set10('HAVE_LIBINPUT_BUSTYPE', libinput.version().version_compare('>=1.26.0')) ++internal_config.set10( ++ 'HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE', ++ libinput.version().version_compare('>=1.30.901') ++) +diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c +index abeec86d7..9dde3c9cb 100644 +--- a/backend/libinput/switch.c ++++ b/backend/libinput/switch.c +@@ -2,6 +2,7 @@ + #include + #include + #include "backend/libinput.h" ++#include "config.h" + + const struct wlr_switch_impl libinput_switch_impl = { + .name = "libinput-switch", +@@ -36,6 +37,10 @@ void handle_switch_toggle(struct libinput_event *event, + case LIBINPUT_SWITCH_TABLET_MODE: + wlr_event.switch_type = WLR_SWITCH_TYPE_TABLET_MODE; + break; ++#if HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE ++ case LIBINPUT_SWITCH_KEYPAD_SLIDE: ++ return; ++#endif + } + switch (libinput_event_switch_get_switch_state(sevent)) { + case LIBINPUT_SWITCH_STATE_OFF: +-- +GitLab + diff --git a/wlroots.spec b/wlroots.spec index 2215c59..7ba06e2 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -6,7 +6,7 @@ Name: wlroots Version: 0.19.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -39,6 +39,7 @@ Source3: examples.meson.build # Upstream patches # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5203 Patch: Fix-discarded-const-qualifier.patch +Patch: %{url}/-/commit/c1452d88.patch#/backend-libinput-fix-build-with-libinput-1.31.patch # Fedora patches # Following patch is required for phoc. @@ -143,6 +144,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Thu Feb 12 2026 Aleksei Bavshin - 0.19.2-4 +- Apply upstream patch for libinput 1.31 compatibility + * Sat Jan 24 2026 Aleksei Bavshin - 0.19.2-3 - Rebuild for libdisplay-info 0.3.0 From 75918f6d7db6f9c89b2a87610a36ddc2e3a132f3 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sat, 14 Feb 2026 12:18:54 -0800 Subject: [PATCH 13/18] Update to 0.20.0-rc2 --- Fix-discarded-const-qualifier.patch | 30 ------------ ...ibinput-fix-build-with-libinput-1.31.patch | 48 ------------------- examples.meson.build | 37 +++++++------- sources | 4 +- wlroots.spec | 32 +++++++------ 5 files changed, 39 insertions(+), 112 deletions(-) delete mode 100644 Fix-discarded-const-qualifier.patch delete mode 100644 backend-libinput-fix-build-with-libinput-1.31.patch diff --git a/Fix-discarded-const-qualifier.patch b/Fix-discarded-const-qualifier.patch deleted file mode 100644 index fd74c75..0000000 --- a/Fix-discarded-const-qualifier.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 47486545b196987f6f07fffe2929bba8f515b8e9 Mon Sep 17 00:00:00 2001 -From: Dale Turner -Date: Wed, 3 Dec 2025 20:02:29 -0400 -Subject: [PATCH] =?UTF-8?q?Add=20"const"=20to=20eliminate=20"error:=20init?= - =?UTF-8?q?ialization=20discards=20=E2=80=98const=E2=80=99=20qualifier=20f?= - =?UTF-8?q?rom=20pointer=20target=20type"?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - xcursor/xcursor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c -index b5edb9de86..6627fb6cd7 100644 ---- a/xcursor/xcursor.c -+++ b/xcursor/xcursor.c -@@ -602,7 +602,7 @@ xcursor_build_fullname(const char *dir, const char *subdir, const char *file) - static const char * - xcursor_next_path(const char *path) - { -- char *colon = strchr(path, ':'); -+ const char *colon = strchr(path, ':'); - - if (!colon) - return NULL; --- -GitLab - diff --git a/backend-libinput-fix-build-with-libinput-1.31.patch b/backend-libinput-fix-build-with-libinput-1.31.patch deleted file mode 100644 index ff30e78..0000000 --- a/backend-libinput-fix-build-with-libinput-1.31.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c1452d88114710f5772662b1d8efb9c71edaa34c Mon Sep 17 00:00:00 2001 -From: Aleksei Bavshin -Date: Sat, 7 Feb 2026 17:48:16 -0800 -Subject: [PATCH] backend/libinput: fix build with libinput 1.31 - ---- - backend/libinput/meson.build | 4 ++++ - backend/libinput/switch.c | 5 +++++ - 2 files changed, 9 insertions(+) - -diff --git a/backend/libinput/meson.build b/backend/libinput/meson.build -index c244eb77a..091b0e0eb 100644 ---- a/backend/libinput/meson.build -+++ b/backend/libinput/meson.build -@@ -29,3 +29,7 @@ features += { 'libinput-backend': true } - wlr_deps += libinput - - internal_config.set10('HAVE_LIBINPUT_BUSTYPE', libinput.version().version_compare('>=1.26.0')) -+internal_config.set10( -+ 'HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE', -+ libinput.version().version_compare('>=1.30.901') -+) -diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c -index abeec86d7..9dde3c9cb 100644 ---- a/backend/libinput/switch.c -+++ b/backend/libinput/switch.c -@@ -2,6 +2,7 @@ - #include - #include - #include "backend/libinput.h" -+#include "config.h" - - const struct wlr_switch_impl libinput_switch_impl = { - .name = "libinput-switch", -@@ -36,6 +37,10 @@ void handle_switch_toggle(struct libinput_event *event, - case LIBINPUT_SWITCH_TABLET_MODE: - wlr_event.switch_type = WLR_SWITCH_TYPE_TABLET_MODE; - break; -+#if HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE -+ case LIBINPUT_SWITCH_KEYPAD_SLIDE: -+ return; -+#endif - } - switch (libinput_event_switch_get_switch_state(sevent)) { - case LIBINPUT_SWITCH_STATE_OFF: --- -GitLab - diff --git a/examples.meson.build b/examples.meson.build index 4f3156e..b738157 100644 --- a/examples.meson.build +++ b/examples.meson.build @@ -1,18 +1,28 @@ # Client examples are now available from a separate repository, # https://gitlab.freedesktop.org/wlroots/wlr-clients project( - 'wlroots-examples', - 'c', - meson_version: '>=0.58.0', - default_options: [ - 'c_std=c11', - 'warning_level=2', - 'werror=false', - ], + 'wlroots-examples', + 'c', + meson_version: '>=0.58.0', + default_options: [ + 'c_std=c11', + 'warning_level=2', + 'werror=false', + ], ) +add_project_arguments([ + '-D_POSIX_C_SOURCE=200809L', + '-DWLR_USE_UNSTABLE', +], language: 'c') + cc = meson.get_compiler('c') -add_global_arguments('-DWLR_USE_UNSTABLE', language : 'c') + +add_project_arguments(cc.get_supported_arguments([ + '-Wno-missing-braces', + '-Wno-missing-field-initializers', + '-Wno-unused-parameter' +]), language: 'c') cairo = dependency('cairo') drm = dependency('libdrm') @@ -29,7 +39,7 @@ wayland_scanner = find_program( native: true, ) wayland_server = dependency('wayland-server') -wlroots = dependency('wlroots-0.18') +wlroots = dependency('wlroots-0.20') xkbcommon = dependency('xkbcommon') wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') @@ -37,9 +47,6 @@ wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') protocols = { # Stable upstream protocols 'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', - - # Unstable upstream protocols - 'fullscreen-shell-unstable-v1': wl_protocol_dir / 'unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml', } protocols_code = {} @@ -94,10 +101,6 @@ compositors = { 'output-layout': { 'src': ['output-layout.c', 'cat.c'], }, - 'fullscreen-shell': { - 'src': 'fullscreen-shell.c', - 'proto': ['fullscreen-shell-unstable-v1'], - }, 'scene-graph': { 'src': 'scene-graph.c', 'proto': ['xdg-shell'], diff --git a/sources b/sources index 84a6c9a..e2a7b36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.19.2.tar.gz) = 8228bdd463f3b79c02cc36311f93eb3a2fe2c8406222316a9996abebfbefa39cc4a9587ea800d677961d59b27c82ae906e538dceaf565403bbb3f2b1ae19eff1 -SHA512 (wlroots-0.19.2.tar.gz.sig) = c9f2bc6413c19e1fd52f151779a80513a72f0b9d1df706ad3d77df74f0736c22e12122fe08c3f24c908649ca1f3adad5aee8f8cc65fa0b24155353ca66f6e240 +SHA512 (wlroots-0.20.0-rc2.tar.gz) = 44a98731d1685385d7b3fb0d52cdd0d4659f8c9fa59d796d99171740516fcc86c84044aa997b3f05cf3e38b401120b33c16410acca7803ea6917af63d018798f +SHA512 (wlroots-0.20.0-rc2.tar.gz.sig) = 08e4ed50a52cab65e42a25932f5c8f0b5e62c703467b937a5ea22f7b32ce64f260a7b72fce509d5d704b97b87f392f73a122745194dc7fd0f4e783a459779254 diff --git a/wlroots.spec b/wlroots.spec index 7ba06e2..8481e0b 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -1,14 +1,15 @@ # Version of the .so library -%global abi_ver 0.19 +%global abi_ver 0.20 # libliftoff does not bump soname on API changes %global liftoff_ver 0.5.0 -%global tag 0.19.2 Name: wlroots -Version: 0.19.2 -Release: 4%{?dist} +Version: 0.20.0~rc2 +Release: 1%{?dist} Summary: A modular Wayland compositor library +%global tag %{gsub %{version} ~ -} + # Source files/overall project licensed as MIT, but # - HPND-sell-variant # * protocol/drm.xml @@ -37,9 +38,6 @@ Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rk Source3: examples.meson.build # Upstream patches -# https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5203 -Patch: Fix-discarded-const-qualifier.patch -Patch: %{url}/-/commit/c1452d88.patch#/backend-libinput-fix-build-with-libinput-1.31.patch # Fedora patches # Following patch is required for phoc. @@ -52,21 +50,21 @@ BuildRequires: meson >= 1.3 BuildRequires: (pkgconfig(libliftoff) >= %{liftoff_ver} with pkgconfig(libliftoff) < 0.6) BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gbm) >= 17.1.0 +BuildRequires: pkgconfig(gbm) >= 21.1 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(libdisplay-info) -BuildRequires: pkgconfig(libdrm) >= 2.4.122 +BuildRequires: pkgconfig(libdisplay-info) >= 0.2.0 +BuildRequires: pkgconfig(libdrm) >= 2.4.129 BuildRequires: pkgconfig(libinput) >= 1.21.0 BuildRequires: pkgconfig(libseat) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(pixman-1) >= 0.43.0 +BuildRequires: pkgconfig(pixman-1) >= 0.46.0 BuildRequires: pkgconfig(vulkan) >= 1.2.182 BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.41 +BuildRequires: pkgconfig(wayland-protocols) >= 1.47 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.23.1 +BuildRequires: pkgconfig(wayland-server) >= 1.24.0 BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-composite) @@ -79,9 +77,9 @@ BuildRequires: pkgconfig(xcb-render) BuildRequires: pkgconfig(xcb-renderutil) BuildRequires: pkgconfig(xcb-res) BuildRequires: pkgconfig(xcb-shm) -BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xcb-xfixes) >= 1.15 BuildRequires: pkgconfig(xcb-xinput) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon) >= 1.8.0 BuildRequires: pkgconfig(xwayland) # libliftoff does not bump soname on API changes Requires: libliftoff%{?_isa} >= %{liftoff_ver} @@ -124,6 +122,7 @@ MESON_OPTIONS=( %install %{meson_install} +install -pm0644 -Dt '%{buildroot}/%{_pkgdocdir}/examples' examples/*.[ch] install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build' @@ -144,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Sat Feb 14 2026 Aleksei Bavshin - 0.20.0~rc2-1 +- Update to 0.20.0-rc2 + * Thu Feb 12 2026 Aleksei Bavshin - 0.19.2-4 - Apply upstream patch for libinput 1.31 compatibility From 07351d6b733e0e99e02201af9636c775ec14bf38 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 19 Mar 2026 19:05:45 -0700 Subject: [PATCH 14/18] Update to 0.20.0~rc5 --- sources | 4 ++-- wlroots.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e2a7b36..a7f0dc6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.20.0-rc2.tar.gz) = 44a98731d1685385d7b3fb0d52cdd0d4659f8c9fa59d796d99171740516fcc86c84044aa997b3f05cf3e38b401120b33c16410acca7803ea6917af63d018798f -SHA512 (wlroots-0.20.0-rc2.tar.gz.sig) = 08e4ed50a52cab65e42a25932f5c8f0b5e62c703467b937a5ea22f7b32ce64f260a7b72fce509d5d704b97b87f392f73a122745194dc7fd0f4e783a459779254 +SHA512 (wlroots-0.20.0-rc5.tar.gz) = 947880133abae9ca6946e162e02acea61b8281b5ec459d534b81b2725276bdfc0ccd9e5d4b43f4174549920bf69dccf533a09d7cb92d6a909e0611548164d35a +SHA512 (wlroots-0.20.0-rc5.tar.gz.sig) = b7778e60d038f945bf4c57c7a4a6a69e07c1a8c7c93acfbee5e1d409c4be3ed799a9f3da90625be8e88ea7c41caddd739ea89d832bc9ede616380a6ff4054cf5 diff --git a/wlroots.spec b/wlroots.spec index 8481e0b..ea5a9f5 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -4,7 +4,7 @@ %global liftoff_ver 0.5.0 Name: wlroots -Version: 0.20.0~rc2 +Version: 0.20.0~rc5 Release: 1%{?dist} Summary: A modular Wayland compositor library @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Thu Mar 19 2026 Aleksei Bavshin - 0.20.0~rc5-1 +- Update to 0.20.0-rc5 + * Sat Feb 14 2026 Aleksei Bavshin - 0.20.0~rc2-1 - Update to 0.20.0-rc2 From 460ac433508c7064a8e732b4761f4ef214292ec2 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Thu, 26 Mar 2026 19:27:15 -0700 Subject: [PATCH 15/18] Update to 0.20.0 (#2435845) --- sources | 4 ++-- wlroots.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a7f0dc6..c049601 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.20.0-rc5.tar.gz) = 947880133abae9ca6946e162e02acea61b8281b5ec459d534b81b2725276bdfc0ccd9e5d4b43f4174549920bf69dccf533a09d7cb92d6a909e0611548164d35a -SHA512 (wlroots-0.20.0-rc5.tar.gz.sig) = b7778e60d038f945bf4c57c7a4a6a69e07c1a8c7c93acfbee5e1d409c4be3ed799a9f3da90625be8e88ea7c41caddd739ea89d832bc9ede616380a6ff4054cf5 +SHA512 (wlroots-0.20.0.tar.gz) = c951c9f6f9d720f994ee49a937ae8ed63f733a4fa1ce71f7e6ce1513f2cd91616ce8bd8cbb844aa1e46e62f3b46b028f3004bab94eca5ef8899cbaa3134ac314 +SHA512 (wlroots-0.20.0.tar.gz.sig) = 9241568120700b7dadd92ee212ee7c78d1d1fcfe3873250d09c97b9207a7cb8687b393ce8ce9f258698c17caf924ff2c91571e235580fcd7b8618d68e87e690b diff --git a/wlroots.spec b/wlroots.spec index ea5a9f5..f643140 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -4,7 +4,7 @@ %global liftoff_ver 0.5.0 Name: wlroots -Version: 0.20.0~rc5 +Version: 0.20.0 Release: 1%{?dist} Summary: A modular Wayland compositor library @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Thu Mar 26 2026 Aleksei Bavshin - 0.20.0-1 +- Update to 0.20.0 (#2435845) + * Thu Mar 19 2026 Aleksei Bavshin - 0.20.0~rc5-1 - Update to 0.20.0-rc5 From 9e3cf5a0cfc6f0f892f8849c79580b06fbe26a20 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 19 May 2026 22:46:13 -0700 Subject: [PATCH 16/18] Update to 0.20.1 (#2480014) --- sources | 4 ++-- wlroots.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c049601..a64ff05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.20.0.tar.gz) = c951c9f6f9d720f994ee49a937ae8ed63f733a4fa1ce71f7e6ce1513f2cd91616ce8bd8cbb844aa1e46e62f3b46b028f3004bab94eca5ef8899cbaa3134ac314 -SHA512 (wlroots-0.20.0.tar.gz.sig) = 9241568120700b7dadd92ee212ee7c78d1d1fcfe3873250d09c97b9207a7cb8687b393ce8ce9f258698c17caf924ff2c91571e235580fcd7b8618d68e87e690b +SHA512 (wlroots-0.20.1.tar.gz) = 9114dd1638cbe2f4762eeae099aa7d92f28a0895ea495c34ff23e581c7fd400ec91c53fc573dab433fc7558b8c56bcef9d9c96a09dacd01b1c55b47356e82ea1 +SHA512 (wlroots-0.20.1.tar.gz.sig) = 882536ebe9e8d0684a58b453674bfe10a6effe553be0201cc2abd46e388d7fb08d726ac751918bde73c15585a08285c6482d01c7c8b6a951411900b581e6215f diff --git a/wlroots.spec b/wlroots.spec index f643140..327ec12 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -4,7 +4,7 @@ %global liftoff_ver 0.5.0 Name: wlroots -Version: 0.20.0 +Version: 0.20.1 Release: 1%{?dist} Summary: A modular Wayland compositor library @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Tue May 19 2026 Aleksei Bavshin - 0.20.1-1 +- Update to 0.20.1 (#2480014) + * Thu Mar 26 2026 Aleksei Bavshin - 0.20.0-1 - Update to 0.20.0 (#2435845) From b7b643804e9ba319d6d95765a6d5cd5ee1e8a9ed Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Tue, 7 Jul 2026 20:03:34 -0700 Subject: [PATCH 17/18] Update to 0.20.2 (#2497891) --- sources | 4 ++-- wlroots.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a64ff05..c7cac09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wlroots-0.20.1.tar.gz) = 9114dd1638cbe2f4762eeae099aa7d92f28a0895ea495c34ff23e581c7fd400ec91c53fc573dab433fc7558b8c56bcef9d9c96a09dacd01b1c55b47356e82ea1 -SHA512 (wlroots-0.20.1.tar.gz.sig) = 882536ebe9e8d0684a58b453674bfe10a6effe553be0201cc2abd46e388d7fb08d726ac751918bde73c15585a08285c6482d01c7c8b6a951411900b581e6215f +SHA512 (wlroots-0.20.2.tar.gz) = 634345e23d0b6c28cb501c0dd0ef9c50d529a92ae5c8455e99e876f3f37ee244ac19dd097f76416b2ae4fd7c3f02e39a92a9322cf5a0caf8da21c31cd900e508 +SHA512 (wlroots-0.20.2.tar.gz.sig) = e74dc0abfabed7f40ba4f0e5edfc30ef92b95ebcf4a6aca3b2a605b04b5f2345a6a842cdf56819ce1f050c6181b646eae19dbef835354df7b09562cebbdaa474 diff --git a/wlroots.spec b/wlroots.spec index 327ec12..43e5041 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -4,7 +4,7 @@ %global liftoff_ver 0.5.0 Name: wlroots -Version: 0.20.1 +Version: 0.20.2 Release: 1%{?dist} Summary: A modular Wayland compositor library @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Tue Jul 07 2026 Aleksei Bavshin - 0.20.2-1 +- Update to 0.20.2 (#2497891) + * Tue May 19 2026 Aleksei Bavshin - 0.20.1-1 - Update to 0.20.1 (#2480014) From e479909c1df4a952a384a21fa693aa6a3d772a83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:52:15 +0000 Subject: [PATCH 18/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wlroots.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlroots.spec b/wlroots.spec index 43e5041..0ce3b16 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -5,7 +5,7 @@ Name: wlroots Version: 0.20.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular Wayland compositor library %global tag %{gsub %{version} ~ -} @@ -143,6 +143,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.20.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jul 07 2026 Aleksei Bavshin - 0.20.2-1 - Update to 0.20.2 (#2497891)