Bump libdcp to release version.
authorCarl Hetherington <cth@carlh.net>
Sat, 17 Mar 2018 10:30:40 +0000 (10:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 17 Mar 2018 10:30:40 +0000 (10:30 +0000)
cscript
wscript

diff --git a/cscript b/cscript
index 12898dfe96a68be4c8ccb338bdeaa661b5aef24f..65ae6e1dd839fb5c2ba85ab22aa2dc844f7aa60e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', 'v0.15.5'), ('libdcp', '92d0468'))
+    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', 'v0.15.5'), ('libdcp', 'v1.5.2'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index f01b53c93ecec298ca217e49d88466a14e8f6c2f..d259222731df28bec90aa3d58822a9012eb7e1c2 100644 (file)
--- a/wscript
+++ b/wscript
@@ -81,13 +81,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.4.4', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.2', 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.15.2', args='--cflags --libs', uselib_store='CXML', mandatory=True)
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.4', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)
 
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]