OpenCV: various package updates (#24553)

1 files changed, 168 insertions, 82 deletions

diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 36fb781e1b..64f0b95789 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -40,39 +40,45 @@ class Opencv(CMakePackage, CudaPackage):
     version('2.4.12.2', sha256='150a165eb14a5ea74fb94dcc16ac7d668a6ff20a4449df2570734a2abaab9c0e', deprecated=True)
     version('2.4.12.1', sha256='c1564771f79304a2597ae4f74f44032021e3a46657e4a117060c08f5ed05ad83', deprecated=True)
 
-    # OpenCV modules
+    # OpenCV modules (variants)
+    # Defined in `modules/*/CMakeLists.txt` using
+    # `ocv_add_module(...)` and `ocv_define_module(...)`
     modules = [
         'apps', 'calib3d', 'core', 'dnn', 'features2d', 'flann', 'gapi', 'highgui',
         'imgcodecs', 'imgproc', 'java', 'java_bindings_generator', 'js',
-        'js_bindings_generator', 'ml', 'objc_bindings_generator', 'objdetect', 'photo',
-        'python2', 'python3', 'python_bindings_generator', 'python_tests', 'stitching',
-        'ts', 'video', 'videoio', 'world'
+        'js_bindings_generator', 'ml', 'objc', 'objc_bindings_generator', 'objdetect',
+        'photo', 'python2', 'python3', 'python_bindings_generator', 'python_tests',
+        'stitching', 'ts', 'video', 'videoio', 'world'
     ]
 
     for mod in modules:
         # At least one of these modules must be enabled to build OpenCV
         variant(mod, default=mod == 'core',
-                description='Include opencv_{0} module into the OpenCV build'.format(
-                    mod))
+                description='Include opencv_{0} module'.format(mod))
 
-    # Optional 3rd party components
+    # Optional 3rd party components (variants)
+    # Defined in `CMakeLists.txt` and `modules/gapi/cmake/init.cmake`
+    # using `OCV_OPTION(WITH_* ...)`
     components = [
-        '1394', 'ade', 'aravis', 'arith_dec', 'arith_enc', 'avfoundation', 'clp',
-        'cuda', 'eigen', 'ffmpeg', 'freetype', 'gdal', 'gdcm', 'gphoto2', 'gstreamer',
-        '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',
-        'openni', 'openni2', 'openvx', 'plaidml', 'png', 'protobuf', 'pthreads_pf',
-        'pvapi', 'qt', 'quirc', 'tbb', 'tiff', 'va', 'va_intel', 'vtk', 'vulcan',
-        'webp', 'ximea'
+        '1394', 'ade', 'android_mediandk', 'android_native_camera', 'aravis',
+        'avfoundation', 'cap_ios', 'carotene', 'clp', 'cpufeatures', 'cublas', 'cuda',
+        'cudnn', 'cufft', 'directx', 'dshow', 'eigen', 'ffmpeg', 'freetype', 'gdal',
+        'gdcm', 'gphoto2', 'gstreamer', 'gtk', 'gtk_2_x', 'halide', 'hpx',
+        'imgcodec_hdr', 'imgcode_pfm', 'imgcodec_pxm', 'imgcodec_sunraster',
+        'inf_engine', 'ipp', 'itt', 'jasper', 'jpeg', 'lapack', 'librealsense', 'mfx',
+        'msmf', 'msmf_dxva', 'ngraph', 'nvcuvid', 'onnx', 'opencl', 'openclamdblas',
+        'openclamdfft', 'opencl_d3d11_nv', 'opencl_svm', 'openexr', 'opengl',
+        'openjpeg', 'openmp', 'openni', 'openni2', 'openvx', 'plaidml', 'png',
+        'protobuf', 'pthreads_pf', 'pvapi', 'qt', 'quirc', 'tbb', 'tengine', 'tiff',
+        'ueye', 'v4l', 'va', 'va_intel', 'vtk', 'vulcan', 'webp', 'win32ui', 'ximea',
+        'xine'
     ]
 
     for component in components:
         variant(component, default=False,
                 description='Include {0} support'.format(component))
 
-    # Other variants
+    # Other (variants)
     variant('shared', default=True,
             description='Enables the build of shared libraries')
     variant('powerpc', default=False, description='Enable PowerPC for GCC')
@@ -92,115 +98,195 @@ class Opencv(CMakePackage, CudaPackage):
                  tag="{0}".format(cv),
                  when='@{0}+contrib'.format(cv))
 
+    # Required (dependencies)
     depends_on('cmake@3.5.1:', type='build')
