X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2f2d4122bb4219d05808f7ed54266d7241c24a13;hb=906451444fb8888acb8553909e0667857c683c31;hp=0364976ffd330395e1fb0717212deabba0f7c20e;hpb=cec6fc5d9f905b5246ea449b850503f47ee912fc;p=dcpomatic.git diff --git a/wscript b/wscript index 0364976ff..2f2d4122b 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.6.18devel' +VERSION = '2.6.19' def options(opt): opt.load('compiler_cxx') @@ -271,17 +271,17 @@ def configure(conf): if conf.options.static_ffmpeg: names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc'] for name in names: - static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0] + static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0].decode('utf-8') libs = [] stlibs = [] include = [] libpath = [] for s in static.split(): - if s.startswith(b'-L'): + if s.startswith('-L'): libpath.append(s[2:]) - elif s.startswith(b'-I'): + elif s.startswith('-I'): include.append(s[2:]) - elif s.startswith(b'-l'): + elif s.startswith('-l'): if s[2:] not in names: libs.append(s[2:]) else: