diff options
| author | iarspider <iarspider@gmail.com> | 2023-01-17 09:22:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 00:22:00 -0800 |
| commit | 3161784e9a3eb5f2c18468ab1bd3e747506e6e8a (patch) | |
| tree | 06bcba7611cbc36e2d3f36ed5fbe8f88aceb89e4 /var | |
| parent | a72a3fb2e0b039f4185b8bbbdd654445014ce5bc (diff) | |
| download | spack-3161784e9a3eb5f2c18468ab1bd3e747506e6e8a.tar.gz spack-3161784e9a3eb5f2c18468ab1bd3e747506e6e8a.tar.bz2 spack-3161784e9a3eb5f2c18468ab1bd3e747506e6e8a.tar.xz spack-3161784e9a3eb5f2c18468ab1bd3e747506e6e8a.zip | |
OpenCV: checksum for 4.5.5, make contrib optional (#34313)
* OpenCV: checksum for 4.5.5, make contrib optional
* [@spackbot] updating style on behalf of iarspider
* Add conflicts for contrib modules
* Fix typo
* Implement changes from review
* Update var/spack/repos/builtin/packages/opencv/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: iarspider <iarspider@users.noreply.github.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 5653858de6..657cb630e8 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -20,6 +20,7 @@ class Opencv(CMakePackage, CudaPackage): version("master", branch="master") version("4.6.0", sha256="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277") + version("4.5.5", sha256="a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad") version( "4.5.4", sha256="c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d", @@ -117,6 +118,7 @@ class Opencv(CMakePackage, CudaPackage): "4.5.1", "4.5.2", "4.5.4", + "4.5.5", "4.6.0", ] for cv in contrib_vers: @@ -124,7 +126,7 @@ class Opencv(CMakePackage, CudaPackage): name="contrib", git="https://github.com/opencv/opencv_contrib.git", tag="{0}".format(cv), - when="@{0}".format(cv), + when="@{0} +contrib".format(cv), ) # Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0 @@ -393,6 +395,7 @@ class Opencv(CMakePackage, CudaPackage): mod, default=False, description="Include opencv_{0} contrib module".format(mod), + when="+contrib", ) # contrib module conflicts and dependencies @@ -782,6 +785,7 @@ class Opencv(CMakePackage, CudaPackage): description="Enable -ffast-math (not recommended for GCC 4.6.x)", ) variant("nonfree", default=False, description="Enable non-free algorithms") + variant("contrib", default=True, description="Enable OpenCV contrib modules") # Required (dependencies) depends_on("cmake@3.5.1:", type="build") @@ -921,13 +925,15 @@ class Opencv(CMakePackage, CudaPackage): def cmake_args(self): spec = self.spec args = [ - self.define( - "OPENCV_EXTRA_MODULES_PATH", - join_path(self.stage.source_path, "opencv_contrib/modules"), - ), self.define("BUILD_opencv_core", "on"), ] + if self.spec.satisfies("+contrib"): + args += self.define( + "OPENCV_EXTRA_MODULES_PATH", + join_path(self.stage.source_path, "opencv_contrib", "modules"), + ) + # OpenCV pre-built apps apps_list = [] for app in self.apps: |