Merge tag 'v1.8.98' into v1.9.x

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index b459ac0cfc4c97d92b0c8c3c967a6398d5615599..7ab2773e7c958d88f2bc65b51fb1e48e1773f59d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -34,28 +34,25 @@
 import os
 import shutil
 
-option_defaults = { 'jpeg': 'oj2' }
-
 def dependencies(target, options):
-    libcxml = ('libcxml', 'v0.17.4')
-    if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
-    else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
+    return (
+        ('libcxml', 'v0.17.8', options),
+        ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
+        ('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 'c++17' in options and options['c++17']:
+        cmd += ' --c++17'
 
     if target.debug:
         cmd += ' --enable-debug'