From 3093d93e1f0baadf4c1ec866adacb244d10fabbe Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Oct 2014 01:31:20 +0200 Subject: vf_vapoursynth: add standalone Lua scripting --- wscript | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index da056d9b51..881333f675 100644 --- a/wscript +++ b/wscript @@ -243,6 +243,10 @@ iconv support use --disable-iconv.", 'desc': 'libquvi support', 'deps_any': [ 'libquvi4', 'libquvi9' ], 'func': check_true + }, { + 'name' : '--lua', + 'desc' : 'Lua', + 'func': check_lua, }, { 'name': '--libass', 'desc': 'SSA/ASS support', @@ -318,10 +322,20 @@ If you really mean to compile without libass support use --disable-libass." '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 >= 23'), }, { 'name': '--vapoursynth', - 'desc': 'VapourSynth filter bridge', - 'func': check_pkg_config('vapoursynth >= 23 vapoursynth-script >= 23'), + 'desc': 'VapourSynth filter bridge (Python)', + 'deps': ['vapoursynth-core'], + 'func': check_pkg_config('vapoursynth-script >= 23'), + }, { + 'name': '--vapoursynth-lazy', + 'desc': 'VapourSynth filter bridge (Lazy Lua)', + 'deps': ['vapoursynth-core', 'lua'], + 'func': check_true, } ] @@ -725,14 +739,6 @@ radio_and_tv_features = [ } ] -scripting_features = [ - { - 'name' : '--lua', - 'desc' : 'Lua', - 'func': check_lua, - } -] - standalone_features = [ { 'name': '--cplayer', @@ -796,10 +802,9 @@ def options(opt): opt.parse_features('video outputs', video_output_features) opt.parse_features('hwaccels', hwaccel_features) opt.parse_features('tv features', radio_and_tv_features) - opt.parse_features('scripting', scripting_features) opt.parse_features('standalone app', standalone_features) - group = opt.get_option_group("scripting") + group = opt.get_option_group("optional feaures") group.add_option('--lua', type = 'string', dest = 'LUA_VER', @@ -856,7 +861,6 @@ def configure(ctx): if ctx.options.LUA_VER: ctx.options.enable_lua = True - ctx.parse_dependencies(scripting_features) ctx.parse_dependencies(standalone_features) ctx.define('HAVE_SYS_SOUNDCARD_H', -- cgit v1.2.3