summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-03-12 00:13:00 +0000
committerCarl Hetherington <cth@carlh.net>2019-03-12 00:13:00 +0000
commitbf783da991dd50e2281d3f6794cc89a2b4b8fe1c (patch)
tree1ddeef145c4a6ff83e1788c370395ef6bcb96e09
parent1c70f3aec91bddcfe2b321dab16a5bd70bc3f089 (diff)
Bump libcxml -> 0.16.0 and libdcp -> 1.6.2.v1.4.1
-rw-r--r--cscript2
-rw-r--r--wscript8
2 files changed, 5 insertions, 5 deletions
diff --git a/cscript b/cscript
index 7ad2446..7a12af1 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
import os
def dependencies(target):
- return (('asdcplib-cth', '6648afc'), ('libcxml', '4dfe693'), ('libdcp', '6a85c30'))
+ return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.0'), ('libdcp', 'v1.6.2'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index f30889a..55f162a 100644
--- a/wscript
+++ b/wscript
@@ -109,17 +109,17 @@ def configure(conf):
conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
if conf.options.static:
- conf.check_cfg(package='libcxml', atleast_version='0.14.0', args='--cflags', uselib_store='CXML', mandatory=True)
+ conf.check_cfg(package='libcxml', atleast_version='0.16.0', args='--cflags', uselib_store='CXML', mandatory=True)
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.6.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='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.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]