Skip to content

Commit

Permalink
[cherry-pick] Restrict ffmpeg to 4.2+.X versions to resolve linux con…
Browse files Browse the repository at this point in the history
…da build failures (#8607)

Co-authored-by: Nikita Shulga <[email protected]>
  • Loading branch information
atalman and malfet authored Aug 23, 2024
1 parent 5bada1f commit 6194369
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packaging/torchvision/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ requirements:
- {{ compiler('c') }} # [win]
- libpng
- libjpeg-turbo
- ffmpeg >=4.2 # [linux]
- ffmpeg >=4.2.2, <5.0.0 # [linux]

host:
- python
- setuptools
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }}
{{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

run:
Expand All @@ -26,11 +26,11 @@ requirements:
- numpy >=1.23.5 # [py >= 311]
- requests
- libpng
- ffmpeg >=4.2 # [linux]
- ffmpeg >=4.2.2, <5.0.0 # [linux]
- libjpeg-turbo
- pillow >=5.3.0, !=8.3.*
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
{{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
{{ environ.get('CONDA_PYTORCH_CONSTRAINT', 'pytorch') }}
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

{% if build_variant == 'cpu' %}
Expand Down

0 comments on commit 6194369

Please sign in to comment.