summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-13 15:50:18 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-13 15:50:18 +0100
commita2581c3058dc913d98fbac44be5c17f3453762ec (patch)
treed9128af0b11f3d4df3e8d61b5aefa0193e31a357
parenta57a940ab09579f37208df382dab03368a921cc8 (diff)
Bump libdcp/libsub versions.
-rw-r--r--cscript2
-rw-r--r--wscript8
2 files changed, 5 insertions, 5 deletions
diff --git a/cscript b/cscript
index 25f1ed0e0..7c6e6d6d7 100644
--- a/cscript
+++ b/cscript
@@ -224,7 +224,7 @@ def make_spec(filename, version, target):
def dependencies(target):
return (('ffmpeg-cdist', '0492ad2'),
- ('libdcp', '69942bc'),
+ ('libdcp', '1.1.0'),
('libsub', 'f66b11f'))
def configure_options(target):
diff --git a/wscript b/wscript
index 8c76ca22e..2b6ffcdf8 100644
--- a/wscript
+++ b/wscript
@@ -217,21 +217,21 @@ def configure(conf):
# libdcp
if conf.options.static_dcp:
- conf.check_cfg(package='libdcp-1.0', atleast_version='1.00.0', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.1.0', 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.00.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libdcp-1.0', atleast_version='1.1.0', 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.00.0', args='--cflags', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags', uselib_store='DCP', 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.00.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+ conf.check_cfg(package='libsub-1.0', atleast_version='1.1.0', args='--cflags --libs', uselib_store='DCP', mandatory=True)
conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
# libxml++