From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Oct 2020 19:15:49 +0000 (+0200)
Subject: Bump libdcp (and following libsub) to fix crashes with ASSETMAPs
X-Git-Tag: v2.14.39
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=fecc0c792748e2b16e8fad33186db79ce6850cc9;p=dcpomatic.git

Bump libdcp (and following libsub) to fix crashes with ASSETMAPs
containing files that are not in any PKL (#1855).
---

diff --git a/cscript b/cscript
index 244a13541..7ff96d38a 100644
--- a/cscript
+++ b/cscript
@@ -365,8 +365,8 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.6.15'))
-    deps.append(('libsub', 'v1.4.19'))
+    deps.append(('libdcp', 'v1.6.16'))
+    deps.append(('libsub', 'v1.4.23'))
     deps.append(('rtaudio-cdist', 'bf0fc23'))
 
     return deps
diff --git a/wscript b/wscript
index 700d6dcef..23b06e7ef 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.15', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.16', 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.15', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.6.16', 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.18', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.23', 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.18', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.23', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++