dlib: bump dependencies and patch to fix errors with newer compilers (#28766)

* Bump dependencies versions

Signed-off-by: Uilian Ries <[email protected]>

* Trigger CI

Signed-off-by: Uilian Ries <[email protected]>

* Backport patch for template argument error on Clang

Signed-off-by: Uilian Ries <[email protected]>

* Re-use backport patch for 19.24

Signed-off-by: Uilian Ries <[email protected]>

* Re-use backport patch for 19.23

Signed-off-by: Uilian Ries <[email protected]>

* Drop <=19.21 due patch incompatibility

Signed-off-by: Uilian Ries <[email protected]>

---------

Signed-off-by: Uilian Ries <[email protected]>

Author: uilianries

recipes/dlib/all/conandata.yml

@@ -8,9 +8,10 @@ sources:
   "19.23":
     url: "https://github.com/davisking/dlib/archive/v19.23.tar.gz"
     sha256: "0fc74a39d2046ad15819bab25a695333a63e740c91ed3c620c8594381c132e88"
-  "19.21":
-    url: "https://github.com/davisking/dlib/archive/v19.21.tar.gz"
-    sha256: "116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0"
-  "19.19":
-    url: "https://github.com/davisking/dlib/archive/v19.19.tar.gz"
-    sha256: "7af455bb422d3ae5ef369c51ee64e98fa68c39435b0fa23be2e5d593a3d45b87"
+patches:
+  "19.24.2":
+    - patch_file: "patches/19.24.2-0001-fix-template-arg-error.patch"
+  "19.24":
+    - patch_file: "patches/19.24.2-0001-fix-template-arg-error.patch"
+  "19.23":
+    - patch_file: "patches/19.24.2-0001-fix-template-arg-error.patch"

recipes/dlib/all/conanfile.py

@@ -1,6 +1,6 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import get, replace_in_file, copy, rmdir, collect_libs, rm
+from conan.tools.files import get, replace_in_file, copy, rmdir, collect_libs, rm, apply_conandata_patches, export_conandata_patches
 from conan.tools.build import check_min_cppstd
 from conan.tools.microsoft import is_msvc
 from conan.tools.scm import Version
@@ -69,6 +69,9 @@ def _compilers_minimum_version(self):
     def _has_with_webp_option(self):
         return Version(self.version) >= "19.24"
 
+    def export_sources(self):
+        export_conandata_patches(self)
+
     def config_options(self):
         if self.settings.os == "Windows":
             self.options.rm_safe("fPIC")
@@ -90,15 +93,15 @@ def requirements(self):
         if self.options.with_gif:
             self.requires("giflib/5.2.1")
         if self.options.with_jpeg:
-            self.requires("libjpeg/9e")
+            self.requires("libjpeg/[>=9e]")
         if self.options.with_png:
             self.requires("libpng/[>=1.6 <2]")
         if self.options.get_safe("with_webp"):
             self.requires("libwebp/1.3.2")
         if self.options.with_sqlite3:
-            self.requires("sqlite3/3.45.0")
+            self.requires("sqlite3/[>=3.45.0 <4]")
         if self.options.with_openblas:
-            self.requires("openblas/0.3.26")
+            self.requires("openblas/0.3.30")
 
     def validate(self):
         if self.settings.compiler.cppstd:
@@ -113,6 +116,7 @@ def validate(self):
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        apply_conandata_patches(self)
 
     def _patch_sources(self):
         dlib_cmakelists = os.path.join(self.source_folder, "dlib", "CMakeLists.txt")

recipes/dlib/all/patches/19.24.2-0001-fix-template-arg-error.patch

@@ -0,0 +1,25 @@
+From 123029b0abde8d3074681acab44f14ce4c5ef8ea Mon Sep 17 00:00:00 2001
+From: Drew Risinger <[email protected]>
+Date: Mon, 24 Jun 2024 11:19:21 -0700
+Subject: [PATCH] global_optimization: add template argument list
+
+Fixes error (-Wmissing-template-arg-list-after-template-kw) from clang-19 compiler.
+
+https://github.com/davisking/dlib/pull/2973
+---
+ dlib/global_optimization/find_max_global.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlib/global_optimization/find_max_global.h b/dlib/global_optimization/find_max_global.h
+index 12e496e698..8a05ae9050 100644
+--- a/dlib/global_optimization/find_max_global.h
++++ b/dlib/global_optimization/find_max_global.h
+@@ -58,7 +58,7 @@ namespace dlib
+             }
+
+             template <typename T>
+-            static auto go(T&& f, const matrix<double,0,1>& a) -> decltype(call_function_and_expand_args<max_unpack-1>::template go(std::forward<T>(f),a))
++            static auto go(T&& f, const matrix<double,0,1>& a) -> decltype(call_function_and_expand_args<max_unpack-1>::template go<T>(std::forward<T>(f),a))
+             {
+                 return call_function_and_expand_args<max_unpack-1>::go(std::forward<T>(f),a);
+             }

recipes/dlib/config.yml

@@ -5,7 +5,3 @@ versions:
     folder: all
   "19.23":
     folder: all
-  "19.21":
-    folder: all
-  "19.19":
-    folder: all