X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2f2d4122bb4219d05808f7ed54266d7241c24a13;hb=906451444fb8888acb8553909e0667857c683c31;hp=d3c7b4c76995bb318ffd4e36268c439a4a106151;hpb=a7e1b15deaa82df8609dc151aad232d7ff1a912c;p=dcpomatic.git

diff --git a/wscript b/wscript
index d3c7b4c76..2f2d4122b 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.18'
+VERSION = '2.6.19'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -239,7 +239,7 @@ def configure(conf):
     if conf.options.static_dcp:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
-        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0', 'openjp2']
+        conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
         conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
     else:
         conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
@@ -271,7 +271,7 @@ 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 = []