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

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 0e683e6ef96b89bfa1698f5066662d5b8599c1b1..a325eb5896d868ab5dff4602d6f21e36d254db49 100644 (file)
--- a/cscript
+++ b/cscript
@@ -32,10 +32,10 @@ deb_build_depends['14.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['14.04'].extend(['libssh-dev'])
 deb_build_depends['16.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['16.04'].extend(['libssh-dev'])
-deb_build_depends['17.04'] = copy.deepcopy(deb_build_depends_base)
-deb_build_depends['17.04'].extend(['libssh-dev'])
 deb_build_depends['17.10'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['17.10'].extend(['libssh-dev'])
+deb_build_depends['18.04'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['18.04'].extend(['libssh-dev'])
 deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
@@ -79,8 +79,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libssh-4',
                              'libx264-148'])
 
-deb_depends['17.04'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
+deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
                              'libboost-thread1.62.0',
                              'libboost-regex1.62.0',
                              'libmagick++-6.q16-7',
@@ -93,19 +93,21 @@ deb_depends['17.04'].extend(['libboost-filesystem1.62.0',
                              'libssh-4',
                              'libx264-148'])
 
-deb_depends['17.10'] = copy.deepcopy(deb_depends_base)
-deb_depends['17.10'].extend(['libboost-filesystem1.62.0',
-                             'libboost-thread1.62.0',
-                             'libboost-regex1.62.0',
+deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
+                             'libboost-thread1.65.1',
+                             'libboost-regex1.65.1',
+                             'libboost-date-time1.65.1',
                              'libmagick++-6.q16-7',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
                              'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
-                             'libicu57',
+                             'libicu60',
                              'libnettle6',
                              'libssh-4',
-                             'libx264-148'])
+                             'libx264-152'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -149,9 +151,18 @@ deb_depends['9'].extend(['libboost-filesystem1.62.0',
                          'libxml++2.6-2v5',
                          'libgtk2.0-0',
                          'libzip4',
+                         'libcairomm-1.0-1v5',
+                         'libpangomm-1.4-1v5',
+                         'libwxgtk3.0-0v5',
+                         'libxcb-xfixes0',
+                         'libxcb-shape0',
+                         'libasound2',
                          'libicu57',
+                         'libssh-4',
+                         'libssh-gcrypt-4',
                          'libnettle6',
-                         'libx264-148'])
+                         'libx264-148',
+                         'libpulse0'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
@@ -251,7 +262,7 @@ def make_spec(filename, version, target):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_kdm.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_server.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
-    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN']:
+    for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK', 'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'ar_LB']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
@@ -290,8 +301,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '5fce90f', ffmpeg_options),
-            ('libdcp', '0a47e4c'),
-            ('libsub', '688c501'),
+            ('libdcp', '04f3857'),
+            ('libsub', '8658ca9'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):