opencv 4.x: refactor to allow fine-grained selection of each module/contrib

recipes/opencv/4.x/conandata.yml

@@ -5,25 +5,42 @@ sources:
     - url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.5.5.tar.gz"
       sha256: "a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11"
   "4.5.3":
-    - url: "https://github.com/opencv/opencv/archive/4.5.3.tar.gz"
+    - url: "https://github.com/opencv/opencv/archive/refs/tags/4.5.3.tar.gz"
       sha256: "77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab"
-    - url: "https://github.com/opencv/opencv_contrib/archive/4.5.3.tar.gz"
+    - url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.5.3.tar.gz"
       sha256: "73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc"
   "4.1.2":
-    - url: "https://github.com/opencv/opencv/archive/4.1.2.tar.gz"
+    - url: "https://github.com/opencv/opencv/archive/refs/tags/4.1.2.tar.gz"
       sha256: "385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9"
-    - url: "https://github.com/opencv/opencv_contrib/archive/4.1.2.tar.gz"
+    - url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.1.2.tar.gz"
       sha256: "0f6c3d30baa39e3e7611afb481ee86dea45dafb182cac87d570c95dccd83eb8b"
 patches:
   "4.5.5":
     - patch_file: "patches/4.5.5-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
+    - patch_file: "patches/4.5.5-0002-objdetect-without-dnn.patch"
+      patch_description: "Allow to build objdetect module without dnn"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/21369"
+    - patch_file: "patches/4.5.5-0003-find-quirc.patch"
+      patch_description: "Robust discovery & injection of quirc"
+      patch_type: "conan"
+    - patch_file: "patches/4.5.5-0004-link-qt-targets.patch"
+      patch_description: "Link to Qt through CMake targets"
+      patch_type: "conan"
     - patch_file: "patches/4.5.0-0002-find-ade.patch"
       patch_description: "Robust discovery & injection of ade"
       patch_type: "conan"
-    - patch_file: "patches/4.1.2-0003-find-quirc.patch"
-      patch_description: "Robust discovery & injection of quirc"
+    - patch_file: "patches/4.5.1-0001-tracking-no-plot-deps.patch"
+      patch_description: "Fix requirements of tracking module"
+      patch_type: "conan"
+    - patch_file: "patches/4.5.1-0002-alphamat-header.patch"
+      patch_description: "Add missing header in alphamat.hpp"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv_contrib/pull/3422"
+    - patch_file: "patches/4.1.2-0006-hdf.patch"
+      patch_description: "Robust discovery of hdf"
       patch_type: "conan"
     - patch_file: "patches/4.5.2-0001-fix-zlib-static-android.patch"
       patch_description: "Fix discovery of zlib static if Android"
@@ -35,18 +52,35 @@ patches:
     - patch_file: "patches/4.5.3-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
+    - patch_file: "patches/4.5.3-0002-link-qt-targets.patch"
+      patch_description: "Link to Qt through CMake targets"
+      patch_type: "conan"
     - patch_file: "patches/4.5.0-0002-find-ade.patch"
       patch_description: "Robust discovery & injection of ade"
       patch_type: "conan"
     - patch_file: "patches/4.1.2-0003-find-quirc.patch"
       patch_description: "Robust discovery & injection of quirc"
       patch_type: "conan"
+    - patch_file: "patches/4.5.1-0001-tracking-no-plot-deps.patch"
+      patch_description: "Fix requirements of tracking module"
+      patch_type: "conan"
+    - patch_file: "patches/4.5.1-0002-alphamat-header.patch"
+      patch_description: "Add missing header in alphamat.hpp"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv_contrib/pull/3422"
+    - patch_file: "patches/4.1.2-0006-hdf.patch"
+      patch_description: "Robust discovery of hdf"
+      patch_type: "conan"
     - patch_file: "patches/4.5.2-0001-fix-zlib-static-android.patch"
       patch_description: "Fix discovery of zlib static if Android"
       patch_type: "conan"
     - patch_file: "patches/4.1.2-0007-android-install-layout.patch"
       patch_description: "Honor install layout from conan if Android"
       patch_type: "conan"
+    - patch_file: "patches/4.1.2-0010-compat-protobuf-ge-3.18.patch"
+      patch_description: "Compatibility with protobuf >= 3.18"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/20386"
   "4.1.2":
     - patch_file: "patches/4.1.2-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
@@ -60,6 +94,26 @@ patches:
     - patch_file: "patches/4.1.2-0004-jasper.patch"
       patch_description: "Compatibility with recent jasper versions"
       patch_type: "portability"
+    - patch_file: "patches/4.1.2-0005-tracking-no-plot-deps.patch"
+      patch_description: "Fix requirements of tracking module"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0006-hdf.patch"
+      patch_description: "Robust discovery of hdf"
+      patch_type: "conan"
     - patch_file: "patches/4.1.2-0007-android-install-layout.patch"
       patch_description: "Honor install layout from conan if Android"
       patch_type: "conan"
+    - patch_file: "patches/4.1.2-0008-link-qt-targets.patch"
+      patch_description: "Link to Qt through CMake targets"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0009-sfm-deps.patch"
+      patch_description: "Fix link to dependencies of sfm module"
+      patch_type: "conan"
+    - patch_file: "patches/4.1.2-0010-compat-protobuf-ge-3.18.patch"
+      patch_description: "Compatibility with protobuf >= 3.18"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/20386"
+    - patch_file: "patches/4.1.2-0011-compat-openexr3.patch"
+      patch_description: "Compatibility with OpenEXR 3.x"
+      patch_type: "portability"
+      patch_source: "https://github.com/opencv/opencv/pull/19970"