X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=41f98b135226a74ec90b5486656c17832c915cd5;hb=7ed0973eae4ed0a60595440faa54549ea88782c6;hp=52e3fe406103020d2facd382c8a28ba3c01012a8;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git diff --git a/cscript b/cscript index 52e3fe406..41f98b135 100644 --- a/cscript +++ b/cscript @@ -370,8 +370,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'e5f89bf')) - deps.append(('libsub', '948df33')) + deps.append(('libdcp', 'bed820d')) + deps.append(('libsub', '2ac27e6')) deps.append(('leqm-nrt', '131f971')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -390,10 +390,10 @@ option_defaults = { "gui": True, "variant": None } def configure_options(target, options): opt = ' --warnings-are-errors' - if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or + if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ('16.04', '18.04')) or (target.platform == 'osx') or (target.platform == 'windows')): - # Currently we only build tests on Ubuntu 18.04, macOS and Windows + # Currently we only build tests on Ubuntu {16,18}.04, macOS and Windows opt += ' --disable-tests' if target.debug: