From 0d00e9a23288c35473c0ad52b3a8aebd642a34ac Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Sat, 29 Jun 2024 21:05:02 +0200 Subject: [PATCH] chase: move to stable tablet protocol and require w-p >= 1.35 https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4645 --- meson.build | 2 +- protocols/meson.build | 2 +- subprojects/wlroots.wrap | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 3ec6eeb1..267b91b3 100644 --- a/meson.build +++ b/meson.build @@ -57,7 +57,7 @@ wlroots = dependency( wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true' wayland_server = dependency('wayland-server', version: '>=1.19.0') -wayland_protos = dependency('wayland-protocols') +wayland_protos = dependency('wayland-protocols', version: '>=1.35') xkbcommon = dependency('xkbcommon') xcb = dependency('xcb', required: get_option('xwayland')) xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland')) diff --git a/protocols/meson.build b/protocols/meson.build index b0c2f5ab..0ee40bf4 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -16,7 +16,7 @@ wayland_scanner_server = generator( server_protocols = [ wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml', - wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml', + wl_protocol_dir / 'stable/tablet/tablet-v2.xml', wl_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml', wl_protocol_dir / 'staging/drm-lease/drm-lease-v1.xml', wl_protocol_dir / 'staging/xwayland-shell/xwayland-shell-v1.xml', diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap index 5ac4b36f..ac960c58 100644 --- a/subprojects/wlroots.wrap +++ b/subprojects/wlroots.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://gitlab.freedesktop.org/wlroots/wlroots.git -revision = 4b4f76cc13574544216b59b3a9902b468b82108b +revision = fe429b2463f279a6274bb6f42a3e23525a3c97aa [provide] dependency_names = wlroots-0.18 -- 2.52.0