X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ba23e3ea2627ea43875bc2f9c6ca16e95e813601;hb=cca752c350e50ac57740060d0a2684187075e4bb;hp=55e1d4ed34265e11ebe706aa4b8700f4e072f6f4;hpb=c314584769918824740c6eabb3541704bc5c7478;p=dcpomatic.git

diff --git a/wscript b/wscript
index 55e1d4ed3..ba23e3ea2 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.15devel'
+VERSION = '2.6.21'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -111,7 +111,7 @@ def configure(conf):
         conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
         conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
         boost_lib_suffix = '-mt'
-        boost_thread = 'boost_thread_win32-mt'
+        boost_thread = 'boost_thread-mt'
         conf.check_cxx(fragment="""
                                #include <boost/locale.hpp>\n
                                int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
@@ -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 = []
@@ -310,7 +310,7 @@ def configure(conf):
                    libpath='/usr/local/lib',
                    lib=['avfilter'],
                    uselib_store='PATCHED_FFMPEG',
-                   defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+                   define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
                    mandatory=False)
 
     # Boost