Don't build dcpdumpimage unless we have {Image,Graphics}Magick

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index b459ac0cfc4c97d92b0c8c3c967a6398d5615599..78176a3a3c26c6889ed06cde0d79a41fe729a28b 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.4')
-    if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
-    else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
+    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']
     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'