X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=da90a380503aaf8019697dcd6cc6465cda5b9850;hb=1b273e2c4a5c022f44ac82cbc662c62473335b88;hp=6aba27e05700d2a34c37c0d0224d749b97876190;hpb=c09b2ced70e1cfa973172aae8bcd804a5b2e3d70;p=dcpomatic.git

diff --git a/cscript b/cscript
index 6aba27e05..da90a3805 100644
--- a/cscript
+++ b/cscript
@@ -35,6 +35,7 @@ deb_depends['12.04'] = {'libc6': '2.15',
                         'libssh-4': '0.5.2',
                         'libboost-filesystem1.48.0': '1.48.0-3',
                         'libboost-thread1.48.0': '1.48.0-3',
+                        'libboost-regex1.48.0': '1.48.0-3',
                         'libsndfile1': '1.0.25',
                         'libmagick++4': '8:6.6.9.7',
                         'libxml++2.6-2': '2.34.1',
@@ -49,6 +50,7 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libssh-4': '0.6.1-0ubuntu3',
                         'libboost-filesystem1.54.0': '1.54.0-4ubuntu3',
                         'libboost-thread1.54.0': '1.54.0-4ubuntu3',
+                        'libboost-regex1.54.0': '1.54.0-4ubuntu3',
                         'libsndfile1': '1.0.25-7ubuntu2',
                         'libmagick++5': '8:6.7.7.10-6ubuntu3',
                         'libxml++2.6-2': '2.36.0-2ubuntu1',
@@ -63,6 +65,7 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libssh-4': '0.6.3-3ubuntu3',
                         'libboost-filesystem1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libboost-thread1.55.0': '1.55.0+dfsg-3ubuntu2',
+                        'libboost-regex1.55.0': '1.55.0+dfsg-3ubuntu2',
                         'libsndfile1': '1.0.25-9.1',
                         'libmagick++-6.q16-5': '8:6.8.9.9-5',
                         'libxml++2.6-2': '2.36.0-2.1',
@@ -71,12 +74,14 @@ 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',
                     'libboost-filesystem1.49.0': '1.49.0',
                     'libboost-thread1.49.0': '1.49.0',
+                    'libboost-regex1.49.0': '1.49.0',
                     'libsndfile1': '1.0.25',
                     'libmagick++5': '8:6.7.7.10',
                     'libxml++2.6-2': '2.34.2',
@@ -92,6 +97,7 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libboost-filesystem1.55.0': '1.55.0',
                     'libboost-thread1.55.0': '1.55.0',
                     'libboost-date-time1.55.0': '1.55.0',
+                    'libboost-regex1.55.0': '1.55.0',
                     'libsndfile1': '1.0.25-9.1',
                     'libmagick++-6.q16-5': '8:6.8.9.9-5',
                     'libxml++2.6-2': '2.36.0',
@@ -108,6 +114,7 @@ deb_depends['unstable'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.55.0': '1.55.0',
                     'libboost-thread1.55.0': '1.55.0',
+                    'libboost-regex1.55.0': '1.55.0',
                     'libsndfile1': '1.0.25',
                     'libmagick++5': '8:6.7.7.10',
                     'libxml++2.6-2': '2.34.2',
@@ -192,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
@@ -224,9 +232,9 @@ def make_spec(filename, version, target):
     print >>f,'/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :'
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '0492ad2'),
-            ('libdcp', '1.0'),
-            ('libsub', '1.0'))
+    return (('ffmpeg-cdist', 'bd17594'),
+            ('libdcp', 'e4042b7'),
+            ('libsub', '05927c9'))
 
 def configure_options(target):
     opt = ''
@@ -255,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))