Remove now-presumed-wrong 2.0 MCA sound field.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 84fa6111ab5d687df82200d3d93c5ba242829f2d..2bdb9bfadfb391c9b9c0d9edc671cb6014881499 100644 (file)
--- a/cscript
+++ b/cscript
@@ -34,18 +34,11 @@
 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', 'a1403c2'), ('asdcplib', 'ae75eb417d3804a6d723e2cf09647b54b15df5db'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
-    cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'
         if not (target.distro == 'ubuntu' and target.version == '18.04'):
@@ -53,9 +46,6 @@ def build(target, options):
             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'