X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=6f95adde49d9fc01cf6e5a7d18c2b1b7e2883181;hb=bd7937ad88210348e515b5cd886626ede7a0b798;hp=624c52c842102bcc90018a7a9d98981d267047e1;hpb=6a485d71b312232362209ce344dff9eb1f4bc7e5;p=dcpomatic.git diff --git a/cscript b/cscript index 624c52c84..6f95adde4 100644 --- a/cscript +++ b/cscript @@ -503,14 +503,14 @@ def dependencies(target, options): ffmpeg_options = {} if target.platform != 'linux' or target.distro != 'arch': - deps = [('ffmpeg', '7276e269a93c2ae30e302c34708e8095ac5475e8', ffmpeg_options)] + deps = [('ffmpeg', '38d4c009b128f0bf8b67a1875489eb214f5c0fcb', ffmpeg_options)] else: # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.82')) + deps.append(('libdcp', 'ea431bd5d2d3a7b6a7161217994298e78df8b8f8')) deps.append(('libsub', 'v1.6.44')) - deps.append(('leqm-nrt', '4560105773c66ac9216b62313a24093bb0a027ae')) + deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we # also need a patched openssl binary to make certificates. @@ -519,7 +519,7 @@ def dependencies(target, options): deps.append(('openssl', '7f29dd5')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) - deps.append(('ffcmp', '53c853d2935de3f2b0d53777529e48c102afd237')) + deps.append(('ffcmp', '50648dd763e915787f907a812c630742664cdb77')) return deps @@ -564,6 +564,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):