Bump libsub to 1.3.6 to fix crash on malformed .srt (#1454).
authorCarl Hetherington <cth@carlh.net>
Tue, 29 Jan 2019 22:42:50 +0000 (22:42 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 29 Jan 2019 22:42:50 +0000 (22:42 +0000)
cscript
wscript

diff --git a/cscript b/cscript
index 13a476776a9b51876b48b8b2caf2f16fcb2f7073..6b7ab2628f2b7220b86115d7418f573236bb4a22 100644 (file)
--- a/cscript
+++ b/cscript
@@ -331,7 +331,7 @@ def dependencies(target):
 
     return (('ffmpeg-cdist', '4bd8d09', ffmpeg_options),
             ('libdcp', 'v1.5.5'),
-            ('libsub', 'v1.3.5'),
+            ('libsub', 'v1.3.6'),
             ('rtaudio-cdist', '739969e'))
 
 def configure_options(target):
diff --git a/wscript b/wscript
index 580e44b02b31d3cc9706fbb3be6d7dcd460e5833..fba8b9e6f6452bf4c0e5f873515386cea2ca123d 100644 (file)
--- a/wscript
+++ b/wscript
@@ -363,11 +363,11 @@ def configure(conf):
 
     # libsub
     if conf.options.static_sub:
-        conf.check_cfg(package='libsub-1.0', atleast_version='1.3.3', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.3.6', 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.3.3', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.3.6', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++