Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-intel-common-vaapi: Commit

hardware/intel/common/vaapi


Commit MetaInfo

Revision10507d3fb6c678d005ef6ed241e24a0d119ca3ba (tree)
Time2019-01-29 09:39:12
AuthorVíctor Manuel Jáquez Leal <vjaquez@igal...>
CommiterXiang, Haihao

Log Message

build: meson: compile without wayland support

This patch replaces the PR

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

Change Summary

Incremental Difference

--- a/meson.build
+++ b/meson.build
@@ -81,17 +81,22 @@ if get_option('with_wayland') != 'no'
8181
8282 if wayland_client_dep.found()
8383 prefix = wayland_client_dep.get_pkgconfig_variable('prefix')
84- wl_scanner = find_program(
85- 'wayland-scanner',
86- join_paths(prefix, '/bin/wayland-scanner'))
84+ wayland_scanner = join_paths(prefix, 'bin', 'wayland-scanner')
85+ else
86+ wayland_scanner = ''
8787 endif
8888
89+ wl_scanner = find_program('wayland-scanner', wayland_scanner,
90+ required : get_option('with_wayland') == 'yes')
91+
8992 libva_wayland_dep = dependency(
9093 'libva-wayland',
9194 version : libva_version,
9295 required : get_option('with_wayland') == 'yes')
9396
94- WITH_WAYLAND = wl_scanner.found() and libva_wayland_dep.found()
97+ WITH_WAYLAND = (wayland_client_dep.found()
98+ and wl_scanner.found()
99+ and libva_wayland_dep.found())
95100 endif
96101
97102 subdir('src')
Show on old repository browser