From: Carl Hetherington <cth@carlh.net>
Date: Sun, 3 Oct 2021 20:32:51 +0000 (+0200)
Subject: Require libsub v1.6.0.
X-Git-Tag: v2.15.166~5
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c1d869a515753264031ab7c852ab1a05ca2421ba

Require libsub v1.6.0.
---

diff --git a/cscript b/cscript
index 0f205c086..e864a294f 100644
--- a/cscript
+++ b/cscript
@@ -432,7 +432,7 @@ def dependencies(target, options):
         deps = []
 
     deps.append(('libdcp', 'v1.8.0'))
-    deps.append(('libsub', '587e475'))
+    deps.append(('libsub', 'v1.6.0'))
     deps.append(('leqm-nrt', '93ae9e6'))
     deps.append(('rtaudio', 'f619b76'))
     # We get our OpenSSL libraries from the environment, but we
diff --git a/wscript b/wscript
index 7eb247da0..be944e817 100644
--- a/wscript
+++ b/wscript
@@ -312,11 +312,11 @@ def configure(conf):
 
     # libsub
     if conf.options.static_sub:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.4.7', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.6.0', 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.7', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.6.0', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++