summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-09-13 23:44:45 +0100
committerCarl Hetherington <cth@carlh.net>2015-09-13 23:44:45 +0100
commit2277ba9c361bde52d1351a798ae8c25017e1fa31 (patch)
tree37b37a629016b7844a07fd32746eeb95a04565f4
parent5bb057f34a6015b259acc7a731ae3b5786be451e (diff)
Bump libdcp/libsub versions.
-rw-r--r--cscript4
-rw-r--r--wscript8
2 files changed, 6 insertions, 6 deletions
diff --git a/cscript b/cscript
index 6a94b0124..e49825de4 100644
--- a/cscript
+++ b/cscript
@@ -246,8 +246,8 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
- ('libdcp', '36439e0'),
- ('libsub', 'c06f6cf'))
+ ('libdcp', 'v1.2.4'),
+ ('libsub', 'v1.1.5'))
def configure_options(target):
opt = ''
diff --git a/wscript b/wscript
index 560fb9df5..27cf2e060 100644
--- a/wscript
+++ b/wscript
@@ -222,21 +222,21 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.3', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.4', 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-libdcp-1.0', 'kumu-libdcp-1.0']
conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
else:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.3', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.2.4', 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.4', args='--cflags', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.5', 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.4', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.5', args='--cflags --libs', uselib_store='SUB', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++