From 63000b62c416961fae9b92c8da72a5febb6c4df1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 11 Nov 2019 21:26:40 +0100 Subject: [PATCH] Bump libdcp for fix to #1650. --- cscript | 4 ++-- wscript | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cscript b/cscript index 4c965456f..7d71949c4 100644 --- a/cscript +++ b/cscript @@ -344,8 +344,8 @@ def dependencies(target): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.6.10')) - deps.append(('libsub', 'v1.4.12')) + deps.append(('libdcp', 'v1.6.11')) + deps.append(('libsub', 'v1.4.13')) deps.append(('rtaudio-cdist', 'bf0fc23')) return deps diff --git a/wscript b/wscript index a7e5688e5..1f9ac2273 100644 --- a/wscript +++ b/wscript @@ -313,21 +313,21 @@ def configure(conf): # libdcp if conf.options.static_dcp: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.10', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', 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.6.10', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.11', 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.4.12', args='--cflags', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.13', 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.4.12', args='--cflags --libs', uselib_store='SUB', mandatory=True) + conf.check_cfg(package='libsub-1.0', atleast_version='1.4.13', 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