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', 'a276ed1c5a43a92dd2b9ca93072ce8d024329e82'))
- else:
- return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'a276ed1c5a43a92dd2b9ca93072ce8d024329e82'))
+ return (
+ ('libcxml', 'v0.17.9', options),
+ ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
+ ('asdcplib', '4b5d6e8d27dfd5fb282590538068662f4dbbf1c9')
+ )
def build(target, options):
- cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
- cmd += ' --jpeg=%s' % options['jpeg']
+ cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
if target.platform == 'linux':
cmd += ' --static'
- if not (target.distro == 'ubuntu' and target.version == '18.04'):
- # We only build tests on Ubuntu 18.04
+ if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
+ # We only build tests on Ubuntu 16.04 and 22.04
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 'c++17' in options and options['c++17']:
+ cmd += ' --c++17'
if target.debug:
cmd += ' --enable-debug'