diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-11-08 11:13:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-11-08 11:13:06 +0100 |
| commit | ca23cd312a0f5f5ee5aa8665b2a2346d6f990b5c (patch) | |
| tree | 31468e29672f13dfbb869f07c3bb33916d0d3abf | |
| parent | 1cae19691d9532810862a16ee96376c14097d19c (diff) | |
Use our own openjpeg for running tests on Arch.v1.10.37
| -rw-r--r-- | cscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -41,7 +41,7 @@ def build_with_cpp17(target): (target.platform == 'linux' and target.distro == 'rocky' and target.version == '10') ) -def dependencies(target, options): +def dependencies(target, options, for_package): deps = [ ('libcxml', 'v0.17.16', { 'c++17': build_with_cpp17(target) }), ('asdcplib', 'v1.0.9') @@ -52,8 +52,8 @@ def dependencies(target, options): else: ffmpeg_options = {} - if target.platform != 'linux' or target.distro != 'arch': - # Use distro-provided FFmpeg and openjpeg on Arch, otherwise our own + 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 deps.append(('ffmpeg', '1b3378e5361c73076ce736dfa2c7b40bd6f24380', ffmpeg_options)) deps.append(('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e')) |
