X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ab52e4d3631050b72d22089101c7e7380123b550;hb=24ba38ed1d695a67aebc8a6084444345787112f9;hp=84fa6111ab5d687df82200d3d93c5ba242829f2d;hpb=5316c4b7ba275dc6a8f4d2179dd22ad3c8dc42b5;p=libdcp.git

diff --git a/cscript b/cscript
index 84fa6111..ab52e4d3 100644
--- a/cscript
+++ b/cscript
@@ -34,28 +34,18 @@
 import os
 import shutil
 
-option_defaults = { 'jpeg': 'oj2' }
-
 def dependencies(target, options):
-    libcxml = ('libcxml', 'v0.17.3')
-    if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'c5b8b7e1e229895b8afcb20287f22f90dd8e9d45'))
-    else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'c5b8b7e1e229895b8afcb20287f22f90dd8e9d45'))
+    return (('libcxml', 'v0.17.5'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
-    cmd += ' --jpeg=%s' % options['jpeg']
+    cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
     if target.platform == 'linux':
         cmd += ' --static'
-        if not (target.distro == 'ubuntu' and target.version == '18.04'):
-            # We only build tests on Ubuntu 18.04
+        if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
+            # We only build tests on Ubuntu 16.04 and 22.04
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'
-        if target.version == 'xp':
-            # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
-            cmd += ' --jpeg=oj1'
 
     if target.debug:
         cmd += ' --enable-debug'