opencv: conan v2 support + bump dependencies

recipes/opencv/2.x/conandata.yml

@@ -5,4 +5,8 @@ sources:
 patches:
   "2.4.13.7":
     - patch_file: "patches/0001-jasper.patch"
-      base_path: "src"
+      patch_description: "Compatibility with recent jasper versions"
+      patch_type: "portability"
+    - patch_file: "patches/0002-find-openexr.patch"
+      patch_description: "Robust discovery & injection of OpenEXR"
+      patch_type: "conan"

recipes/opencv/2.x/patches/0002-find-openexr.patch

@@ -0,0 +1,18 @@
+--- a/cmake/OpenCVFindOpenEXR.cmake
++++ b/cmake/OpenCVFindOpenEXR.cmake
+@@ -8,6 +8,15 @@
+ # OPENEXR_INCLUDE_PATHS = OpenEXR include directories.
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ #
++find_package(OpenEXR REQUIRED)
++if(TARGET OpenEXR::OpenEXR)
++    set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++else()
++    set(OPENEXR_LIBRARIES openexr::openexr)
++endif()
++set(OPENEXR_FOUND TRUE)
++set(OPENEXR_VERSION ${OpenEXR_VERSION})
++return()
+
+ SET(OPENEXR_LIBRARIES "")
+ SET(OPENEXR_LIBSEARCH_SUFFIXES "")

recipes/opencv/2.x/test_package/CMakeLists.txt

@@ -1,10 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
-project(test_package)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+project(test_package LANGUAGES CXX)
 
 find_package(OpenCV REQUIRED core CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} opencv_core)
+target_link_libraries(${PROJECT_NAME} PRIVATE opencv_core)

recipes/opencv/2.x/test_package/conanfile.py

@@ -1,17 +1,26 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
 import os
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package_multi"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
-            bin_path = os.path.join("bin", "test_package")
-            self.run(bin_path, run_environment=True)
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
+            self.run(bin_path, env="conanrun")

recipes/opencv/2.x/test_v1_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.1)
+project(test_package)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/opencv/2.x/test_v1_package/conanfile.py

@@ -0,0 +1,17 @@
+from conans import ConanFile, CMake, tools
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not tools.cross_building(self):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)

recipes/opencv/3.x/conandata.yml

@@ -9,3 +9,12 @@ sources:
       sha256: "c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13"
     - url: "https://github.com/opencv/opencv_contrib/archive/3.4.12.tar.gz"
       sha256: "b207024589674dd2efc7c25740ef192ee4f3e0783e773e2d49a198c37e3e7570"
+patches:
+  "3.4.17":
+    - patch_file: "patches/3.4.17-0001-find-openexr.patch"
+      patch_description: "Robust discovery & injection of OpenEXR"
+      patch_type: "conan"
+  "3.4.12":
+    - patch_file: "patches/3.4.12-0001-find-openexr.patch"
+      patch_description: "Robust discovery & injection of OpenEXR"
+      patch_type: "conan"