Remove support for building with OpenJPEG 1.x.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index b459ac0cfc4c97d92b0c8c3c967a6398d5615599..5750c937a51039f8cb58b44d88513d7ace5ebcb3 100644 (file)
--- a/cscript
+++ b/cscript
@@ -34,14 +34,8 @@
 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.4'), ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
@@ -53,9 +47,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'