mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 13:28:01 +08:00
[gdal] Update to 3.7.3 (#35073)
This commit is contained in:
parent
345fd91546
commit
6193a5e89d
@ -1,13 +0,0 @@
|
||||
diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
|
||||
index 9568ef043e..94617e3ac9 100644
|
||||
--- a/cmake/helpers/CheckDependentLibraries.cmake
|
||||
+++ b/cmake/helpers/CheckDependentLibraries.cmake
|
||||
@@ -416,7 +416,7 @@ if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)"))
|
||||
"JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference"
|
||||
)
|
||||
endif ()
|
||||
-if (TARGET JPEG::JPEG)
|
||||
+if (GDAL_USE_JPEG AND TARGET JPEG::JPEG)
|
||||
set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number")
|
||||
mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES)
|
||||
if (EXPECTED_JPEG_LIB_VERSION)
|
@ -2,14 +2,12 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OSGeo/gdal
|
||||
REF "v${VERSION}"
|
||||
SHA512 95b0dee07a616c8fb26ded2c538a6933ba070c0567e88af9356daea9b1df6c910edb4fcf55766839c1873829d20948b1714b3e2285e5ac57de8fcf0970ff53ff
|
||||
SHA512 db23c751aa1bfc9f9f80c4dc900e86fb19579251d3577ef5bd06f9ddf76ba8c74aa404b5477ced5649d011e2111ca8df38d5acc87de6723f7e50f3bb22c9ee8f
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
find-link-libraries.patch
|
||||
fix-gdal-target-interfaces.patch
|
||||
libkml.patch
|
||||
fix-jpeg.patch
|
||||
upstream-b5858ed.diff
|
||||
)
|
||||
# `vcpkg clean` stumbles over one subdir
|
||||
file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
|
||||
|
@ -1,21 +0,0 @@
|
||||
diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp
|
||||
index ed79c0972e0..33846d66513 100644
|
||||
--- a/frmts/gtiff/geotiff.cpp
|
||||
+++ b/frmts/gtiff/geotiff.cpp
|
||||
@@ -2886,8 +2886,16 @@ static void ThreadDecompressionFunc(void *pData)
|
||||
psJob->nXBlock, psJob->nYBlock);
|
||||
if (apoBlocks[i] == nullptr)
|
||||
{
|
||||
+ // Temporary disabling of dirty block fushing, otherwise
|
||||
+ // we can be in a deadlock situation, where the
|
||||
+ // GTiffDataset::SubmitCompressionJob() method waits for jobs
|
||||
+ // to be finished, that can't finish (actually be started)
|
||||
+ // because this task and its siblings are taking all the
|
||||
+ // available workers allowed by the global thread pool.
|
||||
+ GDALRasterBlock::EnterDisableDirtyBlockFlush();
|
||||
apoBlocks[i] = poDS->GetRasterBand(iBand)->GetLockedBlockRef(
|
||||
psJob->nXBlock, psJob->nYBlock, TRUE);
|
||||
+ GDALRasterBlock::LeaveDisableDirtyBlockFlush();
|
||||
if (apoBlocks[i] == nullptr)
|
||||
return false;
|
||||
}
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "gdal",
|
||||
"version-semver": "3.7.2",
|
||||
"port-version": 1,
|
||||
"version-semver": "3.7.3",
|
||||
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
|
||||
"homepage": "https://gdal.org",
|
||||
"license": null,
|
||||
|
@ -2861,8 +2861,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"gdal": {
|
||||
"baseline": "3.7.2",
|
||||
"port-version": 1
|
||||
"baseline": "3.7.3",
|
||||
"port-version": 0
|
||||
},
|
||||
"gdcm": {
|
||||
"baseline": "3.0.22",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "388e85b332e219ece9bdb669274ca04762500330",
|
||||
"version-semver": "3.7.3",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f",
|
||||
"version-semver": "3.7.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user