wayland: accept version 2 of the cursor-shape protocol

Dudemanguy · Dudemanguy · commit 1b231b4e5725 · 2025-03-26T02:19:44.000Z
The version 2 changes only add some enums which makes zero difference to
us so we can just allow the newer version.
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
@@ -1998,7 +1998,7 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
 
 #if HAVE_WAYLAND_PROTOCOLS_1_32
     if (!strcmp(interface, wp_cursor_shape_manager_v1_interface.name) && found++) {
-        ver = 1;
+        ver = MPMIN(ver, 2);
         wl->cursor_shape_manager = wl_registry_bind(reg, id, &wp_cursor_shape_manager_v1_interface, ver);
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1998,7 +1998,7 @@ static void registry_handle_add(void data, struct wl_registry reg, uint32_t id`
`1998`	`1998`
`1999`	`1999`	`#if HAVE_WAYLAND_PROTOCOLS_1_32`
`2000`	`2000`	`if (!strcmp(interface, wp_cursor_shape_manager_v1_interface.name) && found++) {`
`2001`		`- ver = 1;`
	`2001`	`+ ver = MPMIN(ver, 2);`
`2002`	`2002`	`wl->cursor_shape_manager = wl_registry_bind(reg, id, &wp_cursor_shape_manager_v1_interface, ver);`
`2003`	`2003`	`}`
`2004`	`2004`	`#endif`