Write annotation text and language to CCAP nodes correctly.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 23a0c3954486836a7ebb0f256fc643f5f18cd984..47efefdba4761f1bee44de3ec9e7c5aae3b5ff42 100644 (file)
--- a/cscript
+++ b/cscript
@@ -323,10 +323,16 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '55986c3', ffmpeg_options),
-            ('libdcp', '13a4ee8'),
-            ('libsub', '6fac211'),
-            ('rtaudio-cdist', '739969e'))
+    if target.platform == 'windows' and target.version == 'xp':
+        deps = [('ffmpeg-cdist', '5783efa', ffmpeg_options)]
+    else:
+        deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
+
+    deps.append(('libdcp', 'f2f2a2a'))
+    deps.append(('libsub', 'c2d6d92'))
+    deps.append(('rtaudio-cdist', '739969e'))
+
+    return deps
 
 def option_defaults():
     return { "gui": True }
@@ -372,8 +378,8 @@ def build(target, options):
         modules.append({'name': 'imagemagick',
                         'cleanup': ['/bin'],
                         'sources': [{'type': 'archive',
-                                    'url': 'https://www.imagemagick.org/download/ImageMagick-7.0.8-8.tar.bz2',
-                                    'sha256': 'bc678d7fe5fc7e22af0d0268fabc6559a3052a589220cec50d3da0c842de17c3'}]})
+                                    'url': 'https://www.imagemagick.org/download/ImageMagick-7.0.8-10.tar.bz2',
+                                    'sha256': 'f9d99573f8b8d7f90319fdf22a1a41a6764ac247b1c3f6ae08d9a3657ec977a5'}]})
         modules.append({'name': 'libsigc++',
                         'sources': [{'type': 'archive',
                                      'url': 'https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz',