diff options
| author | Martin Aumüller <aumuell@reserv.at> | 2023-09-26 10:28:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 10:28:29 +0200 |
| commit | 13816f19fdcbc8f20bafc037763010c5a0c0d1de (patch) | |
| tree | 59b0780fd08ef3883e82cd2f7c558fc4949df948 /var | |
| parent | 34ff3b408b1f3a174620e1be6f5e07f614959ca6 (diff) | |
| download | spack-13816f19fdcbc8f20bafc037763010c5a0c0d1de.tar.gz spack-13816f19fdcbc8f20bafc037763010c5a0c0d1de.tar.bz2 spack-13816f19fdcbc8f20bafc037763010c5a0c0d1de.tar.xz spack-13816f19fdcbc8f20bafc037763010c5a0c0d1de.zip | |
opencv: add 4.7.0 and 4.8.0 and fix ffmpeg dependency (#39013)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 3dd582aedc..d8db8f5362 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -19,6 +19,8 @@ class Opencv(CMakePackage, CudaPackage): maintainers("bvanessen", "adamjstewart") version("master", branch="master") + version("4.8.0", sha256="cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd") + version("4.7.0", sha256="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973") version("4.6.0", sha256="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277") version("4.5.5", sha256="a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad") version("4.5.4", sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d") @@ -63,6 +65,8 @@ class Opencv(CMakePackage, CudaPackage): "4.5.4", "4.5.5", "4.6.0", + "4.7.0", + "4.8.0", ] for cv in contrib_vers: resource( @@ -691,6 +695,7 @@ class Opencv(CMakePackage, CudaPackage): "mfx", "ngraph", "nvcuvid", # disabled, details: https://github.com/opencv/opencv/issues/14850 + "nvcuvenc", # disabled, depends on nvcuvid being enabled "opencl_svm", "openclamdblas", "openclamdfft", @@ -740,8 +745,9 @@ class Opencv(CMakePackage, CudaPackage): depends_on("cudnn@:7.3", when="@3.3.1:3.4+cudnn") depends_on("cudnn@:6", when="@:3.3.0+cudnn") depends_on("eigen", when="+eigen") - depends_on("ffmpeg+avresample", when="+ffmpeg") - depends_on("ffmpeg@:4+avresample", when="@:4.5+ffmpeg") + depends_on("ffmpeg", when="+ffmpeg") + depends_on("ffmpeg@:5", when="@:4.7+ffmpeg") + depends_on("ffmpeg@:4+avresample", when="@:4.6+ffmpeg") depends_on("gdal", when="+gdal") depends_on("gtkplus", when="+gtk") depends_on("hpx", when="+hpx") |