[gdal] Update to 3.7.2 (#33960)

This commit is contained in:
Kai Pastor 2023-09-26 08:48:02 +02:00 committed by GitHub
parent 7ceccee7f8
commit 62988594de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 20 deletions

View File

@ -1,13 +0,0 @@
diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake
index fa72773..813cca3 100644
--- a/cmake/modules/packages/FindSPATIALITE.cmake
+++ b/cmake/modules/packages/FindSPATIALITE.cmake
@@ -64,7 +64,7 @@ if(SPATIALITE_LIBRARY AND SPATIALITE_INCLUDE_DIR
AND NOT SPATIALITE_VERSION_STRING)
file(STRINGS "${SPATIALITE_INCLUDE_DIR}/spatialite.h" _spatialite_h_ver
REGEX "^[ \t]version[ \t]([0-9]+\\.[0-9]+),.*")
- string(REGEX REPLACE "[ \t]version[ \t]([0-9]+\\.[0-9]+),.*" "\\1" _spatialite_h_ver ${_spatialite_h_ver})
+ string(REGEX REPLACE "[ \t]version[ \t]([0-9]+\\.[0-9]+),.*" "\\1" _spatialite_h_ver "${_spatialite_h_ver}")
set(SPATIALITE_VERSION_STRING "${_spatialite_h_ver}")
endif()

View File

@ -2,13 +2,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/gdal
REF "v${VERSION}"
SHA512 38d488a5c70f0f4b6a3b99a14c747760574680f1f7fc5c6e4c373e3599a03c3227bb1bdefc14c7770f15b5087ff706362ed5a0fc0f5623835f006561f5db9595
SHA512 95b0dee07a616c8fb26ded2c538a6933ba070c0567e88af9356daea9b1df6c910edb4fcf55766839c1873829d20948b1714b3e2285e5ac57de8fcf0970ff53ff
HEAD_REF master
PATCHES
find-link-libraries.patch
fix-gdal-target-interfaces.patch
libkml.patch
Fix-quote-variable.patch
fix-jpeg.patch
)
# `vcpkg clean` stumbles over one subdir
@ -169,4 +168,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDA
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT")

View File

@ -1,7 +1,6 @@
{
"name": "gdal",
"version-semver": "3.7.1",
"port-version": 4,
"version-semver": "3.7.2",
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,

View File

@ -2805,8 +2805,8 @@
"port-version": 0
},
"gdal": {
"baseline": "3.7.1",
"port-version": 4
"baseline": "3.7.2",
"port-version": 0
},
"gdcm": {
"baseline": "3.0.22",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d01864aaa21a85e1e8f7bb6748d607e953c52e77",
"version-semver": "3.7.2",
"port-version": 0
},
{
"git-tree": "eb6b9c542c7c01651906fee737d73fab64482700",
"version-semver": "3.7.1",