fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

drop this: use git wayland-protocols

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-09-30 12:43:39 +02:00
parent a123fb9dec
commit 62f0fd1568
9 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/egl/drivers/dri2/egl_dri2.c
View file

@ -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"

2
src/egl/drivers/dri2/platform_wayland.c
View file

@ -56,7 +56,7 @@
#include "dri_util.h"
#include <loader_wayland_helper.h>
#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

2
src/egl/meson.build
View file

@ -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]

2
src/loader/meson.build
View file

@ -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),

2
src/vulkan/device-select-layer/device_select_wayland.c
View file

@ -31,7 +31,7 @@
#include <unistd.h>
#include <xf86drm.h>
#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

2
src/vulkan/device-select-layer/meson.build
View file

@ -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

2
src/vulkan/wsi/meson.build
View file

@ -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

2
src/vulkan/wsi/wsi_common_wayland.c
View file

@ -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"

11
subprojects/wayland-protocols.wrap
View file

@ -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