Bump to libdcp 1.8.2. v1.6.2
authorCarl Hetherington <cth@carlh.net>
Fri, 8 Oct 2021 10:52:05 +0000 (12:52 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 8 Oct 2021 10:52:05 +0000 (12:52 +0200)
cscript
wscript

diff --git a/cscript b/cscript
index 53da29f02c72c2e161b0180c34a1f1c79c680dab..4b9f91575a84efb7918ba8d47170def8f6d53c85 100644 (file)
--- a/cscript
+++ b/cscript
@@ -22,7 +22,7 @@ import os
 option_defaults = { 'force-cpp11': False }
 
 def dependencies(target, options):
-    return (('asdcplib', 'bb09615'), ('libdcp', 'v1.8.1'))
+    return (('asdcplib', 'bb09615'), ('libdcp', 'v1.8.2'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
diff --git a/wscript b/wscript
index ff5c14910afdcd0aeaf1e1593cefd3b593554460..2c846251bcaaf1e5a27172cd09a0030f8d7dc33a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -33,6 +33,8 @@ else:
 
 API_VERSION = '-1.0'
 
+libdcp_version = '1.8.2'
+
 try:
     from subprocess import STDOUT, check_output, CalledProcessError
 except ImportError:
@@ -110,12 +112,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.8.1', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version=libdcp_version, 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.8.1', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version=libdcp_version, args='--cflags --libs', uselib_store='DCP', mandatory=True)
 
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]