isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-23 09:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Switch to stable linux-dmabuf protocol

Browse Source 
It is the first protocol to keep the `-vN-` despite being declared
stable.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3450>
This commit is contained in:
Robert Mader 2023-12-11 13:55:20 +01:00 committed by Marge Bot
parent 69446e1fb2
commit 8b1015a5c7
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/meson.build
View File

@ -1060,7 +1060,7 @@ if have_wayland
['gtk-shell', 'private', ], ['gtk-shell', 'private', ],
['idle-inhibit', 'unstable', 'v1', ], ['idle-inhibit', 'unstable', 'v1', ],
['keyboard-shortcuts-inhibit', 'unstable', 'v1', ], ['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
['linux-dmabuf', 'unstable', 'v1', ], ['linux-dmabuf', 'stable', 'v1', ],
['pointer-constraints', 'unstable', 'v1', ], ['pointer-constraints', 'unstable', 'v1', ],
['pointer-gestures', 'unstable', 'v1', ], ['pointer-gestures', 'unstable', 'v1', ],
['presentation-time', 'stable', ], ['presentation-time', 'stable', ],
@ -1098,7 +1098,12 @@ if have_wayland
protocol_type = p.get(1) protocol_type = p.get(1)
if protocol_type == 'stable' if protocol_type == 'stable'
output_base = protocol_name if p.length() == 3
protocol_version = p.get(2)
output_base = '@0@-@1@'.format(protocol_name, protocol_version)
else
output_base = protocol_name
endif
input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base) input = protocols_dir / protocol_type / protocol_name / '@0@.xml'.format(output_base)
elif protocol_type == 'staging' elif protocol_type == 'staging'
protocol_version = p.get(2) protocol_version = p.get(2)

2
src/tests/wayland-test-clients/wayland-test-client-utils.h
View File

@ -7,7 +7,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "fractional-scale-v1-client-protocol.h" #include "fractional-scale-v1-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-v1-client-protocol.h"
#include "single-pixel-buffer-v1-client-protocol.h" #include "single-pixel-buffer-v1-client-protocol.h"
#include "test-driver-client-protocol.h" #include "test-driver-client-protocol.h"
#include "viewporter-client-protocol.h" #include "viewporter-client-protocol.h"

2
src/wayland/meta-wayland-dma-buf.c
View File

@ -65,7 +65,7 @@
#include "backends/native/meta-renderer-native.h" #include "backends/native/meta-renderer-native.h"
#endif #endif
#include "linux-dmabuf-unstable-v1-server-protocol.h" #include "linux-dmabuf-v1-server-protocol.h"
#define META_WAYLAND_DMA_BUF_MAX_FDS 4 #define META_WAYLAND_DMA_BUF_MAX_FDS 4