-
-    depends_on('hdf5', when='+contrib')
-    depends_on('hdf5', when='+cuda')
-    depends_on('blas', when='+lapack')
-
-    # Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0
-    # and 3.4.1) header file that have the same name.Problem is fixed in
-    # the current development branch of OpenCV. See #8461 for more information.
-    patch('dnn_cuda.patch', when='@3.3.0:3.4.1+cuda+dnn')
-
-    patch('opencv3.2_cmake.patch', when='@3.2:3.4.1')
-    patch('opencv3.2_compiler_cmake.patch', when='@3.2')
-    patch('opencv3.2_vtk.patch', when='@3.2+vtk')
-    patch('opencv3.2_regacyvtk.patch', when='@3.2+vtk')
-    patch('opencv3.2_ffmpeg.patch', when='@3.2+videoio')
-    patch('opencv3.2_python3.7.patch', when='@3.2+python3')
-    patch('opencv3.2_fj.patch', when='@3.2 %fj')
-
+    depends_on('python@2.7:2.8,3.2:', type='build')
     depends_on('zlib@1.2.3:')
-    depends_on('eigen', when='+eigen')
-    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')
-    depends_on('libtiff', when='+tiff')
 
-    depends_on('jasper', when='+jasper')
-    depends_on('cuda@6.5:', when='+cuda')
-    depends_on('cuda@:10.2', when='@4.0:4.2+cuda')
-    depends_on('cuda@:9.0', when='@3.3.1:3.4+cuda')
-    depends_on('cuda@:8', when='@:3.3.0+cuda')
-    depends_on('cudnn', when='+cuda')
-    depends_on('cudnn@:7.6', when='@4.0:4.2+cuda')
-    depends_on('cudnn@:7.3', when='@3.3.1:3.4+cuda')
-    depends_on('cudnn@:6', when='@:3.3.0+cuda')
-    depends_on('vtk', when='+vtk')
-    depends_on('qt', when='+qt')
+    # OpenCV modules (dependencies)
     depends_on('java', when='+java_bindings_generator')
     depends_on('ant', when='+java_bindings_generator', type='build')
-    depends_on('python@2.7:2.8,3.2:', type='build')
+    extends('python', when='+python2')
     depends_on('python@2.7:2.8', when='+python2', type=('build', 'link', 'run'))
-    depends_on('python@3.2:', when='+python3', type=('build', 'link', 'run'))
     depends_on('py-setuptools', when='+python2', type='build')
-    depends_on('py-setuptools', when='+python3', type='build')
     depends_on('py-numpy', when='+python2', type=('build', 'run'))
+    extends('python', when='+python3')
+    depends_on('python@3.2:', when='+python3', type=('build', 'link', 'run'))
+    depends_on('py-setuptools', when='+python3', type='build')
     depends_on('py-numpy', when='+python3', type=('build', 'run'))
-    depends_on('protobuf@3.5.0:', when='@3.4.1: +protobuf')
-    depends_on('protobuf@3.1.0', when='@3.3.0:3.4.0 +protobuf')
-
     depends_on('ffmpeg', when='+videoio')
     depends_on('mpi', when='+videoio')
 
-    conflicts('+cuda', when='~contrib', msg='cuda support requires +contrib')
+    # Optional 3rd party components (dependencies)
+    depends_on('clp', when='+clp')
+    depends_on('cuda@6.5:', when='+cuda')
+    depends_on('cuda@:10.2', when='@4.0:4.2+cuda')
+    depends_on('cuda@:9.0', when='@3.3.1:3.4+cuda')
+    depends_on('cuda@:8', when='@:3.3.0+cuda')
+    depends_on('cudnn', when='+cudnn')
+    depends_on('cudnn@:7.6', when='@4.0:4.2+cudnn')
+    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', when='+ffmpeg')
+    depends_on('freetype', when='+freetype')
+    depends_on('gdal', when='+gdal')
+    depends_on('gtkplus', when='+gtk')
+    depends_on('gtkplus@:2', when='+gtk_2_x')
+    depends_on('hpx', when='+hpx')
+    depends_on('ipp', when='+ipp')
+    depends_on('jasper', when='+jasper')
+    depends_on('jpeg', when='+jpeg')
+    depends_on('lapack', when='+lapack')
+    depends_on('onnx', when='+onnx')
+    depends_on('opencl', when='+opencl')
+    depends_on('openexr', when='+openexr')
+    depends_on('gl', when='+opengl')
+    depends_on('openjpeg@2:', when='+openjpeg')
+    depends_on('libpng', when='+png')
+    depends_on('protobuf@3.5.0:', when='@3.4.1: +protobuf')
+    depends_on('protobuf@3.1.0', when='@3.3.0:3.4.0 +protobuf')
+    depends_on('qt', when='+qt')
+    depends_on('tbb', when='+tbb')
+    depends_on('libtiff', when='+tiff')
+    depends_on('vtk', when='+vtk')
+    depends_on('libwebp', when='+webp')
 
-    # IPP is provided x86_64 only
-    conflicts('+ipp', when="arch=aarch64:")
+    # Other (dependencies)
+    depends_on('hdf5', when='+contrib')
 
