linux-dmabuf-v1: switch to stable

The protocol is no longer unstable.

backend/wayland/backend.c

@@ -21,7 +21,7 @@
 #include "render/pixel_format.h"
 
 #include "drm-client-protocol.h"
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
+#include "linux-dmabuf-v1-client-protocol.h"
 #include "pointer-gestures-unstable-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"
 #include "xdg-activation-v1-client-protocol.h"

backend/wayland/meson.build

@@ -14,7 +14,7 @@ wlr_files += files(
 
 client_protos = [
 	'drm',
-	'linux-dmabuf-unstable-v1',
+	'linux-dmabuf-v1',
 	'pointer-gestures-unstable-v1',
 	'presentation-time',
 	'relative-pointer-unstable-v1',

backend/wayland/output.c

@@ -20,7 +20,7 @@
 #include "render/wlr_renderer.h"
 #include "types/wlr_output.h"
 
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
+#include "linux-dmabuf-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"
 #include "viewporter-client-protocol.h"
 #include "xdg-activation-v1-client-protocol.h"

include/wlr/types/wlr_linux_dmabuf_v1.h

@@ -67,7 +67,7 @@ struct wlr_linux_dmabuf_v1 {
 };
 
 /**
- * Create the linux-dmabuf-unstable-v1 global.
+ * Create the linux-dmabuf-v1 global.
  *
  * Compositors using struct wlr_renderer should use
  * wlr_linux_dmabuf_v1_create_with_renderer() instead.
@@ -76,7 +76,7 @@ struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create(struct wl_display *displa
 	uint32_t version, const struct wlr_linux_dmabuf_feedback_v1 *default_feedback);
 
 /**
- * Create the linux-dmabuf-unstable-v1 global.
+ * Create the linux-dmabuf-v1 global.
  *
  * The default DMA-BUF feedback is initialized from the struct wlr_renderer.
  */

protocol/meson.build

@@ -1,5 +1,5 @@
 wayland_protos = dependency('wayland-protocols',
-	version: '>=1.32',
+	version: '>=1.33',
 	fallback: 'wayland-protocols',
 	default_options: ['tests=false'],
 )
@@ -13,6 +13,7 @@ wayland_scanner = find_program(
 
 protocols = {
 	# Stable upstream protocols
+	'linux-dmabuf-v1': wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml',
 	'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml',
 	'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml',
 	'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
@@ -34,7 +35,6 @@ 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',
 	'keyboard-shortcuts-inhibit-unstable-v1': wl_protocol_dir / 'unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml',
-	'linux-dmabuf-unstable-v1': wl_protocol_dir / 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
 	'pointer-constraints-unstable-v1': wl_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
 	'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml',
 	'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml',

types/wlr_linux_dmabuf_v1.c

@@ -14,7 +14,7 @@
 #include <wlr/types/wlr_output_layer.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
-#include "linux-dmabuf-unstable-v1-protocol.h"
+#include "linux-dmabuf-v1-protocol.h"
 #include "render/drm_format_set.h"
 #include "util/shm.h"