From b995947a86a583a44bbe667e9bbd031296bf7e88 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 4 Dec 2022 22:57:59 +0100 Subject: Remove support for building with OpenJPEG 1.x. --- cscript | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index b459ac0c..5750c937 100644 --- 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' -- cgit v1.2.3