X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ad63746538ee37cb11e239f5ee1e2161a9e60eb3;hb=refs%2Fheads%2Fdebug-dual-screen;hp=795507e18fe9a1f7056dc80f8ae70fd1443f8f0a;hpb=7a877ff976b119a39797c1f6e8477b92dfbb30ca;p=dcpomatic.git diff --git a/cscript b/cscript index 795507e18..ad6374653 100644 --- a/cscript +++ b/cscript @@ -503,12 +503,12 @@ 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', 'e3fa86ef35f212b14b593dd36dbff66e845d37e4')) + deps.append(('libdcp', 'v1.8.89')) deps.append(('libsub', 'v1.6.44')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) @@ -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):