X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=0dc9594c7365dc4d32de2ab0e440090e193249b1;hb=b20c4b11abff0bd57dab03174070ec8571bbe4d5;hp=10a61c7073cba6f7b1b91b6cdcd8a3030d11bd4f;hpb=aeda37434f0c55686839bdc12c876deb39ea014a;p=dcpomatic.git diff --git a/wscript b/wscript index 10a61c707..0dc9594c7 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.9.38devel' +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="""