[Mesa-dev] [PATCH 06/11] meson: Move Wayland dmabuf to wayland-drm

[Daniel Stone]

As the comment notes: linux-dmabuf has nothing to do with wayland-drm,
but we need a single place to build these files we can use from both EGL
and Vulkan, which is guaranteed to be included before both EGL and
Vulkan WSI.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Cc: Emil Velikov <emil.velikov at collabora.co.uk>
---
 src/egl/meson.build                     | 14 --------------
 src/egl/wayland/wayland-drm/meson.build | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 6cd04567b0d..cd51ad308f6 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -58,20 +58,6 @@ files_egl = files(
   'drivers/dri2/egl_dri2_fallbacks.h',
 )
 
-linux_dmabuf_unstable_v1_protocol_c = custom_target(
-  'linux-dmabuf-unstable-v1-protocol.c',
-  input : wayland_dmabuf_xml,
-  output : 'linux-dmabuf-unstable-v1-protocol.c',
-  command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
-)
-
-linux_dmabuf_unstable_v1_client_protocol_h = custom_target(
-  'linux-dmabuf-unstable-v1-client-protocol.h',
-  input : wayland_dmabuf_xml,
-  output : 'linux-dmabuf-unstable-v1-client-protocol.h',
-  command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
-)
-
 g_egldispatchstubs_c = custom_target(
   'g_egldispatchstubs.c',
   input : [
diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
index fa334880530..c627deaa1c3 100644
--- a/src/egl/wayland/wayland-drm/meson.build
+++ b/src/egl/wayland/wayland-drm/meson.build
@@ -48,3 +48,25 @@ libwayland_drm = static_library(
   dependencies : [dep_wayland_server],
   build_by_default : false,
 )
+
+# linux-dmabuf isn't part of wayland-drm, but this happens to be the only
+# place which is a) guaranteed to be built when building either or both
+# of EGL and Vulkan WSI, and b) guaranteed to be included before both,
+# so the targets are actually defined by the time the files come to be
+# used.
+#
+# Moving these to a src/wsi/ was suggested but shot down, so put these
+# here for now as the maybe-least-bad solution.
+linux_dmabuf_unstable_v1_protocol_c = custom_target(
+  'linux-dmabuf-unstable-v1-protocol.c',
+  input : wayland_dmabuf_xml,
+  output : 'linux-dmabuf-unstable-v1-protocol.c',
+  command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
+)
+
+linux_dmabuf_unstable_v1_client_protocol_h = custom_target(
+  'linux-dmabuf-unstable-v1-client-protocol.h',
+  input : wayland_dmabuf_xml,
+  output : 'linux-dmabuf-unstable-v1-client-protocol.h',
+  command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
+)
-- 
2.14.3