opencv/3.x: use libpng version range, bump deps, remove 3.4.17

recipes/opencv/3.x/conandata.yml

@@ -4,17 +4,8 @@ sources:
       sha256: "b9eda448a08ba7b10bfd5bd45697056569ebdf7a02070947e1c1f3e8e69280cd"
     - url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/3.4.20.tar.gz"
       sha256: "b0bb3fa7ae4ac00926b83d4d95c6500c2f7af542f8ec78d0f01b2961a690d5dc"
-  "3.4.17":
-    - url: "https://github.com/opencv/opencv/archive/refs/tags/3.4.17.tar.gz"
-      sha256: "1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8"
-    - url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/3.4.17.tar.gz"
-      sha256: "2b4d3e91a5767a1ae4f4e2a71b0a93c9ec744755763653a650e40ace8f7b9a1b"
 patches:
   "3.4.20":
     - patch_file: "patches/3.4.17-0001-find-openexr.patch"
       patch_description: "Robust discovery & injection of OpenEXR"
       patch_type: "conan"
-  "3.4.17":
-    - patch_file: "patches/3.4.17-0001-find-openexr.patch"
-      patch_description: "Robust discovery & injection of OpenEXR"
-      patch_type: "conan"

recipes/opencv/3.x/conanfile.py

@@ -80,13 +80,13 @@ def requirements(self):
         if self.options.with_jpeg == "libjpeg":
             self.requires("libjpeg/9e")
         elif self.options.with_jpeg == "libjpeg-turbo":
-            self.requires("libjpeg-turbo/3.0.0")
+            self.requires("libjpeg-turbo/3.0.2")
         elif self.options.with_jpeg == "mozjpeg":
-            self.requires("mozjpeg/4.1.3")
+            self.requires("mozjpeg/4.1.5")
         if self.options.with_png:
-            self.requires("libpng/1.6.40")
+            self.requires("libpng/[>=1.6 <2]")
         if self.options.with_jasper:
-            self.requires("jasper/4.0.0")
+            self.requires("jasper/4.2.0")
         if self.options.with_openexr:
             # opencv 3.x doesn't support openexr >= 3
             self.requires("openexr/2.5.7")
@@ -100,8 +100,8 @@ def requirements(self):
         if self.options.with_webp:
             self.requires("libwebp/1.3.2")
         if self.options.contrib:
-            self.requires("freetype/2.13.0")
-            self.requires("harfbuzz/8.2.2")
+            self.requires("freetype/2.13.2")
+            self.requires("harfbuzz/8.3.0")
             self.requires("gflags/2.2.2")
             self.requires("glog/0.6.0")
         if self.options.get_safe("with_gtk"):

recipes/opencv/config.yml

@@ -13,7 +13,5 @@ versions:
     folder: "4.x"
   "3.4.20":
     folder: "3.x"
-  "3.4.17":
-    folder: "3.x"
   "2.4.13.7":
     folder: "2.x"