Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 20 commits into from
Mar 28, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5128ecc
[osgearth] Re-fix dependency gdal
Mar 26, 2021
97a2d92
[gdal] Add dependency freexl on UNIX
Mar 26, 2021
bc5d681
update version record
Mar 26, 2021
e6b07bb
fix patch
Mar 26, 2021
586ddde
convert to manifest
Mar 26, 2021
f761e14
update version record
Mar 26, 2021
85471b8
re-fix
Mar 26, 2021
5997d44
update version record
Mar 26, 2021
7cbe090
add dependency freexl
Mar 26, 2021
c18dd29
update version record
Mar 26, 2021
e488b7d
Disable freexl
vicroms Mar 26, 2021
433bdf1
Don't require freexl on Windows
vicroms Mar 26, 2021
273d8a2
Revert osgearth change
PhoebeHui Mar 26, 2021
43eac3f
Fix the baseline version
PhoebeHui Mar 26, 2021
8492adc
Fix osgearth baseline version
PhoebeHui Mar 26, 2021
5154c78
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Mar 27, 2021
ec22459
[protouf] Automatic set protobuf_MODULE_COMPATIBLE to include the mod…
Mar 27, 2021
bda8095
Set protobuf_MODULE_COMPATIBLE in wrapper
Mar 27, 2021
dfe865c
Re-fix protobuf
Mar 28, 2021
2bfaf71
update version record
Mar 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ports/gdal/CONTROL
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/gdal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
43 changes: 43 additions & 0 deletions ports/gdal/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
}
5 changes: 5 additions & 0 deletions ports/protobuf/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/protobuf/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2134,7 +2134,7 @@
},
"gdal": {
"baseline": "3.1.3",
"port-version": 2
"port-version": 3
},
"gdcm": {
"baseline": "3.0.7",
Expand Down Expand Up @@ -4798,7 +4798,7 @@
},
"protobuf": {
"baseline": "3.14.0",
"port-version": 2
"port-version": 3
},
"protobuf-c": {
"baseline": "1.3.2-2",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gdal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "548d5f5f1ad969bf88d86c17de3ee40ebb096a2f",
"version-string": "3.1.3",
"port-version": 3
},
{
"git-tree": "162ae61cb64d9bb9a485e611cca106ade9062c1a",
"version-string": "3.1.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/protobuf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9f8c80db7cf8a925199facba3ba0c6c8436c41c8",
"version-string": "3.14.0",
"port-version": 3
},
{
"git-tree": "7dcdfe30568d5d0cde6564984e0488ec2c33d9dc",
"version-string": "3.14.0",
Expand Down