X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=2bdb9bfadfb391c9b9c0d9edc671cb6014881499;hb=d24b16a9b1ad2fdaef264d9c9e7ab23a95a98ad1;hp=0a0c11672aff1f2221b3039d7636b3d7f5465c4d;hpb=248e56fc9a99cd25ee6f652a389d73530adde948;p=libdcp.git

diff --git a/cscript b/cscript
index 0a0c1167..2bdb9bfa 100644
--- a/cscript
+++ b/cscript
@@ -34,18 +34,11 @@
 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', 'a276ed1c5a43a92dd2b9ca93072ce8d024329e82'))
-    else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'a276ed1c5a43a92dd2b9ca93072ce8d024329e82'))
+    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'