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

vcpkg: update #820

Merged
merged 3 commits into from
Apr 23, 2023
Merged

vcpkg: update #820

merged 3 commits into from
Apr 23, 2023

Conversation

rcoup
Copy link
Member

@rcoup rcoup commented Apr 15, 2023 •
edited
Loading

Description

Upgrade VCPKG to https://github.com/koordinates/vcpkg/tree/kx-20230421 (was kx-20230415)

Our remaining patches on vcpkg are:

  • PatchELF: v0.14.5 → v0.17.2
  • OpenSSL: enable "legacy" to support Python; disable modules
  • (new) Proj: fix for dynamic builds on Windows, where sqlite3 causes an error during proj.db builds

Brings in (direct dependencies):

  • Newer GDAL (v3.6.2→v3.6.3)
  • Newer OpenSSL (v3.0.7→v3.1.0)
  • Newer Curl (v7.86.0→v8.0.1)
  • Newer Proj (v9.1.1→v9.2.0)
  • Newer LibPQ (v14.4→v15.2)
  • Newer SQLite (v3.40.0→v3.40.1)

Related links:

Checklist:

  • Have you reviewed your own change?
  • Have you included test(s)?
  • Have you updated the changelog?

@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 23afda8 to a71d610 Compare April 15, 2023 22:22
@craigds
Copy link
Member

craigds commented Apr 16, 2023

FWIW this fixes my local build issues on Apple Silicon 👍

@craigds
Copy link
Member

craigds commented Apr 17, 2023

This is marked as Draft but CI is passing as well as it did before, and it fixes issues for devs on Apple Silicon (me, @fedch ) - can we just merge it?

@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from a71d610 to 28bdfd5 Compare April 18, 2023 11:31
@olsen232 olsen232 mentioned this pull request Apr 21, 2023
Closed
@rcoup rcoup linked an issue Apr 21, 2023 that may be closed by this pull request
Windows build broken: libproj #825
Closed
@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 28bdfd5 to 005179d Compare April 21, 2023 23:02
@rcoup
Copy link
Member Author

rcoup commented Apr 21, 2023

Also fixed a spatialite issue, was my mistake during backporting and managed to drop mod_spatialite creation

@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 7377196 to 639d385 Compare April 23, 2023 20:44
@rcoup rcoup marked this pull request as ready for review April 23, 2023 20:45
@rcoup rcoup requested a review from olsen232 April 23, 2023 20:45
@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 639d385 to 72909d7 Compare April 23, 2023 20:54
@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 9d03a8c to 3f90c53 Compare April 23, 2023 21:37
rcoup added 3 commits April 23, 2023 23:06
@rcoup
vcpkg: update
0dc6b6f 
* https://github.com/koordinates/vcpkg/tree/kx-20230421
* fix_vendor_libs: add newly used (libpq) system lib wldap32.dll
* proj: fix windows build issue
@rcoup
ci: drop Debian oldoldstable (stretch)
e9bf5ff 
Archives are unavailable upstream
@rcoup
xfail raster test on windows
b59dc75
@rcoup rcoup force-pushed the rc-vcpkg-upgrade-20230415 branch from 3f90c53 to b59dc75 Compare April 23, 2023 22:07
@rcoup rcoup merged commit 02c6646 into master Apr 23, 2023
@rcoup rcoup deleted the rc-vcpkg-upgrade-20230415 branch April 23, 2023 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olsen232 olsen232 olsen232 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Windows build broken: libproj
3 participants
@rcoup @craigds @olsen232