gdal/post_3.5.0: bump deps

recipes/gdal/post_3.5.0/CMakeLists.txt

@@ -26,12 +26,12 @@ endif()
 
 if (${GDAL_USE_CRYPTOPP})
     find_package(cryptopp REQUIRED)
-    add_library(CRYPTOPP::CRYPTOPP ALIAS cryptopp::cryptopp-static)
+    add_library(CRYPTOPP::CRYPTOPP ALIAS ${TARGET_FOR_CRYPTOPP})
 endif()
 
 if (${GDAL_USE_DEFLATE})
     find_package(libdeflate REQUIRED)
-    add_library(Deflate::Deflate ALIAS libdeflate::libdeflate)
+    add_library(Deflate::Deflate ALIAS ${TARGET_FOR_DEFLATE})
 endif()
 
 if (${GDAL_USE_LZ4})

recipes/gdal/post_3.5.0/conanfile.py

@@ -1,4 +1,5 @@
 from conan import ConanFile
+from conan.tools.apple import fix_apple_shared_install_name
 from conan.tools.files import apply_conandata_patches, get, files
 from conan.errors import ConanInvalidConfiguration
 from conans import CMake
@@ -149,7 +150,7 @@
         if self.options.shared:
             try:
                 del self.options.fPIC
             except:
                 pass
 
     def requirements(self):
@@ -172,23 +173,23 @@
             self.requires("cryptopp/8.7.0")
 
         if self.options.with_curl:
-            self.requires("libcurl/7.85.0")
+            self.requires("libcurl/8.2.0")
 
         if self.options.with_dds:
             self.requires("crunch/cci.20190615")
 
         if self.options.with_expat:
-            self.requires("expat/2.4.9")
+            self.requires("expat/2.5.0")
 
         if self.options.with_exr:
-            self.requires("openexr/3.1.5")
-            self.requires("imath/3.1.5")
+            self.requires("openexr/3.1.9")
+            self.requires("imath/3.1.9")
 
         if self.options.with_freexl:
             self.requires("freexl/1.0.6")
 
         if self.options.with_geos:
-            self.requires("geos/3.11.0")
+            self.requires("geos/3.11.1")
 
         if self.options.with_gif:
             self.requires("giflib/5.2.1")
@@ -208,13 +209,13 @@
         if self.options.with_jpeg == "libjpeg":
             self.requires("libjpeg/9e")
         elif self.options.with_jpeg == "libjpeg-turbo":
-            self.requires("libjpeg-turbo/2.1.4")
+            self.requires("libjpeg-turbo/2.1.5")
 
         if self.options.with_kea:
             self.requires("kealib/1.4.14")
 
         if self.options.with_libdeflate:
-            self.requires("libdeflate/1.12")
+            self.requires("libdeflate/1.18")
 
         if self.options.with_libiconv:
             self.requires("libiconv/1.17")
@@ -223,7 +224,7 @@
             self.requires("libkml/1.3.0")
 
         if self.options.with_libtiff:
-            self.requires("libtiff/4.4.0")
+            self.requires("libtiff/4.5.1")
 
         if self.options.with_lz4:
             self.requires("lz4/1.9.4")
@@ -246,19 +247,19 @@
             self.requires("openjpeg/2.5.0")
 
         if self.options.with_openssl:
-            self.requires("openssl/1.1.1q")
+            self.requires("openssl/1.1.1u")
 
         if self.options.with_pcre:
             self.requires("pcre/8.45")
 
         if self.options.with_pcre2:
-            self.requires("pcre2/10.40")
+            self.requires("pcre2/10.42")
 
         if self.options.with_pg:
             self.requires("libpq/14.5")
 
         if self.options.with_png:
-            self.requires("libpng/1.6.38")
+            self.requires("libpng/1.6.40")
 
         if self.options.with_podofo:
             self.requires("podofo/0.9.7")
@@ -267,28 +268,32 @@
             self.requires("poppler/21.07.0")
 
         if self.options.with_proj:
-            self.requires("proj/9.0.1")
+            self.requires("proj/9.1.1")
 
         if self.options.with_qhull:
             self.requires("qhull/8.0.1")
 
         if self.options.with_sqlite3:
-            self.requires("sqlite3/3.39.3")
+            self.requires("sqlite3/3.42.0")
 
         if self.options.with_webp:
-            self.requires("libwebp/1.2.4")
+            self.requires("libwebp/1.3.1")
 
         if self.options.with_xerces:
             self.requires("xerces-c/3.2.3")
 
         if self.options.with_xml2:
-            self.requires("libxml2/2.9.14")
+            self.requires("libxml2/2.10.3")
 
         if self.options.with_zlib:
-            self.requires("zlib/1.2.12")
+            self.requires("zlib/1.2.13")
 
         if self.options.with_zstd:
-            self.requires("zstd/1.5.2")
+            self.requires("zstd/1.5.5")
+
+    def build_requirements(self):
+        # https://github.com/conan-io/conan/issues/3482#issuecomment-662284561
+        self.tool_requires("cmake/[>=3.18 <4]")
 
     def package_id(self):
         del self.info.options.with_crypto
@@ -724,10 +729,10 @@
         self.copy("LICENSE.TXT", dst="licenses", src=self._source_subfolder)
         cmake = self._configure_cmake()
         cmake.install()
-
         files.rmdir(self, os.path.join(self.package_folder, "share"))
         files.rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
         files.rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+        fix_apple_shared_install_name(self)
 
     def package_info(self):