Add button to force re-encode of J2K content.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 04d3746eb00e18283f331d0fb04a2d4a5dc301b3..9f0460b0efc3418c622de1cb54bd9aca330e238f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -37,6 +37,8 @@ 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)
+deb_build_depends['18.10'].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)
@@ -111,6 +113,22 @@ deb_depends['18.04'].extend(['libboost-filesystem1.65.1',
                              'libx264-152',
                              'libcurl4'])
 
+deb_depends['18.10'] = copy.deepcopy(deb_depends_base)
+deb_depends['18.10'].extend(['libboost-filesystem1.65.1',
+                             'libboost-thread1.65.1',
+                             'libboost-regex1.65.1',
+                             'libboost-date-time1.65.1',
+                             'libcairomm-1.0-1v5',
+                             'libpangomm-1.4-1v5',
+                             'libxml++2.6-2v5',
+                             'libzip4',
+                             'libwxgtk3.0-0v5',
+                             'libicu60',
+                             'libnettle6',
+                             'libssh-4',
+                             'libx264-152',
+                             'libcurl4'])
+
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
                          'libboost-thread1.49.0',
@@ -335,8 +353,8 @@ def option_defaults():
 def configure_options(target, options):
     opt = ''
 
-    if target.platform != 'linux' or target.distro != 'ubuntu' or target.version != '18.04':
-        # Currently we only build tests on Ubuntu 18.04
+    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
         opt += ' --disable-tests'
 
     if target.debug: