summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-03-02 20:16:31 +0000
committerCarl Hetherington <cth@carlh.net>2016-03-02 20:16:31 +0000
commit3b825abd44ba513b1c70659c4199b2cca7cb5ae9 (patch)
tree633e7d16710ebc6c7a231b2282f45395927bcf92
parent0d5a44b873945c40bc60d306060f1bebb098f4f2 (diff)
Bump libdcp for HMAC fix.
-rw-r--r--cscript2
-rw-r--r--wscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index d2271b89f..2bb2b6c28 100644
--- a/cscript
+++ b/cscript
@@ -262,7 +262,7 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
- ('libdcp', 'v1.3.0'),
+ ('libdcp', 'v1.3.1'),
('libsub', 'v1.1.11'))
def configure_options(target):
diff --git a/wscript b/wscript
index f3f62d157..8f51a6ac9 100644
--- a/wscript
+++ b/wscript
@@ -237,12 +237,12 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.1', args='--cflags', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-cth', 'kumu-cth', 'openjp2']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.1', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub