Bump libdcp to 1.6.11. v1.4.13
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2019 20:25:26 +0000 (21:25 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2019 20:25:26 +0000 (21:25 +0100)
cscript
wscript

diff --git a/cscript b/cscript
index cd4d109b2ee52513b82d90804acc9af99142d469..4f366aa42424fab5ca783ac6a97efebc5055bf14 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.1'), ('libdcp', 'v1.6.10'))
+    return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.1'), ('libdcp', 'v1.6.11'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index 8b5169b1241c98fc5082f08e26d58481ba38bdab..68f31cb733f49fb7e78cc0b58c25e39e915f35ed 100644 (file)
--- a/wscript
+++ b/wscript
@@ -108,13 +108,13 @@ def configure(conf):
         conf.env.HAVE_CXML = 1
         conf.env.LIB_CXML = ['glibmm-2.4', 'glib-2.0', 'pcre', 'sigc-2.0', 'rt', 'xml++-2.6', 'xml2', 'pthread', 'lzma', 'dl', 'z']
         conf.env.STLIB_CXML = ['cxml']
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', args='--cflags', uselib_store='DCP', mandatory=True)
         conf.env.HAVE_DCP = 1
         conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
         conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1']
     else:
         conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', args='--cflags --libs', uselib_store='DCP', mandatory=True)
 
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]