Bail early from subtitle finding if there are no subtitle streams.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index a7710e9f34dd8380077a07b4251d6e8f58391f0c..b99ccc4e38d1a5199cc7b03bedfbb78bf15b714e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -74,7 +74,8 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libxmlsec1-openssl': '1.2.20-2ubuntu2',
                         'libboost-date-time1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libcurl3': '7.38.0-3ubuntu2',
-                        'libzip2': '0.11.2-1.2'}
+                        'libzip2': '0.11.2-1.2',
+                        'libwxgtk3.0-0': '3.0.2-1'}
 
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
@@ -198,9 +199,10 @@ def make_spec(filename, version, target):
     print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop'
     print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png'
     print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf'
+    print >>f,'%{_datadir}/dcpomatic2/splash.png'
     for r in ['128x128', '22x22', '32x32', '48x48', '64x64']:
         print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK']:
         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
@@ -231,8 +233,8 @@ def make_spec(filename, version, target):
 
 def dependencies(target):
     return (('ffmpeg-cdist', 'bd17594'),
-            ('libdcp', '1.0'),
-            ('libsub', '1.0'))
+            ('libdcp', '8017692'),
+            ('libsub', '7f74e96'))
 
 def configure_options(target):
     opt = ''
@@ -261,6 +263,7 @@ def build(target, options):
 def package_windows(target):
     shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
     target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
+    target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
     target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
     target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, target.bits))
     target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, target.bits))