Merge.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index d8736cb5e77bb66d21c0753de603ffab79a2e475..e321af3dc23d0c6b955fd86a9b7ff173b47bc425 100644 (file)
--- a/cscript
+++ b/cscript
@@ -242,7 +242,7 @@ def make_spec(filename, version, target):
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'sk_SK']:
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l
         print >>f,'%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l
@@ -278,9 +278,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'b9d9b12', ffmpeg_options),
-            ('libdcp', '960fa45'),
-            ('libsub', '8b82c40'))
+    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
+            ('libdcp', '2a4eb72'),
+            ('libsub', '4e6d9c9'))
 
 def configure_options(target):
     opt = ''
@@ -289,7 +289,7 @@ def configure_options(target):
     if target.platform == 'windows':
         opt += ' --target-windows'
     elif target.platform == 'linux':
-        opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+        opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
             opt += ' --static-xmlsec --static-ssh --disable-tests'
             if target.version == '6.5':