diff options
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -47,7 +47,7 @@ def build_with_cpp17(target): def dependencies(target, options, for_package): deps = [ - ('libcxml', 'v0.17.16', { 'c++17': build_with_cpp17(target) }), + ('libcxml', 'v0.17.17', { 'c++17': build_with_cpp17(target) }), ('asdcplib', 'v1.0.9') ] @@ -59,7 +59,7 @@ def dependencies(target, options, for_package): if target.platform != 'linux' or target.distro != 'arch' or not for_package: # Use distro-provided FFmpeg and openjpeg on Arch (except when packaging), otherwise our own if options['mpeg2']: - deps.append(('ffmpeg', '2889a7bb300f5014cf5142ef8dcdad8faf33e417', ffmpeg_options)) + deps.append(('ffmpeg', '6a0411c388767c0040748d8e448fc0197c6df1ea', ffmpeg_options)) deps.append(('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e')) return deps @@ -79,7 +79,7 @@ def build(target, options, for_package, version): cmd += ' --static' if target.distro == 'debian' or (target.distro == 'centos' and target.version != 'stream10') or (target.distro == 'rocky' and target.version != '10') or target.distro == 'mageia': cmd += ' --disable-tests' - if target.distro == 'ubuntu' and target.version == '16.04': + if (target.distro, target.version) in [('rocky', '8'), ('ubuntu', '18.04'), ('ubuntu', '16.04')]: cmd += ' --static-boost' elif target.platform == 'windows': cmd += f' --target-windows-{target.bits}' |