diff options
| author | Alec Scott <hi@alecbcs.com> | 2023-03-17 23:47:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 02:47:44 -0400 |
| commit | 5f8ee20c7c58ece53d8df8f996ae059331567c46 (patch) | |
| tree | 8b5cb89af48f50192fd6ee56d5f0a4ec3317658f | |
| parent | fd70a2cc07cc33af40f5d8652fb56e4fe0857100 (diff) | |
| download | spack-5f8ee20c7c58ece53d8df8f996ae059331567c46.tar.gz spack-5f8ee20c7c58ece53d8df8f996ae059331567c46.tar.bz2 spack-5f8ee20c7c58ece53d8df8f996ae059331567c46.tar.xz spack-5f8ee20c7c58ece53d8df8f996ae059331567c46.zip | |
ffmpeg: add v6.0 (#35857)
* ffmpeg: add v6.0
* Add limit to py-torchvision to prevent ffmpeg v6.0
| -rw-r--r-- | var/spack/repos/builtin/packages/ffmpeg/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torchvision/package.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index c0de7c2a0b..18f9a4558a 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -15,6 +15,7 @@ class Ffmpeg(AutotoolsPackage): maintainers("xjrc") + version("6.0", sha256="47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d") version("5.1.2", sha256="39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b") version("4.4.1", sha256="8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42") version("4.3.2", sha256="ab3a6d6a70358ba0a5f67f37f91f6656b7302b02e98e5b8c846c16763c99913a") diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index bd829cba04..2ad860460e 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -116,8 +116,8 @@ class PyTorchvision(PythonPackage): depends_on("py-accimage", when="backend=accimage", type=("build", "run")) depends_on("libpng@1.6.0:", when="backend=png") depends_on("jpeg") # seems to be required for all backends - - depends_on("ffmpeg@3.1:", when="@0.13:") + # https://github.com/pytorch/vision/pull/7378 + depends_on("ffmpeg@3.1:5", when="@0.13:") depends_on("ffmpeg@3.1:4.4", when="@0.4.2:0.12") # Many of the datasets require additional dependencies to use. |