mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[gdal] Update to 3.7.1 (#32559)
This commit is contained in:
parent
e398928f11
commit
0da6acafcf
@ -1,61 +0,0 @@
|
||||
diff --git a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
|
||||
index 61eb15ee951..79795835713 100644
|
||||
--- a/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
|
||||
+++ b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h
|
||||
@@ -1,3 +1,4 @@
|
||||
+/* This is a generated file by dump_symbols.h. *DO NOT EDIT MANUALLY !* */
|
||||
#define compare_ints gdal_compare_ints
|
||||
#define DBFAddField gdal_DBFAddField
|
||||
#define DBFAddNativeFieldType gdal_DBFAddNativeFieldType
|
||||
@@ -13,6 +14,7 @@
|
||||
#define DBFGetFieldCount gdal_DBFGetFieldCount
|
||||
#define DBFGetFieldIndex gdal_DBFGetFieldIndex
|
||||
#define DBFGetFieldInfo gdal_DBFGetFieldInfo
|
||||
+#define DBFGetLenWithoutExtension gdal_DBFGetLenWithoutExtension
|
||||
#define DBFGetNativeFieldType gdal_DBFGetNativeFieldType
|
||||
#define DBFGetNullCharacter gdal_DBFGetNullCharacter
|
||||
#define DBFGetRecordCount gdal_DBFGetRecordCount
|
||||
@@ -43,6 +45,7 @@
|
||||
#define DBFWriteStringAttribute gdal_DBFWriteStringAttribute
|
||||
#define DBFWriteTuple gdal_DBFWriteTuple
|
||||
#define frame_dummy gdal_frame_dummy
|
||||
+#define SASetupDefaultHooks gdal_SASetupDefaultHooks
|
||||
#define SBNAddShapeId gdal_SBNAddShapeId
|
||||
#define SBNCloseDiskTree gdal_SBNCloseDiskTree
|
||||
#define SBNOpenDiskTree gdal_SBNOpenDiskTree
|
||||
@@ -66,6 +69,8 @@
|
||||
#define SHPDestroyTree gdal_SHPDestroyTree
|
||||
#define SHPDestroyTreeNode gdal_SHPDestroyTreeNode
|
||||
#define SHPGetInfo gdal_SHPGetInfo
|
||||
+#define SHPGetLenWithoutExtension gdal_SHPGetLenWithoutExtension
|
||||
+#define SHPGetPartVertexCount gdal_SHPGetPartVertexCount
|
||||
#define SHPGetSubNodeOffset gdal_SHPGetSubNodeOffset
|
||||
#define SHPOpenDiskTree gdal_SHPOpenDiskTree
|
||||
#define SHPOpen gdal_SHPOpen
|
||||
@@ -75,6 +80,7 @@
|
||||
#define SHPReadObject gdal_SHPReadObject
|
||||
#define SHPReallocObjectBufIfNecessary gdal_SHPReallocObjectBufIfNecessary
|
||||
#define SHPRestoreSHX gdal_SHPRestoreSHX
|
||||
+#define SHPRewindIsInnerRing gdal_SHPRewindIsInnerRing
|
||||
#define SHPRewindObject gdal_SHPRewindObject
|
||||
#define SHPSearchDiskTreeEx gdal_SHPSearchDiskTreeEx
|
||||
#define SHPSearchDiskTree gdal_SHPSearchDiskTree
|
||||
@@ -97,6 +103,4 @@
|
||||
#define SHPWriteTree gdal_SHPWriteTree
|
||||
#define SHPWriteTreeLL gdal_SHPWriteTreeLL
|
||||
#define SHPWriteTreeNode gdal_SHPWriteTreeNode
|
||||
-#define str_to_upper gdal_str_to_upper
|
||||
#define SwapWord gdal_SwapWord
|
||||
-/* This is a generated file by dump_symbols.h. *DO NOT EDIT MANUALLY !* */
|
||||
diff --git a/ogr/ogrsf_frmts/shape/shp_vsi.h b/ogr/ogrsf_frmts/shape/shp_vsi.h
|
||||
index 9ee8056804e..9cbe653bead 100644
|
||||
--- a/ogr/ogrsf_frmts/shape/shp_vsi.h
|
||||
+++ b/ogr/ogrsf_frmts/shape/shp_vsi.h
|
||||
@@ -31,6 +31,7 @@
|
||||
#ifndef SHP_VSI_H_INCLUDED
|
||||
#define SHP_VSI_H_INCLUDED
|
||||
|
||||
+#include "gdal_shapelib_symbol_rename.h"
|
||||
#include "cpl_vsi.h"
|
||||
#include "shapefil.h"
|
||||
|
@ -2,13 +2,12 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OSGeo/gdal
|
||||
REF "v${VERSION}"
|
||||
SHA512 dfc7ccf5c1a3184fa93be762a880b7631faa4cd178cd72df8f5fd8a6296edafc56de2594617bebcb75ddf19ed4471dafcb574b22d7e9217dedfd7ea72c9247f2
|
||||
SHA512 38d488a5c70f0f4b6a3b99a14c747760574680f1f7fc5c6e4c373e3599a03c3227bb1bdefc14c7770f15b5087ff706362ed5a0fc0f5623835f006561f5db9595
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
find-link-libraries.patch
|
||||
fix-gdal-target-interfaces.patch
|
||||
libkml.patch
|
||||
gdal-pr-8005.diff # Remove in 3.7.1
|
||||
)
|
||||
# `vcpkg clean` stumbles over one subdir
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "gdal",
|
||||
"version-semver": "3.7.0",
|
||||
"port-version": 4,
|
||||
"version-semver": "3.7.1",
|
||||
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
|
||||
"homepage": "https://gdal.org",
|
||||
"license": null,
|
||||
|
@ -2753,8 +2753,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"gdal": {
|
||||
"baseline": "3.7.0",
|
||||
"port-version": 4
|
||||
"baseline": "3.7.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"gdcm": {
|
||||
"baseline": "3.0.22",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a532cd9881bfbd8e3665ff4244dccef8af62ffff",
|
||||
"version-semver": "3.7.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "9e2de2263a527e2135c8532fcc9967e63378a552",
|
||||
"version-semver": "3.7.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user