X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=0dc9594c7365dc4d32de2ab0e440090e193249b1;hb=2d9deb25659ef6007fb800ae024917dfca04f9ca;hp=d541960b4f3af5bba5cba6af03826d0b3a9745e2;hpb=408012bed837d3cea6af2eb3c4dcc596a8eb8e00;p=dcpomatic.git diff --git a/wscript b/wscript index d541960b4..0dc9594c7 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.9.39' +VERSION = '2.11.0devel' def options(opt): opt.load('compiler_cxx') @@ -340,7 +340,7 @@ def configure(conf): # FFmpeg if conf.options.static_ffmpeg: - names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc'] + names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample'] for name in names: static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8') libs = [] @@ -369,6 +369,7 @@ def configure(conf): conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) + conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) # Check to see if we have our version of FFmpeg that allows us to get at EBUR128 results conf.check_cxx(fragment="""