From 1938443854da3c31f548a0483659c4e5c6a1699f Mon Sep 17 00:00:00 2001
From: Mathieu Pellerin <nirvn.asia@gmail.com>
Date: Wed, 6 Nov 2024 03:34:14 +0700
Subject: [PATCH] [gdal] Add libarchive support (#41896)

---
 ports/gdal/portfile.cmake                   |  1 +
 ports/gdal/vcpkg.json                       | 10 ++++++++++
 scripts/test_ports/vcpkg-ci-gdal/vcpkg.json |  1 +
 versions/baseline.json                      |  2 +-
 versions/g-/gdal.json                       |  5 +++++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 57ebe75e26..297a755d38 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -22,6 +22,7 @@ vcpkg_replace_string("${SOURCE_PATH}/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base
 # "core" is used for a dependency which must be enabled to avoid vendored lib.
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
+        archive          GDAL_USE_ARCHIVE
         cfitsio          GDAL_USE_CFITSIO
         curl             GDAL_USE_CURL
         expat            GDAL_USE_EXPAT
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
index e6d0d5d54c..832a9fbfc7 100644
--- a/ports/gdal/vcpkg.json
+++ b/ports/gdal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.9.3",
+  "port-version": 1,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "license": null,
@@ -41,6 +42,15 @@
     "default-features"
   ],
   "features": {
+    "archive": {
+      "description": "Enable libarchive support",
+      "dependencies": [
+        {
+          "name": "libarchive",
+          "default-features": false
+        }
+      ]
+    },
     "aws-ec2-windows": {
       "description": "Optimized detection of AWS EC2 Windows hosts",
       "dependencies": [
diff --git a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json
index aa03502ca2..028de0bf23 100644
--- a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json
@@ -8,6 +8,7 @@
     {
       "name": "gdal",
       "features": [
+        "archive",
         "freexl"
       ]
     },
diff --git a/versions/baseline.json b/versions/baseline.json
index ee87348034..2abcb51bb4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3026,7 +3026,7 @@
     },
     "gdal": {
       "baseline": "3.9.3",
-      "port-version": 0
+      "port-version": 1
     },
     "gdcm": {
       "baseline": "3.0.24",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index 61063f992e..2f394915a9 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48387632dca0060dca76a899ebb693e2799d3d39",
+      "version-semver": "3.9.3",
+      "port-version": 1
+    },
     {
       "git-tree": "f5682e9626c47a26f37e7578c3df847ddc3fe11c",
       "version-semver": "3.9.3",