From 2277ba9c361bde52d1351a798ae8c25017e1fa31 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 13 Sep 2015 23:44:45 +0100 Subject: Bump libdcp/libsub versions. --- cscript | 4 ++-- wscript | 8 ++++---- 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++ -- cgit v1.2.3