summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-03-17 10:33:00 +0000
committerCarl Hetherington <cth@carlh.net>2018-03-17 10:33:00 +0000
commit53188d05d3b1c99b92f11c6cdee371fc823c45f3 (patch)
treec99a4d123ec6306b1a632a7d56c368355a1e1231
parent642b4d686019f2bfff8078b367c592186d0964fe (diff)
Bump libdcp and libsub to release versions.
-rw-r--r--cscript4
-rw-r--r--wscript8
2 files changed, 6 insertions, 6 deletions
diff --git a/cscript b/cscript
index 611f5910c..81bf6a797 100644
--- a/cscript
+++ b/cscript
@@ -302,8 +302,8 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
- ('libdcp', '92d0468'),
- ('libsub', '708eff1'),
+ ('libdcp', 'v1.5.2'),
+ ('libsub', 'v1.3.1'),
('rtaudio-cdist', '739969e'))
def configure_options(target):
diff --git a/wscript b/wscript
index 75f3fe64d..8d26f6beb 100644
--- a/wscript
+++ b/wscript
@@ -352,21 +352,21 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.1', 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.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.5.1', 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]
# libsub
if conf.options.static_sub:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.3.1', args='--cflags', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
conf.env.STLIB_SUB = ['sub-1.0']
else:
- conf.check_cfg(package='libsub-1.0', atleast_version='1.3.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.3.1', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++