From 8838c4a5b18f7079fabdd6dc1b37f3aacc7f20c2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 22 Sep 2015 11:46:57 +0200 Subject: build: allow disabling vapoursynth completely It's possible to build vf_vapoursynth with either the Python or Lua backend (or both or none). The check for the vapoursynth core itself was hidden away and couldn't be disabled, which would link mpv with vapoursynth even if all backends were disabled. Rearrange the checks so that the core will be disabled if no backend is found (or both are disabled). This duplicates the check for vapoursynth.pc, but since it's trivial, this is not that bad. --- wscript | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 981f55b163..1b1372ee5a 100644 --- a/wscript +++ b/wscript @@ -355,19 +355,20 @@ iconv support use --disable-iconv.", 'name': '--lcms2', 'desc': 'LCMS2 support', 'func': check_pkg_config('lcms2', '>= 2.6'), - }, { - 'name': 'vapoursynth-core', - 'desc': 'VapourSynth filter bridge (core)', - 'func': check_pkg_config('vapoursynth >= 24'), }, { 'name': '--vapoursynth', 'desc': 'VapourSynth filter bridge (Python)', - 'deps': ['vapoursynth-core'], - 'func': check_pkg_config('vapoursynth-script >= 23'), + 'func': check_pkg_config('vapoursynth', '>= 24', + 'vapoursynth-script', '>= 23'), }, { 'name': '--vapoursynth-lazy', 'desc': 'VapourSynth filter bridge (Lazy Lua)', - 'deps': ['vapoursynth-core', 'lua'], + 'deps': ['lua'], + 'func': check_pkg_config('vapoursynth', '>= 24'), + }, { + 'name': 'vapoursynth-core', + 'desc': 'VapourSynth filter bridge (core)', + 'deps_any': ['vapoursynth', 'vapoursynth-lazy'], 'func': check_true, }, { 'name': '--libarchive', -- cgit v1.2.3