From abe65eb58f305be0958493bec162bfad095a4ed9 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 21 Jun 2018 08:34:05 -0700 Subject: meson: Fix auto option for xvmc This fixes the same problem as the previous patch did for vdpau, but for xvmc. Fixes: 724916c8a84b5bba8f880f17da936585d52c97b6 ("meson: dedup gallium-xvmc logic") Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom (cherry picked from commit a6943bb4ce99ea7af7222552f1326fb80823d0b2) Squashed with: meson: Fix typo that breaks -Dgalium-xvmc=false _xmvc -> _xvmc. Sigh Fixes: a6943bb4ce99ea7af7222552f1326fb80823d0b2 ("meson: Fix auto option for xvmc") Signed-off-by: Dylan Baker Reviewed-by: Kenneth Graunke Tested-by: Clayton Craft (cherry picked from commit ced3df5623ca362a528ce06df46299701efa3644) --- meson.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index fc01056369..c5600978d4 100644 --- a/meson.build +++ b/meson.build @@ -459,13 +459,12 @@ elif not (with_gallium_r600 or with_gallium_nouveau) else _xvmc = 'false' endif -elif _xvmc == 'auto' - _xvmc = 'true' endif -with_gallium_xvmc = _xvmc == 'true' dep_xvmc = null_dep -if with_gallium_xvmc - dep_xvmc = dependency('xvmc', version : '>= 1.0.6') +with_gallium_xvmc = false +if _xvmc != 'false' + dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true') + with_gallium_xvmc = dep_xvmc.found() endif xvmc_drivers_path = get_option('xvmc-libs-path') -- cgit v1.2.3