From 7959af606932dad96432f54b79ea16a32442addb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 3 Oct 2021 22:30:57 +0200 Subject: [PATCH] Require libdcp 1.8.0. --- cscript | 2 +- wscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cscript b/cscript index fc2044f..ccd7da5 100644 --- a/cscript +++ b/cscript @@ -22,7 +22,7 @@ import os option_defaults = { 'force-cpp11': False } def dependencies(target, options): - return (('asdcplib', 'bb09615'), ('libdcp', '97b4901')) + return (('asdcplib', 'bb09615'), ('libdcp', 'v1.8.0')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory diff --git a/wscript b/wscript index 2047a79..eb8476f 100644 --- a/wscript +++ b/wscript @@ -110,12 +110,12 @@ def configure(conf): conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True) if conf.options.static: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.0', args='--cflags', uselib_store='DCP', mandatory=True) conf.env.HAVE_DCP = 1 conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-carl', 'kumu-carl', 'openjp2', 'cxml'] conf.env.LIB_DCP = ['ssl', 'crypto', 'xmlsec1-openssl', 'xmlsec1', 'glibmm-2.4', 'xml++-2.6', 'xml2', 'dl'] else: - conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.2', args='--cflags --libs', uselib_store='DCP', mandatory=True) + conf.check_cfg(package='libdcp-1.0', atleast_version='1.8.0', args='--cflags --libs', uselib_store='DCP', mandatory=True) conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP] -- 2.30.2