From 0a6e0bd2075f421d8d2a9c3b3c479328fe868be6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Apr 2016 00:55:24 +0100 Subject: [PATCH] Bump libdcp/libsub to release versions. --- cscript | 4 ++-- wscript | 8 ++++---- 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++ -- 2.30.2