From: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Date: Mon, 28 Jan 2019 11:30:01 +0000 (+0100)
Subject: build: meson: compile without wayland support
X-Git-Tag: android-x86-9.0-r1~4
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-common-vaapi.git;a=commitdiff_plain;h=10507d3fb6c678d005ef6ed241e24a0d119ca3ba

build: meson: compile without wayland support

This patch replaces the PR

https://github.com/intel/intel-vaapi-driver/pull/441
---

diff --git a/meson.build b/meson.build
index 51bb1d0..fa0b2f2 100644
--- a/meson.build
+++ b/meson.build
@@ -81,17 +81,22 @@ if get_option('with_wayland') != 'no'
 
   if wayland_client_dep.found()
     prefix = wayland_client_dep.get_pkgconfig_variable('prefix')
-    wl_scanner = find_program(
-      'wayland-scanner',
-      join_paths(prefix, '/bin/wayland-scanner'))
+    wayland_scanner = join_paths(prefix, 'bin', 'wayland-scanner')
+  else
+    wayland_scanner = ''
   endif
 
+  wl_scanner = find_program('wayland-scanner', wayland_scanner,
+			    required : get_option('with_wayland') == 'yes')
+
   libva_wayland_dep = dependency(
     'libva-wayland',
     version : libva_version,
     required : get_option('with_wayland') == 'yes')
 
-  WITH_WAYLAND = wl_scanner.found() and libva_wayland_dep.found()
+  WITH_WAYLAND = (wayland_client_dep.found()
+		  and wl_scanner.found()
+		  and libva_wayland_dep.found())
 endif
 
 subdir('src')