meson: fix wayland-less builds

Those empty variables in the !wayland case are useless and running that
meson.build with them breaks the build:

  [287/850] Generating wayland-drm-client-protocol.h with a custom command.
  FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  /bin/sh: client-header: command not found
  ninja: build stopped: subcommand failed.

Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/meson.build b/meson.build
index 58ff3ea9735f28e63a372285c82611f499621e3f..1b475877827ef69dbce8c50e9dfb54147f0ffbb6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1318,13 +1318,6 @@ if with_platform_wayland
     'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
   )
   pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
     'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
   )
   pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']

-else
-  prog_wl_scanner = []
-  wl_scanner_arg = ''
-  dep_wl_protocols = null_dep
-  dep_wayland_client = null_dep
-  dep_wayland_server = null_dep
-  wayland_dmabuf_xml = ''

 endif
 
 dep_x11 = null_dep
 endif
 
 dep_x11 = null_dep

diff --git a/src/meson.build b/src/meson.build
index 2c0bff734320d40efe861f300a4f5903d0edb1da..0d0ecf2c530749592bef2997368239c4c0168568 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,7 +51,9 @@ subdir('util')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')

-subdir('egl/wayland/wayland-drm')
+if with_platform_wayland
+  subdir('egl/wayland/wayland-drm')
+endif

 if with_any_vk
   subdir('vulkan')
 endif
 if with_any_vk
   subdir('vulkan')
 endif