X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=af1db69a66dd9a908dca48e6cba2a14e5d52fc4b;hb=82f87c7711fb664b06b04d44792ed3820b3d1e01;hp=fde56ad7741229e72970f1a1167e7c1ad291dc54;hpb=f5c2b918ebfe18252605a0a2ed9a26d49db3a5f5;p=dcpomatic.git diff --git a/cscript b/cscript index fde56ad77..af1db69a6 100644 --- a/cscript +++ b/cscript @@ -502,13 +502,13 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)] + deps = [('ffmpeg', '0b73d2f5e70a04a67aa902902c42e3025ef3bb77', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.92')) - deps.append(('libsub', 'v1.6.45')) + deps.append(('libdcp', 'v1.8.97')) + deps.append(('libsub', 'v1.6.47')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -518,7 +518,7 @@ def dependencies(target, options): deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) - deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237')) + deps.append(('ffcmp', '5ab6ed3b75d8ca7cf1f66bb9fb08792b92f4b419')) return deps @@ -563,6 +563,9 @@ def configure_options(target, options, for_package=False): if target.platform == 'osx' and target.arch == 'arm64': opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin + if target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['22.04']: + opt += ' --enable-grok' + return opt def build(target, options, for_package):