[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (#16904)

* [osgearth] Re-fix dependency gdal

* [gdal] Add dependency freexl on UNIX

* update version record

* fix patch

* convert to manifest

* update version record

* re-fix

* update version record

* add dependency freexl

* update version record

* Disable freexl

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Don't require freexl on Windows

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Revert osgearth change

* Fix the baseline version

* Fix osgearth baseline version

* [protouf] Automatic set protobuf_MODULE_COMPATIBLE to include the module file

* Set protobuf_MODULE_COMPATIBLE in wrapper

* Re-fix protobuf

* update version record

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>

8 files changed, 62 insertions, 19 deletions

diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
deleted file mode 100644
index 548232fb6..000000000
--- a/ports/gdal/CONTROL
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: gdal
-Version: 3.1.3
-Port-Version: 2
-Homepage: https://gdal.org/
-Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows)
-Supports: !arm
-
-Feature: mysql-libmariadb
-Build-Depends: libmariadb
-Description: Add mysql support using libmariadb
-
-Feature: libspatialite
-Build-Depends: libspatialite
-Description: Create or update SpatiaLite databases using libspatialite
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index c1fca47a8..2f2cae4bb 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -185,7 +185,7 @@ else()
     endif()
     
     set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC})
-    list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR})
+    list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR} --without-freexl)
     list(APPEND CONF_OPTS --without-jasper)
     
     vcpkg_configure_make(
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
new file mode 100644
index 000000000..f04c03562
--- /dev/null
+++ b/ports/gdal/vcpkg.json
@@ -0,0 +1,43 @@
+{
+  "name": "gdal",
+  "version-string": "3.1.3",
+  "port-version": 3,
+  "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.",
+  "homepage": "hhttps://gdal.org/",
+  "dependencies": [
+    "cfitsio",
+    "curl",
+    "expat",
+    "geos",
+    "hdf5",
+    {
+      "name": "json-c",
+      "platform": "!windows"
+    },
+    "libgeotiff",
+    "liblzma",
+    "libpng",
+    "libpq",
+    "libwebp",
+    "libxml2",
+    "netcdf-c",
+    "openjpeg",
+    "proj4",
+    "sqlite3",
+    "zlib"
+  ],
+  "features": {
+    "libspatialite": {
+      "description": "Create or update SpatiaLite databases using libspatialite",
+      "dependencies": [
+        "libspatialite"
+      ]
+    },
+    "mysql-libmariadb": {
+      "description": "Add mysql support using libmariadb",
+      "dependencies": [
+        "libmariadb"
+      ]
+    }
+  }
+}
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index 1104b9c06..174b9617e 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -83,6 +83,11 @@ else()
     file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
 endif()
 
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake
+    "if(protobuf_MODULE_COMPATIBLE)"
+    "if(ON)"
+)
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
     protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 9d38c89fd..a33f12a64 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "protobuf",
   "version-string": "3.14.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 45c19c289..29437abc7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2134,7 +2134,7 @@
     },
     "gdal": {
       "baseline": "3.1.3",
-      "port-version": 2
+      "port-version": 3
     },
     "gdcm": {
       "baseline": "3.0.7",
@@ -4798,7 +4798,7 @@
     },
     "protobuf": {
       "baseline": "3.14.0",
-      "port-version": 2
+      "port-version": 3
     },
     "protobuf-c": {
       "baseline": "1.3.2-2",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index 8ed4f6349..ec66103c0 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "548d5f5f1ad969bf88d86c17de3ee40ebb096a2f",
+      "version-string": "3.1.3",
+      "port-version": 3
+    },
+    {
       "git-tree": "162ae61cb64d9bb9a485e611cca106ade9062c1a",
       "version-string": "3.1.3",
       "port-version": 2
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 644b505a2..20c3397f5 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9f8c80db7cf8a925199facba3ba0c6c8436c41c8",
+      "version-string": "3.14.0",
+      "port-version": 3
+    },
+    {
       "git-tree": "7dcdfe30568d5d0cde6564984e0488ec2c33d9dc",
       "version-string": "3.14.0",
       "port-version": 2