#
-# Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
#
# This file is part of libdcp.
#
import os
import shutil
-option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
+option_defaults = { 'jpeg': 'oj2' }
def dependencies(target, options):
- libcxml = ('libcxml', '0d18df4', {'force-cpp11': options['force-cpp11']})
- if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
- return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
+ libcxml = ('libcxml', 'v0.17.3')
+ if options['jpeg'] == 'oj1':
+ return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
else:
- return (libcxml, ('openjpeg', '956af06'), ('asdcplib', 'carl'))
+ return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
def build(target, options):
- cmd = './waf configure --disable-examples --prefix=%s' % target.directory
+ 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'):
# We only build tests on Ubuntu 18.04
cmd += ' --disable-tests'
- if target.distro == 'centos' and target.version == '7':
- # Centos 7 ships with glibmm 2.50.0 which requires C++11
- # but its compiler (gcc 4.8.5) defaults to C++97. Go figure.
- # I worry that this will cause ABI problems but I don't have
- # a better solution.
- cmd += ' --force-cpp11'
- if target.distro == 'mageia' and target.version == '6':
- # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
- cmd += ' --force-cpp11'
elif target.platform == 'windows':
- cmd += ' --target-windows --disable-gcov --disable-tests'
+ cmd += f' --target-windows-{target.bits} --disable-gcov --disable-tests'
if target.version == 'xp':
# OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
cmd += ' --jpeg=oj1'
- elif target.platform == 'osx':
- cmd += ' --disable-tests'
if target.debug:
cmd += ' --enable-debug'
- if options['force-cpp11']:
- cmd += ' --force-cpp11'
-
target.command(cmd)
target.command('./waf build install')