Commit d9a8008a authored by Dylan Baker's avatar Dylan Baker
Browse files

meson: Correct behavior of vdpau=auto

Currently if vdpau is set to auto, it will be disabled only in cases
where gallium is disabled or the host OS is not supported (mac, haiku,
windows). However on (for example) Linux if libvdpau is not installed
then the build will error because of the unmet dependency. This corrects
auto to do the right thing, and not error if libvdpau is not installed.

Fixes: 992af0a4


       ("meson: dedup gallium-vdpau logic")
Signed-off-by: default avatarDylan Baker <dylan.c.baker@intel.com>
Reviewed-by: default avatarEric Engestrom <eric.engestrom@intel.com>
parent ca59c390
...@@ -398,16 +398,17 @@ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or ...@@ -398,16 +398,17 @@ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
else else
_vdpau = 'false' _vdpau = 'false'
endif endif
elif _vdpau == 'auto'
_vdpau = 'true'
endif endif
with_gallium_vdpau = _vdpau == 'true'
dep_vdpau = null_dep dep_vdpau = null_dep
if with_gallium_vdpau with_gallium_vdpau = false
dep_vdpau = dependency('vdpau', version : '>= 1.1') if _vdpau != 'false'
dep_vdpau = dependency('vdpau', version : '>= 1.1', required : _vdpau == 'true')
if dep_vdpau.found()
dep_vdpau = declare_dependency( dep_vdpau = declare_dependency(
compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split()
) )
with_gallium_vdpau = true
endif
endif endif
if with_gallium_vdpau if with_gallium_vdpau
......
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