-    # OpenCV module conflicts
-    # These conflicts can be scraped from CMakeCache.txt, look for:
-    #     OPENCV_MODULE_opencv_*_REQ_DEPS
+    # OpenCV modules (conflicts)
+    # Defined in `apps/*/CMakeLists.txt` using `ocv_add_application(...)`
+    # Different apps require different modules, but no way to control which apps
+    # are installed. If +apps is requested, make sure all apps can be built.
+    conflicts('+apps', when='~calib3d')
+    conflicts('+apps', when='~core')
+    conflicts('+apps', when='~dnn')
+    conflicts('+apps', when='~features2d')
+    conflicts('+apps', when='~highgui')
+    conflicts('+apps', when='~imgcodecs')
+    conflicts('+apps', when='~imgproc')
+    conflicts('+apps', when='~objdetect')
+    conflicts('+apps', when='~videoio')
+    # Defined in `modules/*/CMakeLists.txt` using
+    # `ocv_add_module(...)` and `ocv_define_module(...)`
     # If these required dependencies aren't found, CMake will silently
     # disable the requested module
-    conflicts('+calib3d', when='~imgproc')
     conflicts('+calib3d', when='~features2d')
     conflicts('+calib3d', when='~flann')
+    conflicts('+calib3d', when='~imgproc')
     conflicts('+dnn', when='~core')
     conflicts('+dnn', when='~imgproc')
     conflicts('+features2d', when='~imgproc')
     conflicts('+flann', when='~core')
     conflicts('+gapi', when='~imgproc')
-    conflicts('+highgui', when='~imgproc')
     conflicts('+highgui', when='~imgcodecs')
+    conflicts('+highgui', when='~imgproc')
     conflicts('+imgcodecs', when='~imgproc')
     conflicts('+imgproc', when='~core')
+    conflicts('+java', when='~core')
+    conflicts('+java', when='~imgproc')
+    conflicts('+java', when='~java_bindings_generator')
+    conflicts('+js', when='~js_bindings_generator')
     conflicts('+ml', when='~core')
+    conflicts('+objc', when='~core')
+    conflicts('+objc', when='~imgproc')
+    conflicts('+objc', when='~objc_bindings_generator')
     conflicts('+objc_bindings_generator', when='~core')
     conflicts('+objc_bindings_generator', when='~imgproc')
+    conflicts('+objdetect', when='~calib3d')
     conflicts('+objdetect', when='~core')
     conflicts('+objdetect', when='~imgproc')
-    conflicts('+objdetect', when='~calib3d')
     conflicts('+photo', when='~imgproc')
     conflicts('+python2', when='~python_bindings_generator')
+    conflicts('+python2', when='+python3')
     conflicts('+python3', when='~python_bindings_generator')
-    conflicts('+stitching', when='~imgproc')
-    conflicts('+stitching', when='~features2d')
+    conflicts('+python3', when='+python2')
     conflicts('+stitching', when='~calib3d')
+    conflicts('+stitching', when='~features2d')
     conflicts('+stitching', when='~flann')
+    conflicts('+stitching', when='~imgproc')
     conflicts('+ts', when='~core')
-    conflicts('+ts', when='~imgproc')
+    conflicts('+ts', when='~highgui')
     conflicts('+ts', when='~imgcodecs')
+    conflicts('+ts', when='~imgproc')
     conflicts('+ts', when='~videoio')
-    conflicts('+ts', when='~highgui')
     conflicts('+video', when='~imgproc')
-    conflicts('+videoio', when='~imgproc')
     conflicts('+videoio', when='~imgcodecs')
+    conflicts('+videoio', when='~imgproc')
     conflicts('+world', when='~core')
 
