summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-03-17 10:30:40 +0000
committerCarl Hetherington <cth@carlh.net>2018-03-17 10:30:40 +0000
commitc4b622e8713d2ab09fb18d0c4cdd52884c471e4a (patch)
tree26879a85f1a39cc2ac27a016a2301a0f1fd2e8c3
parent708eff1d9b39bb63965b831082dd1b35c86a2054 (diff)
Bump libdcp to release version.
-rw-r--r--cscript2
-rw-r--r--wscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index 12898df..65ae6e1 100644
--- 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 f01b53c..d259222 100644
--- 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]