summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-25 00:55:24 +0100
committerCarl Hetherington <cth@carlh.net>2016-04-25 00:55:24 +0100
commit0a6e0bd2075f421d8d2a9c3b3c479328fe868be6 (patch)
treeac4c0cce3a8c4826cbc6c97acd5be17f280240c7
parent7a4c9163bec16052219b7aae551266d8369475f5 (diff)
Bump libdcp/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 b2968f02c..e6d89fdca 100644
--- a/cscript
+++ b/cscript
@@ -229,8 +229,8 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
- ('libdcp', 'd926e11'),
- ('libsub', 'b9fb00d'))
+ ('libdcp', 'v1.3.3'),
+ ('libsub', 'v1.1.12'))
def configure_options(target):
opt = ''
diff --git a/wscript b/wscript
index 1f875366b..58aac8a1b 100644
--- a/wscript
+++ b/wscript
@@ -237,21 +237,21 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.2', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.3', 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.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.3.3', 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.1.11', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.12', 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.1.11', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.12', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++