From 6193a5e89d2fb5621aaaf3bb7d9e7d136eb06f4e Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 14 Nov 2023 09:23:52 +0100
Subject: [PATCH] [gdal] Update to 3.7.3 (#35073)

---
 ports/gdal/fix-jpeg.patch        | 13 -------------
 ports/gdal/portfile.cmake        |  4 +---
 ports/gdal/upstream-b5858ed.diff | 21 ---------------------
 ports/gdal/vcpkg.json            |  3 +--
 versions/baseline.json           |  4 ++--
 versions/g-/gdal.json            |  5 +++++
 6 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 ports/gdal/fix-jpeg.patch
 delete mode 100644 ports/gdal/upstream-b5858ed.diff

diff --git a/ports/gdal/fix-jpeg.patch b/ports/gdal/fix-jpeg.patch
deleted file mode 100644
index fb39537344..0000000000
--- a/ports/gdal/fix-jpeg.patch
+++ /dev/null
@@ -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)
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 07f27f062a..5ce1bdd8cd 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -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")
diff --git a/ports/gdal/upstream-b5858ed.diff b/ports/gdal/upstream-b5858ed.diff
deleted file mode 100644
index 9c31afcc2d..0000000000
--- a/ports/gdal/upstream-b5858ed.diff
+++ /dev/null
@@ -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;
-             }
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
index 2001a0c25a..1dca7f426b 100644
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@@ -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,
diff --git a/versions/baseline.json b/versions/baseline.json
index ded44fd3ed..538647601a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -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",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index d91f56fd25..58ac8b8d4d 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "388e85b332e219ece9bdb669274ca04762500330",
+      "version-semver": "3.7.3",
+      "port-version": 0
+    },
     {
       "git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f",
       "version-semver": "3.7.2",