summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-31 15:56:31 +0000
committerCarl Hetherington <cth@carlh.net>2016-10-31 15:56:31 +0000
commit00a492145a082e9ed9b02c5cab09f5d91b730ec9 (patch)
treee9f6f98a8560a3d96fa09f04c4150f2b811a02b1
parent92dfe9454ef49363f49c19a7c7c4825c4a18771b (diff)
Bump libdcp/libsub.
-rw-r--r--cscript4
-rw-r--r--wscript8
2 files changed, 6 insertions, 6 deletions
diff --git a/cscript b/cscript
index 3bc8dff5e..11c7728cb 100644
--- a/cscript
+++ b/cscript
@@ -245,8 +245,8 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
- ('libdcp', 'v1.4.0'),
- ('libsub', 'v1.2.0'))
+ ('libdcp', 'v1.4.1'),
+ ('libsub', 'v1.2.1'))
def configure_options(target):
opt = ''
diff --git a/wscript b/wscript
index a7c897e44..02825572e 100644
--- a/wscript
+++ b/wscript
@@ -277,21 +277,21 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.0', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.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.4.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.4.1', 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.2.0', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.2.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.2.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.2.1', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++