Merge pull request #38 from open-vcpkg/gdal391

[gdal] Bump version to 3.9.1
open-vcpkg · Jun 29, 2024 · b8c0424 · b8c0424
2 parents 8e0bd34 + 6f244bb
commit b8c0424
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/ports/gdal/find-link-libraries.patch b/ports/gdal/find-link-libraries.patch
@@ -29,7 +29,7 @@ index c697484..6e83222 100644
  if(PKG_CONFIG_FOUND)
 -    pkg_check_modules(PC_OPENJPEG QUIET libopenjp2)
 +    pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2)
-     set(OPENJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
+     set(OpenJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
  endif()
 +if(PC_OPENJPEG_FOUND)
 +    set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "")

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OSGeo/gdal
     REF "v${VERSION}"
-    SHA512 764490362968b05c0edc1c73c3b51b9a517689f95f0e3e3af141da8ef81614111859bbbf2a1571f047acfbd6ba50a16320ba15ed238cbd73732a960c718d5d50
+    SHA512 d9ab5d94dc870df17b010166d3ebbe897a1f673ba05bf31cd4bed437b6db303dd9e373ba5099d3a191ff3e48c995556fb5bcc77d03d975614df4aa20a2c2b085
     HEAD_REF master
     PATCHES
         find-link-libraries.patch

diff --git a/ports/gdal/usage b/ports/gdal/usage
@@ -1,4 +1,4 @@
-The package GDAL provides CMake targets:
-
-    find_package(GDAL CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE GDAL::GDAL)
+The package GDAL provides CMake targets:
+
+    find_package(GDAL CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE GDAL::GDAL)
diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake
@@ -1,23 +1,23 @@
-cmake_policy(PUSH)
-cmake_policy(SET CMP0012 NEW)
-cmake_policy(SET CMP0054 NEW)
-
-list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE")
-list(APPEND ARGS "CONFIG")
-# The current port version should satisfy GDAL 3.0 ... 3.5
-list(GET ARGS 1 vcpkg_gdal_maybe_version)
-if(vcpkg_gdal_maybe_version MATCHES "(^3\$|^3[.][0-5])")
-    list(REMOVE_AT ARGS "1")
-endif()
-unset(vcpkg_gdal_maybe_version)
-_find_package(${ARGS} CONFIG)
-if(GDAL_FOUND)
-    get_filename_component(vcpkg_gdal_prefix "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-    set(GDAL_INCLUDE_DIR "${vcpkg_gdal_prefix}/include" CACHE INTERNAL "")
-    set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}")
-    set(GDAL_LIBRARY GDAL::GDAL CACHE INTERNAL "")
-    set(GDAL_LIBRARIES "${GDAL_LIBRARY}")
-    unset(vcpkg_gdal_prefix)
-endif()
-
-cmake_policy(POP)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0012 NEW)
+cmake_policy(SET CMP0054 NEW)
+
+list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE")
+list(APPEND ARGS "CONFIG")
+# The current port version should satisfy GDAL 3.0 ... 3.5
+list(GET ARGS 1 vcpkg_gdal_maybe_version)
+if(vcpkg_gdal_maybe_version MATCHES "(^3\$|^3[.][0-5])")
+    list(REMOVE_AT ARGS "1")
+endif()
+unset(vcpkg_gdal_maybe_version)
+_find_package(${ARGS} CONFIG)
+if(GDAL_FOUND)
+    get_filename_component(vcpkg_gdal_prefix "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+    set(GDAL_INCLUDE_DIR "${vcpkg_gdal_prefix}/include" CACHE INTERNAL "")
+    set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}")
+    set(GDAL_LIBRARY GDAL::GDAL CACHE INTERNAL "")
+    set(GDAL_LIBRARIES "${GDAL_LIBRARY}")
+    unset(vcpkg_gdal_prefix)
+endif()
+
+cmake_policy(POP)
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gdal",
-  "version-semver": "3.8.4",
-  "port-version": 1,
+  "version-semver": "3.9.1",
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -46,6 +45,7 @@
       "description": "Build python bindings",
       "dependencies": [
         "python3",
+        "py-numpy",
         {
           "name": "swig",
           "host": true
@@ -63,7 +63,7 @@
     "aws-ec2-windows": {
       "description": "Optimized detection of AWS EC2 Windows hosts",
       "dependencies": [
-        "atlmfc"
+        "atl"
       ]
     },
     "cfitsio": {