Bump version

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 26dd3c9b0da836940dfd4c5dbe70b94e541284ef..636285564910b20f559dbd83a08e85469b6e0149 100644 (file)
--- 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.25devel'
 
 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
@@ -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