Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

2 files changed, 3 insertions, 2 deletions

diff --git a/cscript b/cscript
index 24f8e156..6a59c576 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', 'v0.14.0'), ('openjpeg-cdist', '5d8bffd'))
+    return (('libcxml', '5f7703a'), ('openjpeg-cdist', '5d8bffd'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -9,7 +9,7 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if target.distro == 'debian' and target.version == 'unstable':
+        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
             target.append_with_space('CXXFLAGS', '-std=c++11')
     elif target.platform == 'windows':
         cmd += ' --target-windows --disable-tests'
diff --git a/wscript b/wscript
index 8a6dd47b..b87022f6 100644
--- a/wscript
+++ b/wscript
@@ -2,6 +2,7 @@ import subprocess
 import os
 import sys
 import distutils.spawn
+from waflib import Logs
 
 APPNAME = 'libdcp'
 VERSION = '1.2.8devel'