summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-01 23:35:06 +0200
committerCarl Hetherington <cth@carlh.net>2019-10-01 23:35:06 +0200
commit73fa83c9b47fa780eff4e5fc5011b7445ab956c0 (patch)
tree3d962f2197b6197c92173b33f85dbd54bb4b1886
parentdcc46f2a5243bfdccf700d5f3ace85ff8cd569f8 (diff)
Bump libdcp for CPL root element namespace fix.
-rw-r--r--cscript2
-rw-r--r--wscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index a7dd0282e..8703bf22e 100644
--- a/cscript
+++ b/cscript
@@ -376,7 +376,7 @@ def dependencies(target):
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.6.8'))
+ deps.append(('libdcp', 'v1.6.9'))
deps.append(('libsub', 'v1.4.10'))
deps.append(('rtaudio-cdist', 'bf0fc23'))
diff --git a/wscript b/wscript
index c6bcba56a..c9a4a0c4f 100644
--- a/wscript
+++ b/wscript
@@ -305,12 +305,12 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.8', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.9', 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.6.8', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.9', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
# libsub