diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-03-29 04:52:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-28 13:52:48 -0700 |
| commit | 6d9ed568117dd958c543b3ab8d3ed692965cac34 (patch) | |
| tree | 7462c96504e2799716a165d48e554502aff16f8f /versions | |
| parent | 9f6157af4e5b04ab3cc63150a20b1bad901a7d0b (diff) | |
| download | vcpkg-6d9ed568117dd958c543b3ab8d3ed692965cac34.tar.gz vcpkg-6d9ed568117dd958c543b3ab8d3ed692965cac34.zip | |
[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>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/g-/gdal.json | 5 | ||||
| -rw-r--r-- | versions/p-/protobuf.json | 5 |
3 files changed, 12 insertions, 2 deletions
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 |