-    # OpenCV component conflicts
-    conflicts('+gtk', when='platform=darwin')
+    # Optional 3rd party components (conflicts)
+    # Defined in `CMakeLists.txt` and `modules/gapi/cmake/init.cmake`
+    # using `OCV_OPTION(WITH_* ...)`
+    conflicts('+ade', when='~gapi')
+    conflicts('+android_mediandk', when='platform=darwin', msg='Android only')
+    conflicts('+android_mediandk', when='platform=linux', msg='Android only')
+    conflicts('+android_mediandk', when='platform=cray', msg='Android only')
+    conflicts('+android_native_camera', when='platform=darwin', msg='Android only')
+    conflicts('+android_native_camera', when='platform=linux', msg='Android only')
+    conflicts('+android_native_camera', when='platform=cray', msg='Android only')
+    conflicts('+avfoundation', when='platform=linux', msg='iOS/macOS only')
+    conflicts('+avfoundation', when='platform=cray', msg='iOS/macOS only')
+    conflicts('+cap_ios', when='platform=darwin', msg='iOS only')
+    conflicts('+cap_ios', when='platform=linux', msg='iOS only')
+    conflicts('+cap_ios', when='platform=cray', msg='iOS only')
+    conflicts('+carotene', when='target=x86:', msg='ARM/AARCH64 only')
+    conflicts('+carotene', when='target=x86_64:', msg='ARM/AARCH64 only')
+    conflicts('+cpufeatures', when='platform=darwin', msg='Android only')
+    conflicts('+cpufeatures', when='platform=linux', msg='Android only')
+    conflicts('+cpufeatures', when='platform=cray', msg='Android only')
+    conflicts('+cublas', when='~cuda')
+    conflicts('+cudnn', when='~cuda')
+    conflicts('+cufft', when='~cuda')
+    conflicts('+directx', when='platform=darwin', msg='Windows only')
+    conflicts('+directx', when='platform=linux', msg='Windows only')
+    conflicts('+directx', when='platform=cray', msg='Windows only')
+    conflicts('+dshow', when='platform=darwin', msg='Windows only')
+    conflicts('+dshow', when='platform=linux', msg='Windows only')
+    conflicts('+dshow', when='platform=cray', msg='Windows only')
+    conflicts('+freetype', when='~gapi')
+    conflicts('+gtk', when='platform=darwin', msg='Linux only')
+    conflicts('+gtk_2_x', when='platform=darwin', msg='Linux only')
+    conflicts('+ipp', when='target=aarch64:', msg='x86 or x86_64 only')
+    conflicts('+msmf', when='platform=darwin', msg='Windows only')
+    conflicts('+msmf', when='platform=linux', msg='Windows only')
+    conflicts('+msmf', when='platform=cray', msg='Windows only')
+    conflicts('+msmf_dxva', when='platform=darwin', msg='Windows only')
+    conflicts('+msmf_dxva', when='platform=linux', msg='Windows only')
+    conflicts('+msmf_dxva', when='platform=cray', msg='Windows only')
+    conflicts('+nvcuvid', when='~cuda')
+    conflicts('+opencl_d3d11_nv', when='platform=darwin', msg='Windows only')
+    conflicts('+opencl_d3d11_nv', when='platform=linux', msg='Windows only')
+    conflicts('+opencl_d3d11_nv', when='platform=cray', msg='Windows only')
+    conflicts('+plaidml', when='~gapi')
+    conflicts('+tengine', when='platform=darwin', msg='Linux only')
+    conflicts('+tengine', when='target=x86:', msg='ARM/AARCH64 only')
+    conflicts('+tengine', when='target=x86_64:', msg='ARM/AARCH64 only')
+    conflicts('+ueye', when='platform=darwin', msg='Linux only')
+    conflicts('+v4l', when='platform=darwin', msg='Linux only')
+    conflicts('+va', when='platform=darwin', msg='Linux only')
+    conflicts('+va_intel', when='platform=darwin', msg='Linux only')
+    conflicts('+win32ui', when='platform=darwin', msg='Windows only')
+    conflicts('+win32ui', when='platform=linux', msg='Windows only')
+    conflicts('+win32ui', when='platform=cray', msg='Windows only')
+    conflicts('+xine', when='platform=darwin', msg='Linux only')
+
+    # Other (conflicts)
+    conflicts('+cuda', when='~contrib', msg='cuda support requires +contrib')
 
-    conflicts('+python2', when='+python3')
-    conflicts('+python3', when='+python2')
+    # Patch to fix conflict between CUDA and OpenCV (reproduced with 3.3.0
+    # and 3.4.1) header file that have the same name. Problem is fixed in
+    # the current development branch of OpenCV. See #8461 for more information.
+    patch('dnn_cuda.patch', when='@3.3.0:3.4.1+cuda+dnn')
 
-    extends('python', when='+python2')
-    extends('python', when='+python3')
+    patch('opencv3.2_cmake.patch', when='@3.2:3.4.1')
+    patch('opencv3.2_compiler_cmake.patch', when='@3.2')
+    patch('opencv3.2_vtk.patch', when='@3.2+vtk')
+    patch('opencv3.2_regacyvtk.patch', when='@3.2+vtk')
+    patch('opencv3.2_ffmpeg.patch', when='@3.2+videoio')
+    patch('opencv3.2_python3.7.patch', when='@3.2+python3')
+    patch('opencv3.2_fj.patch', when='@3.2 %fj')
 
     def cmake_args(self):
         spec = self.spec
@@ -215,7 +301,7 @@ class Opencv(CMakePackage, CudaPackage):
             args.append(self.define_from_variant(
                 'WITH_' + component.upper(), component))
 
-        # Other variants
+        # Other
         args.extend([
             self.define('ENABLE_CONFIG_VERIFICATION', True),
             self.define_from_variant('BUILD_SHARED_LIBS', 'shared'),