Port ffprobe fix for OS X.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 822a3b8696c1b4976043ad7a70617ec79688b207..edbc00b6ad1433e2c9d05743a8ab8c01efecf778 100644 (file)
--- a/wscript
+++ b/wscript
@@ -45,7 +45,7 @@ def configure(conf):
 
     # Windows-specific
     if conf.env.TARGET_WINDOWS:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug:
@@ -86,7 +86,7 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.67', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.70', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
     conf.check_cfg(package='libcxml',       atleast_version='0.01', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
@@ -224,7 +224,7 @@ def git_revision():
     cmd = "LANG= git log --abbrev HEAD^..HEAD ."
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
     o = output[0].decode('utf-8')
-    return o.replace ("commit ", "")[0:10]
+    return o.replace("commit ", "")[0:10]
 
 def dist(ctx):
     r = git_revision()
@@ -243,7 +243,7 @@ def dist(ctx):
 def create_version_cc(version, cxx_flags):
     commit = git_revision()
     if commit is None and os.path.exists('.git_revision'):
-        f = open('.git_revision')
+        f = open('.git_revision', 'r')
         commit = f.readline().strip()
     
     if commit is None: