gdal: Add version 3.12 and some fixes (conan-io#28957)

* Simplified cmake/ConanFindPackage.cmake, avoid using arrow patch and added gdal/3.12.0

* typo

* typo

* Using libtiff as version range

Author: franramirez688

recipes/gdal/config.yml

@@ -1,12 +1,10 @@
 versions:
+  "3.12.0":
+    folder: "post_3.5.0"
   "3.10.3":
     folder: "post_3.5.0"
   "3.8.3":
     folder: "post_3.5.0"
-  "3.7.3":
-    folder: "post_3.5.0"
-  "3.5.3":
-    folder: "post_3.5.0"
   "3.4.3":
     folder: "pre_3.5.0"
   "3.4.1":

recipes/gdal/post_3.5.0/cmake/ConanFindPackage.cmake

@@ -1,17 +1,7 @@
 function(define_find_package2 pkgname include_file library_name)
 endfunction()
 function(find_package2 pkgname)
-    # Remove args unsupported by find_package()
-    list(REMOVE_ITEM ARGN OUT_DEPENDENCY _find_dependency)
-    # Force CONFIG mode
-    list(REMOVE_ITEM ARGN MODULE NO_CONFIG NO_MODULE)
-    string(TOUPPER ${pkgname} key)
-    if(DEFINED GDAL_USE_${key} AND NOT GDAL_USE_${key})
-        set(${pkgname}_FOUND)
-        set(${key}_FOUND)
-        return()
-    endif()
-    find_package(${pkgname} ${ARGN}
+    find_package(${pkgname}
         QUIET
         CONFIG
         GLOBAL
@@ -26,23 +16,12 @@ function(find_package2 pkgname)
             list(APPEND targets ${lib})
         endif()
     endforeach()
-    # Add upper-case variables
-    set(${key}_DEFINITIONS "${${pkgname}_DEFINITIONS}" CACHE STRING "")
-    set(${key}_FOUND ${${pkgname}_FOUND} CACHE BOOL "")
-    set(${key}_INCLUDE_DIR "${${pkgname}_INCLUDE_DIR}" CACHE STRING "")
-    set(${key}_INCLUDE_DIRS "${${pkgname}_INCLUDE_DIRS}" CACHE STRING "")
-    set(${key}_LIBRARIES "${${pkgname}_LIBRARIES}" CACHE STRING "")
-    set(${key}_LIBRARY "${${pkgname}_LIBRARIES}" CACHE STRING "")
-    set(${key}_TARGET "${targets}" CACHE STRING "")
-    set(${key}_VERSION ${${pkgname}_VERSION} CACHE BOOL "")
-
-    # Add as cache vars for global visibility
+    set(${pkgname}_DEFINITIONS "${${pkgname}_DEFINITIONS}" CACHE STRING "")
     set(${pkgname}_FOUND ${${pkgname}_FOUND} CACHE BOOL "")
+    set(${pkgname}_INCLUDE_DIR "${${pkgname}_INCLUDE_DIR}" CACHE STRING "")
+    set(${pkgname}_INCLUDE_DIRS "${${pkgname}_INCLUDE_DIRS}" CACHE STRING "")
+    set(${pkgname}_LIBRARIES "${${pkgname}_LIBRARIES}" CACHE STRING "")
+    set(${pkgname}_LIBRARY "${${pkgname}_LIBRARIES}" CACHE STRING "")
     set(${pkgname}_TARGET "${targets}" CACHE STRING "")
-    set(${pkgname}_VERSION ${${pkgname}_VERSION_STRING} CACHE BOOL "")
-
-    message(STATUS "Found ${pkgname}: ${${pkgname}_FOUND}")
-    message(STATUS "  ${key}_TARGET: ${${key}_TARGET}")
-    message(STATUS "  ${key}_LIBRARIES: ${${key}_LIBRARIES}")
-    message(STATUS "  ${key}_INCLUDE_DIRS: ${${key}_INCLUDE_DIRS}")
+    set(${pkgname}_VERSION ${${pkgname}_VERSION_STRING} CACHE STRING "")
 endfunction()

recipes/gdal/post_3.5.0/conandata.yml

@@ -1,63 +1,22 @@
 sources:
+  "3.12.0":
+    url: "https://github.com/OSGeo/gdal/releases/download/v3.12.0/gdal-3.12.0.tar.gz"
+    sha256: "44c95baabe6c1a047c1ebe5043e38dd73e4936bc4c481db14efbfd03342eab73"
   "3.10.3":
     url: "https://github.com/OSGeo/gdal/releases/download/v3.10.3/gdal-3.10.3.tar.gz"
     sha256: "e4bf7f104acbcb3e2d16c97fd1af2b92b28d0ba59d17d976e3ef08b794f4153b"
   "3.8.3":
     url: "https://github.com/OSGeo/gdal/releases/download/v3.8.3/gdal-3.8.3.tar.gz"
     sha256: "f7a30387a8239e9da26200f787a02136df2ee6473e86b36d05ad682761a049ea"
-  "3.7.3":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.7.3/gdal-3.7.3.tar.gz"
-    sha256: "f66161e10b8b89a8a541cd760cd36d490114ed3f020a26db1489a6154db5d2be"
-  "3.5.3":
-    url: "https://github.com/OSGeo/gdal/releases/download/v3.5.3/gdal-3.5.3.tar.gz"
-    sha256: "a9ea0300d17e35bab71df4f16e62bb2fb8081caf994ab3ee0502ce4cf0d4e593"
 patches:
+  "3.12.0":
+    - patch_file: "patches/3.12.x/0-replace-find-package.patch"
+    - patch_file: "patches/3.12.x/2-allow-cycles-in-cmake-targets.patch"
   "3.10.3":
     - patch_file: "patches/3.10.3/0-replace-find-package.patch"
-      patch_description: "Use custom version of find_package() for Conan deps"
-      patch_type: "conan"
     - patch_file: "patches/3.10.3/1-do-not-force-private-linking.patch"
-      patch_description: "Fix private linking not working for some Conan dependencies"
-      patch_type: "conan"
     - patch_file: "patches/3.10.3/2-allow-cycles-in-cmake-targets.patch"
-      patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
-      patch_type: "conan"
-    - patch_file: "patches/3.10.3/3-use-arrow-version-for-parquet.patch"
-      patch_description: "Use Arrow version output from find_package() for Parquet and ArrowDataset"
-      patch_type: "conan"
   "3.8.3":
-    - patch_file: "patches/3.8.1/0-replace-find-package.patch"
-      patch_description: "Use custom version of find_package() for Conan deps"
-      patch_type: "conan"
-    - patch_file: "patches/3.7.3/1-do-not-force-private-linking.patch"
-      patch_description: "Fix private linking not working for some Conan dependencies"
-      patch_type: "conan"
-    - patch_file: "patches/3.7.3/2-use-arrow-version-for-parquet.patch"
-      patch_description: "Use Arrow version output from find_package() for Parquet and ArrowDataset"
-      patch_type: "conan"
-    - patch_file: "patches/3.5.3/2-allow-cycles-in-cmake-targets.patch"
-      patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
-      patch_type: "conan"
-  "3.7.3":
-    - patch_file: "patches/3.7.3/0-replace-find-package.patch"
-      patch_description: "Use custom version of find_package() for Conan deps"
-      patch_type: "conan"
-    - patch_file: "patches/3.7.3/1-do-not-force-private-linking.patch"
-      patch_description: "Fix private linking not working for some Conan dependencies"
-      patch_type: "conan"
-    - patch_file: "patches/3.7.3/2-use-arrow-version-for-parquet.patch"
-      patch_description: "Use Arrow version output from find_package() for Parquet and ArrowDataset"
-      patch_type: "conan"
-    - patch_file: "patches/3.5.3/2-allow-cycles-in-cmake-targets.patch"
-      patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
-      patch_type: "conan"
-  "3.5.3":
-    - patch_file: "patches/3.5.3/0-replace-find-package.patch"
-      patch_description: "Use custom version of find_package() for Conan deps"
-      patch_type: "conan"
-    - patch_file: "patches/3.5.3/1-do-not-force-private-linking.patch"
-      patch_description: "Fix private linking not working for some Conan dependencies"
-      patch_type: "conan"
-    - patch_file: "patches/3.5.3/2-allow-cycles-in-cmake-targets.patch"
-      patch_description: "Fix CMake failure due to cyclical dependencies in CMakeDeps targets"
-      patch_type: "conan"
+    - patch_file: "patches/3.8.3/0-replace-find-package.patch"
+    - patch_file: "patches/3.8.3/1-do-not-force-private-linking.patch"
+    - patch_file: "patches/3.8.3/2-allow-cycles-in-cmake-targets.patch"

recipes/gdal/post_3.5.0/conanfile.py

@@ -180,7 +180,7 @@ def layout(self):
     def requirements(self):
         self.requires("json-c/0.17")
         self.requires("libgeotiff/1.7.1")
-        self.requires("libtiff/4.6.0")
+        self.requires("libtiff/[>=4.6.0 <5]")
         self.requires("proj/9.3.1")
         # Used in a public header here:
         # https://github.com/OSGeo/gdal/blob/v3.7.1/port/cpl_minizip_ioapi.h#L26
@@ -335,6 +335,7 @@ def validate(self):
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        self._patch_sources()
 
     def generate(self):
         tc = CMakeToolchain(self)
@@ -439,8 +440,13 @@ def generate(self):
         tc.cache_variables["GDAL_USE_ZLIB_INTERNAL"] = False
         tc.cache_variables["GDAL_USE_ZSTD"] = self.options.with_zstd
 
-        tc.cache_variables["Parquet_FOUND"] = self.options.with_arrow and self.dependencies["arrow"].options.parquet
-        tc.cache_variables["ArrowDataset_FOUND"] = self.options.with_arrow and self.dependencies["arrow"].options.dataset_modules
+        if self.options.with_arrow:
+            # Let's avoid using a patch to set this variables
+            arrow_version = str(self.dependencies["arrow"].ref.version)
+            tc.cache_variables["Parquet_FOUND"] = self.dependencies["arrow"].options.parquet
+            tc.cache_variables["ArrowDataset_FOUND"] = self.dependencies["arrow"].options.dataset_modules
+            tc.cache_variables["Parquet_VERSION"] = arrow_version
+            tc.cache_variables["ArrowDataset_VERSION"] = arrow_version
 
         # General workaround for try_compile() tests in the project
         # https://github.com/conan-io/conan/issues/12180
@@ -641,7 +647,6 @@ def _patch_sources(self):
                             "gdal_check_package(ArrowDataset", "# gdal_check_package(ArrowDataset")
 
     def build(self):
-        self._patch_sources()
         cmake = CMake(self)
         cmake.configure(build_script_folder=self.source_path.parent)
         cmake.build()

recipes/gdal/post_3.5.0/patches/3.10.3/3-use-arrow-version-for-parquet.patch

@@ -0,0 +1,36 @@
+--- cmake/helpers/CheckDependentLibrariesCommon.cmake
++++ cmake/helpers/CheckDependentLibrariesCommon.cmake
+@@ -11,7 +11,7 @@
+ include(CheckFunctionExists)
+ include(CMakeDependentOption)
+ include(FeatureSummary)
+-include(DefineFindPackage2)
++include(ConanFindPackage)
+ include(CheckSymbolExists)
+ 
+ option(
+@@ -109,9 +109,8 @@
+   string(TOUPPER ${name} key)
+   set(_find_dependency "")
+   set(_find_dependency_args "")
+-  if(FIND_PACKAGE2_${name}_ENABLED)
+-    find_package2(${name} QUIET OUT_DEPENDENCY _find_dependency)
+-  else()
++  find_package2(${name} QUIET)
++  if(FALSE)
+     set(_find_package_args)
+     # For some reason passing the HDF5 version requirement cause a linking error of the libkea driver on Conda Windows builds...
+     if (_GCP_VERSION AND NOT ("${name}" STREQUAL "TileDB") AND NOT ("${name}" STREQUAL "HDF5"))
+--- cmake/helpers/CheckDependentLibraries.cmake
++++ cmake/helpers/CheckDependentLibraries.cmake
+@@ -176,8 +176,8 @@
+   NAMES json-c
+   TARGETS json-c::json-c JSONC::JSONC
+ )
+-gdal_internal_library(JSONC REQUIRED)
+-if(TARGET json-c::json-c)
++find_package2(JSONC REQUIRED)
++if(FALSE)
+   get_target_property(include_dirs json-c::json-c INTERFACE_INCLUDE_DIRECTORIES)
+   find_path(GDAL_JSON_INCLUDE_DIR NAMES json.h PATHS ${include_dirs} PATH_SUFFIXES json-c NO_DEFAULT_PATH)
+   list(APPEND include_dirs "${GDAL_JSON_INCLUDE_DIR}")

recipes/gdal/post_3.5.0/patches/3.12.x/0-replace-find-package.patch

@@ -0,0 +1,12 @@
+diff --git a/cmake/helpers/GdalGenerateConfig.cmake b/cmake/helpers/GdalGenerateConfig.cmake
+index debddd7..688b870 100644
+--- a/cmake/helpers/GdalGenerateConfig.cmake
++++ b/cmake/helpers/GdalGenerateConfig.cmake
+@@ -38,6 +38,7 @@ function(gdal_flatten_link_libraries _result _is_debug_build)
+             # new target
+             get_target_property(_link_libraries ${_lib} INTERFACE_LINK_LIBRARIES)
+             get_target_property(_type ${_lib} TYPE)
++            list(REMOVE_ITEM _link_libraries ${_lib})
+             if(_link_libraries AND NOT TYPE STREQUAL "SHARED_LIBRARY")
+                 gdal_flatten_link_libraries(_libs "${_is_debug_build}" ${_link_libraries})
+             endif()