From 54b9fe219bdc80692d4dcdf9fc1c4083c5fa88e5 Mon Sep 17 00:00:00 2001 From: arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> Date: Fri, 4 Jun 2021 10:51:07 -0700 Subject: opencv: Adding gtk variant (#23937) --- var/spack/repos/builtin/packages/opencv/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 10bc87e39b..e35c3cf1ad 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -59,7 +59,7 @@ class Opencv(CMakePackage, CudaPackage): components = [ '1394', 'ade', 'aravis', 'arith_dec', 'arith_enc', 'avfoundation', 'clp', 'cuda', 'eigen', 'ffmpeg', 'freetype', 'gdal', 'gdcm', 'gphoto2', 'gstreamer', - 'halide', 'hpx', 'imgcodec_hdr', 'imgcode_pfm', 'imgcodec_pxm', + 'gtk', 'halide', 'hpx', 'imgcodec_hdr', 'imgcode_pfm', 'imgcodec_pxm', 'imgcodec_sunraster', 'inf_engine', 'ipp', 'itt', 'jasper', 'jpeg', 'lapack', 'librealsense', 'mfx', 'ngraph', 'onnx', 'opencl', 'openclamdblas', 'openclamdfft', 'opencl_svm', 'openexr', 'opengl', 'openjpeg', 'openmp', @@ -113,6 +113,7 @@ class Opencv(CMakePackage, CudaPackage): depends_on('ffmpeg', when='+ffmpeg') depends_on('freetype', when='+freetype') depends_on('gdal', when='+gdal') + depends_on('gtkplus', when='+gtk') depends_on('libpng', when='+png') depends_on('jpeg', when='+jpeg') depends_on('openjpeg@2:', when='+openjpeg') @@ -182,6 +183,9 @@ class Opencv(CMakePackage, CudaPackage): conflicts('+videoio', when='~imgcodecs') conflicts('+world', when='~core') + # OpenCV component conflicts + conflicts('+gtk', when='platform=darwin') + conflicts('+python2', when='+python3') conflicts('+python3', when='+python2') -- cgit v1.2.3-70-g09d2