diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index bec8af9dbfa..3c205688fdf 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -48,7 +48,7 @@ #include "dri_screen.h" #ifdef HAVE_WAYLAND_PLATFORM -#include "linux-dmabuf-unstable-v1-client-protocol.h" +#include "linux-dmabuf-v1-client-protocol.h" #if HAVE_BIND_WL_DISPLAY #include "wayland-drm-client-protocol.h" #include "wayland-drm.h" diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 2228b0e1580..af4fe2cd513 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -56,7 +56,7 @@ #include "dri_util.h" #include -#include "linux-dmabuf-unstable-v1-client-protocol.h" +#include "linux-dmabuf-v1-client-protocol.h" #ifdef HAVE_BIND_WL_DISPLAY #include "wayland-drm-client-protocol.h" #endif diff --git a/src/egl/meson.build b/src/egl/meson.build index f9b0e348ad4..2b5e595ddaf 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -122,7 +122,7 @@ if with_dri deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] link_for_egl += libloader_wayland_helper files_egl += files('drivers/dri2/platform_wayland.c') - files_egl += wp_files['linux-dmabuf-unstable-v1'] + files_egl += wp_files['linux-dmabuf-v1'] files_egl += wp_files['presentation-time'] if with_wayland_bind_display files_egl += [wayland_drm_client_protocol_h] diff --git a/src/loader/meson.build b/src/loader/meson.build index a8603ad5767..876ad9fd229 100644 --- a/src/loader/meson.build +++ b/src/loader/meson.build @@ -7,7 +7,7 @@ if with_platform_wayland wp_protos = { 'fifo-v1': mod_wl.find_protocol('fifo', state : 'staging', version : 1), 'commit-timing-v1': mod_wl.find_protocol('commit-timing', state : 'staging', version : 1), - 'linux-dmabuf-unstable-v1': mod_wl.find_protocol('linux-dmabuf', state : 'unstable', version : 1), + 'linux-dmabuf-v1': mod_wl.find_protocol('linux-dmabuf', state : 'stable', version : 1), 'presentation-time': mod_wl.find_protocol('presentation-time'), 'tearing-control-v1': mod_wl.find_protocol('tearing-control', state : 'staging', version : 1), 'linux-drm-syncobj-v1': mod_wl.find_protocol('linux-drm-syncobj', state : 'staging', version : 1), diff --git a/src/vulkan/device-select-layer/device_select_wayland.c b/src/vulkan/device-select-layer/device_select_wayland.c index 5846d2aaa2c..a1d4c31c18b 100644 --- a/src/vulkan/device-select-layer/device_select_wayland.c +++ b/src/vulkan/device-select-layer/device_select_wayland.c @@ -31,7 +31,7 @@ #include #include #include "device_select.h" -#include "linux-dmabuf-unstable-v1-client-protocol.h" +#include "linux-dmabuf-v1-client-protocol.h" struct device_select_wayland_info { #ifdef HAVE_BIND_WL_DISPLAY diff --git a/src/vulkan/device-select-layer/meson.build b/src/vulkan/device-select-layer/meson.build index 331a9587ef2..97becbf6cd2 100644 --- a/src/vulkan/device-select-layer/meson.build +++ b/src/vulkan/device-select-layer/meson.build @@ -20,7 +20,7 @@ if with_platform_wayland vklayer_files += [ wayland_drm_client_protocol_h, wayland_drm_protocol_c ] vklayer_flags += [ '-DHAVE_BIND_WL_DISPLAY' ] endif - vklayer_files += wp_files['linux-dmabuf-unstable-v1'] + vklayer_files += wp_files['linux-dmabuf-v1'] vklayer_deps += dep_wayland_client endif diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index 38a83d08eab..a8a70a1d631 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -18,7 +18,7 @@ if with_platform_wayland files_vulkan_wsi += files('wsi_common_wayland.c') files_vulkan_wsi += wp_files['fifo-v1'] files_vulkan_wsi += wp_files['commit-timing-v1'] - files_vulkan_wsi += wp_files['linux-dmabuf-unstable-v1'] + files_vulkan_wsi += wp_files['linux-dmabuf-v1'] files_vulkan_wsi += wp_files['presentation-time'] files_vulkan_wsi += wp_files['tearing-control-v1'] links_vulkan_wsi += libloader_wayland_helper diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 083777f42ac..837724f4ed4 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -43,7 +43,7 @@ #include "wsi_common_private.h" #include "fifo-v1-client-protocol.h" #include "commit-timing-v1-client-protocol.h" -#include "linux-dmabuf-unstable-v1-client-protocol.h" +#include "linux-dmabuf-v1-client-protocol.h" #include "presentation-time-client-protocol.h" #include "linux-drm-syncobj-v1-client-protocol.h" #include "tearing-control-v1-client-protocol.h" diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap index c6686b4ae4a..e25556ee420 100644 --- a/subprojects/wayland-protocols.wrap +++ b/subprojects/wayland-protocols.wrap @@ -1,8 +1,11 @@ -[wrap-file] +[wrap-git] directory = wayland-protocols-1.41 -source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.41/downloads/wayland-protocols-1.41.tar.xz -source_filename = wayland-protocols-1.41.tar.xz -source_hash = 2786b6b1b79965e313f2c289c12075b9ed700d41844810c51afda10ee329576b +#source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.41/downloads/wayland-protocols-1.41.tar.xz +#source_filename = wayland-protocols-1.41.tar.xz +#source_hash = 2786b6b1b79965e313f2c289c12075b9ed700d41844810c51afda10ee329576b +url = https://gitlab.freedesktop.org/Zamundaaa/wayland-protocols.git +revision = work/multi-gpu-dmabuf +depth = 1 [provide] wayland-protocols = wayland_protocols