X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cscript;h=0f5385250da0d996576840de6bcb81a1c3db024b;hb=277bfbf8277efe009b7de3279a8b01e5c56ad523;hp=0d5cffbf6a6ab444373a4e5f42ba74c97742ed7b;hpb=9c4cd85f66818eb100e1be40f7eeb7d3e60cc482;p=dcpomatic.git diff --git a/cscript b/cscript index 0d5cffbf6..0f5385250 100644 --- a/cscript +++ b/cscript @@ -448,13 +448,13 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg-cdist', '4721b55de017702b0d1c8ce1163331378905c637', ffmpeg_options)] + deps = [('ffmpeg', 'b5190a92da64ee196a8afa3ededbfc94d0000c68', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.33')) - deps.append(('libsub', 'v1.6.39')) + deps.append(('libdcp', 'v1.8.48')) + deps.append(('libsub', 'v1.6.42')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -464,7 +464,7 @@ def dependencies(target, options): deps.append(('openssl', '7f29dd5')) if can_build_disk(target): deps.append(('lwext4', 'ee865fa65f05e348cd4e0bce0552a2725ad5663a')) - deps.append(('ffcmp', 'da96af56f3ddf074f2044a0cd6e50c95184fd169')) + deps.append(('ffcmp', 'ea340a286078e025dcf9a0c75c6313d318dbf32b')) return deps @@ -858,7 +858,7 @@ def test(target, options, test): if target.platform == 'windows': cmd = 'run\\tests ' else: - cmd = 'run/tests --log_level=test_suite ' + cmd = 'run/tests --check --log_level=test_suite ' if target.debug: cmd += '--backtrace ' if test is not None: