X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=d82b377f204853a146245424fa84b09c0f9c139f;hb=1f6ce17f669a6d1d8e60cb7c31267c9b7aee808d;hp=7d9146de20e093a883a18a914082299dc54a9ea3;hpb=3a323ff8e8921c737f6d250a744ba5f13ad2e255;p=dcpomatic.git

diff --git a/cscript b/cscript
index 7d9146de2..d82b377f2 100644
--- a/cscript
+++ b/cscript
@@ -33,8 +33,6 @@ 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.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['18.10'] = copy.deepcopy(deb_build_depends_base)
@@ -83,20 +81,6 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libx264-148',
                              'libcurl3'])
 
-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',
-                             'libxml++2.6-2v5',
-                             'libboost-date-time1.62.0',
-                             'libzip4',
-                             'libwxgtk3.0-0v5',
-                             'libicu57',
-                             'libnettle6',
-                             'libssh-4',
-                             'libx264-148',
-                             'libcurl3'])
-
 deb_depends['18.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libboost-thread1.65.1',
@@ -297,7 +281,7 @@ def make_spec(filename, version, target, options, requires=None):
         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', 'ar_LB', 'fi_FI', 'el_GR', 'tr_TR']:
+              'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'fi_FI']:
         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)
@@ -343,9 +327,9 @@ def dependencies(target):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'c763ce1'))
-    deps.append(('libsub', '0e41143'))
-    deps.append(('rtaudio-cdist', 'a227107'))
+    deps.append(('libdcp', '6a85c30'))
+    deps.append(('libsub', '1c70f3a'))
+    deps.append(('rtaudio-cdist', 'aad62d7'))
 
     return deps
 
@@ -355,8 +339,8 @@ def option_defaults():
 def configure_options(target, options):
     opt = ''
 
-    if not (target.platform == 'linux' and target.distro == 'ubuntu' and (target.version == '18.04' or target.version == '16.04')):
-        # Currently we only build tests on Ubuntu 1{6,8}.04
+    if not (target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04'):
+        # Currently we only build tests on Ubuntu 18.04
         opt += ' --disable-tests'
 
     if target.debug: