Merge branch 'master' of git.carlh.net:git/libdcp

2 files changed, 4 insertions, 4 deletions

diff --git a/cscript b/cscript
index 4dedf11f..7b53b9ee 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', 'f35787e'), ('openjpeg-cdist', '5d8bffd'))
+    return (('libcxml', 'v0.12.0'), ('openjpeg-cdist', '5d8bffd'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index a64fe76b..e705a2c4 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.101.0devel'
+VERSION = '0.104.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -51,12 +51,12 @@ def configure(conf):
                        }
                        """,
                        msg='Checking for library openjpeg', stlib='openjpeg', uselib_store='OPENJPEG', mandatory=True)
-        
+
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
     else:
         conf.check_cfg(package='libopenjpeg', args='--cflags --libs', uselib_store='OPENJPEG', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.11.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.12.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'