diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-21 08:28:36 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-25 08:43:39 -0700 |
| commit | f77cae2c59d098000a3b6b682f36c80719782524 (patch) | |
| tree | e48649d65919509e88cc46058eb7d8b030c20eb2 | |
| parent | abe65eb58f305be0958493bec162bfad095a4ed9 (diff) | |
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: 992af0a4b8224bdb4809e01c2f00d2f32546aee5
("meson: dedup gallium-vdpau logic")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
(cherry picked from commit d9a8008a93d87287b696627ea6dd01b278b6d579)
| -rw-r--r-- | meson.build | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meson.build b/meson.build index c5600978d4..2548614477 100644 --- a/meson.build +++ b/meson.build @@ -420,16 +420,17 @@ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or else _vdpau = 'false' endif -elif _vdpau == 'auto' - _vdpau = 'true' endif -with_gallium_vdpau = _vdpau == 'true' dep_vdpau = null_dep -if with_gallium_vdpau - dep_vdpau = dependency('vdpau', version : '>= 1.1') - dep_vdpau = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() - ) +with_gallium_vdpau = false +if _vdpau != 'false' + dep_vdpau = dependency('vdpau', version : '>= 1.1', required : _vdpau == 'true') + if dep_vdpau.found() + dep_vdpau = declare_dependency( + compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() + ) + with_gallium_vdpau = true + endif endif if with_gallium_vdpau |