Backport tick rounding fix from libdcp;

7b03aba8bc4e9df269430d79ce4ee2c6bd5f344c on master
743acc9bc88f543257355d40c320992ab72d8abe on v1.5.x
to fix #1293.

diff --git a/ChangeLog b/ChangeLog
index 73a550b7c45013a68ab59457c1e8b988c581f58e..b79e07801846374647ff19a59b931cf9d74ab0a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-14  Carl Hetherington  <cth@carlh.net>
+
+       * Fix invalid timings in SMPTE subtitle files (causing failure to play subtitles)
+       in some cases (#1293).
+
 2018-04-14  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.12.4 released.

diff --git a/cscript b/cscript
index b64c671c326bf4584cde6232f667e9c868460422..d4a88810beb519be880bbbaaf61fa2d76c6ea787 100644 (file)
--- a/cscript
+++ b/cscript
@@ -303,8 +303,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', 'v1.5.2'),
-            ('libsub', 'v1.3.1'),
+            ('libdcp', 'v1.5.3'),
+            ('libsub', 'v1.3.2'),
             ('rtaudio-cdist', '739969e'))
 
 def configure_options(target):

diff --git a/test/data b/test/data
index a6e0009c6e762d3bd27ebc6499b6e30fc4baea01..1ca4c6914264f433f3e76f193828793c0d27a62c 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit a6e0009c6e762d3bd27ebc6499b6e30fc4baea01
+Subproject commit 1ca4c6914264f433f3e76f193828793c0d27a62c

diff --git a/wscript b/wscript
index 14c05c11a97a58d8ce37f7fafcfe29bdfc72046f..2ab02cb694c1841c83ee74241edc470f9a6d5eb8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -352,21 +352,21 @@ def configure(conf):
 
     # libdcp
     if conf.options.static_dcp:
-        conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.2', args='--cflags', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.3', 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.5.2', args='--cflags --libs', uselib_store='DCP', mandatory=True)
+        conf.check_cfg(package='libdcp-1.0', atleast_version='1.5.3', 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.3.1', args='--cflags', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.3.2', 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.1', args='--cflags --libs', uselib_store='SUB', mandatory=True)
+        conf.check_cfg(package='libsub-1.0', atleast_version='1.3.2', args='--cflags --libs', uselib_store='SUB', mandatory=True)
         conf.env.DEFINES_SUB = [f.replace('\\', '') for f in conf.env.DEFINES_SUB]
 
     # libxml++