Skip to content
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

Jump to bottom

[pull] master from microsoft:master #160

Merged
merged 1 commit into from
May 15, 2024
Merged

[pull] master from microsoft:master #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ports/gdal/find-link-libraries.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ index c697484..6e83222 100644
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_OPENJPEG QUIET libopenjp2)
+ pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2)
set(OPENJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
set(OpenJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
endif()
+if(PC_OPENJPEG_FOUND)
+ set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "")
Expand Down
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 @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OSGeo/gdal
REF "v${VERSION}"
SHA512 5b155229225e904b3619628ec27efdd273d9f083c1ee4f6d94041897d5bc9c3133590b70885ad61fc8864da2f334a75cf32bafe7f776c40bbbc3673fe842c986
SHA512 c0825f052b9bf7b961af5a3ce257ec6477f63a38f0e4faf8813ec6d6761c87ab935974e7540511eb2a3ae0d6080a7c12d4c1eb6d284ce8bc6e131768992860fb
HEAD_REF master
PATCHES
find-link-libraries.patch
Expand Down
4 changes: 2 additions & 2 deletions ports/gdal/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gdal",
"version-semver": "3.8.5",
"version-semver": "3.9.0",
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,
Expand Down Expand Up @@ -44,7 +44,7 @@
"aws-ec2-windows": {
"description": "Optimized detection of AWS EC2 Windows hosts",
"dependencies": [
"atlmfc"
"atl"
]
},
"cfitsio": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2957,7 +2957,7 @@
"port-version": 0
},
"gdal": {
"baseline": "3.8.5",
"baseline": "3.9.0",
"port-version": 0
},
"gdcm": {
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": "863d25d334cf98636ca4f4a18cd5c70ba1141eb5",
"version-semver": "3.9.0",
"port-version": 0
},
{
"git-tree": "ea4d3f8cb9ab32d885ac60b974421a604fdbcc87",
"version-semver": "3.8.5",
Expand Down
Loading