From 89dac9685f8d0ebd0a07d8b93ed51215c3a2fb2c Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 19 May 2026 07:05:31 +0200
Subject: [PATCH] [vcpkg baseline][gdal] Fix libarchive and zstd import/export
 (#51836)

---
 ports/gdal/libarchive.diff | 29 +++++++++++++++++++++++++++++
 ports/gdal/portfile.cmake  |  3 ++-
 ports/gdal/vcpkg.json      |  2 +-
 versions/baseline.json     |  2 +-
 versions/g-/gdal.json      |  5 +++++
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 ports/gdal/libarchive.diff

diff --git a/ports/gdal/libarchive.diff b/ports/gdal/libarchive.diff
new file mode 100644
index 0000000000..c6cb60719a
--- /dev/null
+++ b/ports/gdal/libarchive.diff
@@ -0,0 +1,29 @@
+diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
+index ba99a00a67..d24ece6055 100644
+--- a/cmake/helpers/CheckDependentLibraries.cmake
++++ b/cmake/helpers/CheckDependentLibraries.cmake
+@@ -423,7 +423,10 @@ gdal_check_package(LZ4 "LZ4 compression" CAN_DISABLE)
+ gdal_check_package(Blosc "Blosc compression" CAN_DISABLE)
+ 
+ define_find_package2(ARCHIVE archive.h archive)
+-gdal_check_package(ARCHIVE "Multi-format archive and compression library library (used for /vsi7z/" CAN_DISABLE)
++set(GDAL_USE_LIBARCHIVE "${GDAL_USE_ARCHIVE}" CACHE BOOL "")
++gdal_check_package(LibArchive "Multi-format archive and compression library library (used for /vsi7z/" CAN_DISABLE
++  TARGETS LibArchive::LibArchive
++)
+ 
+ define_find_package2(LIBAEC libaec.h aec)
+ gdal_check_package(LIBAEC "Adaptive Entropy Coding implementing Golomb-Rice algorithm (used by GRIB)" CAN_DISABLE)
+diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt
+index 1f5d653d30..b71ef2fef0 100644
+--- a/port/CMakeLists.txt
++++ b/port/CMakeLists.txt
+@@ -209,7 +209,7 @@ endif ()
+ 
+ if (GDAL_USE_ARCHIVE)
+   target_compile_definitions(cpl PRIVATE -DHAVE_LIBARCHIVE)
+-  gdal_target_link_libraries(cpl PRIVATE ARCHIVE::ARCHIVE)
++  gdal_target_link_libraries(cpl PRIVATE LibArchive::LibArchive)
+ endif ()
+ 
+ if (GDAL_USE_CURL)
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 93349b4d78..82aaa9f736 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -7,12 +7,13 @@ vcpkg_from_github(
     PATCHES
         find-link-libraries.patch
         iconv.diff
+        libarchive.diff
         libkml.patch
         sqlite3.diff
         target-is-valid.patch
 )
-
 file(REMOVE "${SOURCE_PATH}/cmake/modules/packages/FindIconv.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/packages/FindZSTD.cmake")
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
 
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
index bd39e6f244..46fb4f6f42 100644
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.12.4",
-  "port-version": 1,
+  "port-version": 2,
   "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 408a1641bc..bb25952737 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3318,7 +3318,7 @@
     },
     "gdal": {
       "baseline": "3.12.4",
-      "port-version": 1
+      "port-version": 2
     },
     "gdbm": {
       "baseline": "1.24",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index aa788bd2a6..dad0b44926 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8d51b5a24e3e607f5ea0f9085f6a0a1fe599df9a",
+      "version-semver": "3.12.4",
+      "port-version": 2
+    },
     {
       "git-tree": "464231a52207efb8065e11adc072063556201e76",
       "version-semver": "3.12.4",