From c67e3fe3b7e189ed7a617cac412a16116d77cf21 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Wed, 1 Sep 2021 16:15:23 -0400 Subject: [PATCH] protocol/meson: bump wayland-protocols requirement to 1.22 --- protocol/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/protocol/meson.build b/protocol/meson.build index ab66a0a1..38dd456e 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,5 +1,5 @@ wayland_protos = dependency('wayland-protocols', - version: '>=1.21', + version: '>=1.22', fallback: ['wayland-protocols', 'wayland_protocols'], default_options: ['tests=false'], ) @@ -16,6 +16,11 @@ protocols = { 'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', 'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml', 'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml', + + # Staging upstream protocols + 'xdg-activation-v1': wl_protocol_dir / 'staging/xdg-activation/xdg-activation-v1.xml', + 'drm-lease-v1': wl_protocol_dir / 'staging/drm-lease/drm-lease-v1.xml', + # Unstable upstream protocols 'fullscreen-shell-unstable-v1': wl_protocol_dir / 'unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml', 'idle-inhibit-unstable-v1': wl_protocol_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', @@ -27,11 +32,11 @@ protocols = { 'relative-pointer-unstable-v1': wl_protocol_dir / 'unstable/relative-pointer/relative-pointer-unstable-v1.xml', 'tablet-unstable-v2': wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml', 'text-input-unstable-v3': wl_protocol_dir / 'unstable/text-input/text-input-unstable-v3.xml', - 'xdg-activation-v1': wl_protocol_dir / 'staging/xdg-activation/xdg-activation-v1.xml', 'xdg-decoration-unstable-v1': wl_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', 'xdg-foreign-unstable-v1': wl_protocol_dir / 'unstable/xdg-foreign/xdg-foreign-unstable-v1.xml', 'xdg-foreign-unstable-v2': wl_protocol_dir / 'unstable/xdg-foreign/xdg-foreign-unstable-v2.xml', 'xdg-output-unstable-v1': wl_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml', + # Other protocols 'drm': 'drm.xml', 'kde-idle': 'idle.xml',