Commit 94cf3970 authored by Dylan Baker's avatar Dylan Baker
Browse files

meson: Fix auto option for va

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

Fixes: 724916c8


       ("meson: dedup gallium-xvmc logic")
Signed-off-by: default avatarDylan Baker <dylan.c.baker@intel.com>
Reviewed-by: default avatarEric Engestrom <eric.engestrom@intel.com>
parent a6943bb4
...@@ -559,13 +559,16 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) ...@@ -559,13 +559,16 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
elif _va == 'auto' elif _va == 'auto'
_va = 'true' _va = 'true'
endif endif
with_gallium_va = _va == 'true' with_gallium_va = false
dep_va = null_dep dep_va = null_dep
if with_gallium_va if _va != 'false'
dep_va = dependency('libva', version : '>= 0.39.0') dep_va = dependency('libva', version : '>= 0.38.0', required : _va == 'true')
dep_va_headers = declare_dependency( if dep_va.found()
compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() dep_va_headers = declare_dependency(
) compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split()
)
with_gallium_va = true
endif
endif endif
va_drivers_path = get_option('va-libs-path') va_drivers_path = get_option('va-libs-path')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment