Skip to contentSkip to conversation

update cage to 0.3.0 and wlroots to 0.20.0

PATCH In review Adrian Perez de Castro 2 participants 4 messages Apr 20

lore
Share & tools
lore
#0 lore raw

cover update cage to 0.3.0 and wlroots to 0.20.0

Hello all,

This patch set updates the Cage Wayland compositor to the latest version, which in turn requires an update to wlroots. The compositor adds supports the wlr-foreign-toplevel-management and drm-lease-v1 protocols, and the second one is particularly useful for VR/AR devices.

The new wlroots has a new optional dependency, libliftoff, which is always disabled for now. A later patch set will add the missing package and enable its usage for improved KMS plane usage.

Adrian Perez de Castro (2):
package/wlroots: bump version to 0.20.0
package/cage: bump version to 0.3.0

 package/cage/cage.hash                        |  4 +-
 package/cage/cage.mk                          |  5 +-
 ...ibinput-fix-build-with-libinput-1.31.patch | 51 -------------------
 package/wlroots/0002-xcursor.patch            | 33 ------------
 package/wlroots/wlroots.hash                  |  4 +-
 package/wlroots/wlroots.mk                    |  4 +-
 6 files changed, 8 insertions(+), 93 deletions(-)
 delete mode 100644 package/wlroots/0001-backend-libinput-fix-build-with-libinput-1.31.patch
 delete mode 100644 package/wlroots/0002-xcursor.patch
Signature · 6 lines
2.53.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/2 package/wlroots: bump version to 0.20.0

While at it, drop the two patches, as they are part of this version. Release notes:

https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.20.0

---
 ...ibinput-fix-build-with-libinput-1.31.patch | 51 -------------------
 package/wlroots/0002-xcursor.patch            | 33 ------------
 package/wlroots/wlroots.hash                  |  4 +-
 package/wlroots/wlroots.mk                    |  4 +-
 4 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 package/wlroots/0001-backend-libinput-fix-build-with-libinput-1.31.patch
 delete mode 100644 package/wlroots/0002-xcursor.patch
package/wlroots/0001-backend-libinput-fix-build-with-libinput-1.31.patch deleted +0 -51
deleted file mode 100644
index c5ef11ecf0..0000000000
@@ -1,51 +0,0 @@
-From c1452d88114710f5772662b1d8efb9c71edaa34c Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <[email protected]>
-Date: Sat, 7 Feb 2026 17:48:16 -0800
-Subject: [PATCH] backend/libinput: fix build with libinput 1.31
-
-Upstream: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/c1452d88114710f5772662b1d8efb9c71edaa34c
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- 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 <libinput.h>
- #include <wlr/interfaces/wlr_switch.h>
- #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
-
package/wlroots/0002-xcursor.patch deleted +0 -33
deleted file mode 100644
index d57980fa39..0000000000
@@ -1,33 +0,0 @@
-From 47486545b196987f6f07fffe2929bba8f515b8e9 Mon Sep 17 00:00:00 2001
-From: Dale Turner <[email protected]>
-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
-
-Upstream: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/47486545b196987f6f07fffe2929bba8f515b8e9
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- xcursor/xcursor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c
-index b5edb9de8..6627fb6cd 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
-
package/wlroots/wlroots.hash +2 -2
index 37ac909693..cd1b83e6e4 100644
@@ -1,7 +1,7 @@
 # Locally calculated after checking pgp signature
-# https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.19.2/downloads/wlroots-0.19.2.tar.gz.sig
+# https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.20.0/downloads/wlroots-0.20.0.tar.gz.sig
 # with key 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 "emersion <[email protected]>"
-sha256  09a0a8d60104c8b0772fee4f60ba76a89aed7e59dff7659d00960fba06bdf267  wlroots-0.19.2.tar.gz
+sha256  33f52414e1b280839aeb70786f0ae2c9f54e27ad4873108d86270a2f89c4934b  wlroots-0.20.0.tar.gz
 
 # Hashes for license files:
 sha256  35d427c043dcafe8893b9e7247348f599847c81d9a067703587c80707f3d58df  LICENSE
package/wlroots/wlroots.mk +2 -2
index bd2e0eb561..5ce634d402 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WLROOTS_VERSION = 0.19.2
+WLROOTS_VERSION = 0.20.0
 WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads
 WLROOTS_LICENSE = MIT
 WLROOTS_LICENSE_FILES = LICENSE
@@ -26,7 +26,7 @@ WLROOTS_DEPENDENCIES = \
 	wayland \
 	wayland-protocols
 
-WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled
+WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Dlibliftoff=disabled
 
 WLROOTS_RENDERERS = gles2
 WLROOTS_BACKENDS = libinput drm
Signature · 6 lines
2.53.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 1/2] package/wlroots: bump version to 0.20.0

Quoted 6 lines · Adrian Perez de Castro

While at it, drop the two patches, as they are part of this version. Release notes:

https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.20.0

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

PATCH 2/2 package/cage: bump version to 0.3.0

In reply to Adrian Perez de Castro

This version adds support for the wlr-foreign-toplevel-management and drm-lease-v1 protocols; switches the wlroots dependency to 0.20.0; and includes a few fixes. Release notes:

https://github.com/cage-kiosk/cage/releases/tag/v0.3.0

---
 package/cage/cage.hash | 4 ++--
 package/cage/cage.mk   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
package/cage/cage.hash +2 -2
index 018404a2c5..4b05602822 100644
@@ -1,5 +1,5 @@
-# Locally computed
-sha256  9603ba1a130696dd39793ffab68397db504b378a733c09c0b86a5ebe3d6fe58d  cage-v0.2.1-git4.tar.gz
+# Locally computed, after checking PGP signature
+sha256  cd2510f83bef3e08e660d99492ca7761b218ecb53ee01cdbbeee3d6aabc7734e  cage-0.3.0.tar.gz
 
 # Hashes for license files:
 sha256  e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee  LICENSE
package/cage/cage.mk +2 -3
index 9b5778449b..4495c59b4f 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-CAGE_VERSION = v0.2.1
-CAGE_SITE = https://github.com/cage-kiosk/cage.git
-CAGE_SITE_METHOD = git
+CAGE_VERSION = 0.3.0
+CAGE_SITE = https://github.com/cage-kiosk/cage/releases/download/v$(CAGE_VERSION)
 CAGE_LICENSE = MIT
 CAGE_LICENSE_FILES = LICENSE
 CAGE_DEPENDENCIES = host-pkgconf wlroots
Signature · 6 lines
2.53.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot