diff options
author | wm4 <wm4@nowhere> | 2015-09-22 11:46:57 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-09-22 11:46:57 +0200 |
commit | 8838c4a5b18f7079fabdd6dc1b37f3aacc7f20c2 (patch) | |
tree | f628c8d51ef47b0c3064efa74c5fb37ec9394a08 | |
parent | a75e933dac4c6ebfd15c7c7cc0442fb21318df2a (diff) | |
download | mpv-8838c4a5b18f7079fabdd6dc1b37f3aacc7f20c2.tar.bz2 mpv-8838c4a5b18f7079fabdd6dc1b37f3aacc7f20c2.tar.xz |
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.
-rw-r--r-- | wscript | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -356,18 +356,19 @@ iconv support use --disable-iconv.", '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', |