Mesa (refs/keep-around/94cf3970925ec87d913a1549a42cdb03713fc4bb): meson: Fix auto option for va

[GitLab Mirror]

Module: Mesa
Branch: refs/keep-around/94cf3970925ec87d913a1549a42cdb03713fc4bb
Commit: 94cf3970925ec87d913a1549a42cdb03713fc4bb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94cf3970925ec87d913a1549a42cdb03713fc4bb

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Thu Jun 21 08:35:03 2018 -0700

meson: Fix auto option for va

The same as the previous two patches, but for the libva state tracker.

Fixes: 724916c8a84b5bba8f880f17da936585d52c97b6
       ("meson: dedup gallium-xvmc logic")
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 meson.build | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 82e2b53525..e88616c9e8 100644
--- a/meson.build
+++ b/meson.build
@@ -559,13 +559,16 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
 elif _va == 'auto'
   _va = 'true'
 endif
-with_gallium_va = _va == 'true'
+with_gallium_va = false
 dep_va = null_dep
-if with_gallium_va
-  dep_va = dependency('libva', version : '>= 0.39.0')
-  dep_va_headers = declare_dependency(
-    compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split()
-  )
+if _va != 'false'
+  dep_va = dependency('libva', version : '>= 0.38.0', required : _va == 'true')
+  if dep_va.found()
+    dep_va_headers = declare_dependency(
+      compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split()
+    )
+    with_gallium_va = true
+  endif
 endif
 
 va_drivers_path = get_option('va-libs-path')