Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index f78d4e4854d1b92ef684a036fcb550fdf6126515..fedf5b45b60786c2d4b60ee100ce672b9271afa5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -63,6 +63,8 @@ deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
                         'libcurl3': '7.35.0-1ubuntu2',
                         'libzip2': '0.10.1-1.2',
                         'libsamplerate0': '0.1.8-7',
+                        'libcairomm-1.0-1': '1.10.0-1ubuntu3',
+                        'libpangomm-1.4-1': '2.34.0-1ubuntu1',
                         'libicu52': '52.1-3'}
 
 deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
@@ -83,6 +85,24 @@ deb_depends['15.04'] = {'libc6': '2.21-0ubuntu4',
                         'libsamplerate0': '0.1.8-8',
                         'libicu52': '52.1-8'}
 
+deb_depends['15.10'] = {'libc6': '2.21-0ubuntu4',
+                        'libssh-4': '0.6.3-3ubuntu3',
+                        'libboost-filesystem1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libboost-thread1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libboost-regex1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libsndfile1': '1.0.25-9.1',
+                        'libmagick++-6.q16-5v5': '8:6.8.9.9-5ubuntu2',
+                        'libxml++2.6-2v5': '2.38.1-2',
+                        'libgtk2.0-0': '2.24.28-1ubuntu1',
+                        'libxmlsec1': '1.2.20-2ubuntu3',
+                        'libxmlsec1-openssl': '1.2.20-2ubuntu3',
+                        'libboost-date-time1.58.0': '1.58.0+dfsg-3.1ubuntu1',
+                        'libcurl3': '7.43.0-1ubuntu2',
+                        'libzip4': '1.0.1-0ubuntu1',
+                        'libwxgtk3.0-0v5': '3.0.2+dfsg-1.2',
+                        'libsamplerate0': '0.1.8-8',
+                        'libicu55': '55.1-4ubuntu1'}
+
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.49.0': '1.49.0',
@@ -122,22 +142,22 @@ deb_depends['8'] = {'libc6': '2.19-18',
                     'libsamplerate0': '0.1.8-8',
                     'libicu52': '52.1-8+deb8u2'}
 
-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',
-                    'libgtk2.0-0': '2.24.10',
-                    'libxmlsec1': '1.2.18',
-                    'libboost-date-time1.55.0': '1.55.0',
-                    'libxmlsec1-openssl': '1.2.18',
-                    'libcurl3': '7.26.0',
-                    'libzip2': '0.10.1',
-                    'libsamplerate0': '0.1.8-8',
-                    'libicu52': '52.1-9'}
+deb_depends['unstable'] = {'libc6': '2.19-22',
+                           'libssh-4': '0.6.3-4.1+b1',
+                           'libboost-filesystem1.58.0': '1.58.0+dfsg-4',
+                           'libboost-thread1.58.0': '1.58.0+dfsg-4',
+                           'libboost-regex1.58.0': '1.58.0+dfsg-4',
+                           'libsndfile1': '1.0.25-9.1',
+                           'libmagick++-6.q16-5v5': '8:6.8.9.9-6',
+                           'libxml++2.6-2v5': '2.40.1-1',
+                           'libgtk2.0-0': '2.24.28-1',
+                           'libxmlsec1': '1.2.20-2+b2',
+                           'libboost-date-time1.58.0': '1.58.0+dfsg-4',
+                           'libxmlsec1-openssl': '1.2.20-2+b2',
+                           'libcurl3': '7.45.0-1+b1',
+                           'libzip2': '0.11.2-1.2',
+                           'libsamplerate0': '0.1.8-8',
+                           'libicu52': '52.1-10'}
 
 def packages(name, packages, f):
     s = '%s: ' % name
@@ -222,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
@@ -258,9 +278,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
-            ('libdcp', 'v1.2.8'),
-            ('libsub', 'v1.1.8'))
+    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
+            ('libdcp', '38ff295'),
+            ('libsub', '50b30b5'))
 
 def configure_options(target):
     opt = ''
@@ -269,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':
@@ -318,7 +338,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_CONFIGURE', '"' + configure_options(target) + '"')
     if target.debug:
         target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg')
-    if target.version == '15.04' or target.version == '8':
+    if target.version in ['15.04', '15.10', '8']:
         target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale')
     else:
         target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale')