-
Notifications
You must be signed in to change notification settings - Fork 121
Upgrade to vcpkg 2026.04.27 release #689
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.
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
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f4c9438
Upgrade cesium-native to vcpkg 2026.04.27 release.
kring 6cb88f3
Upgrade cesium-native submodule to latest vcpkg-upgrade branch.
kring e5d4343
Remove blend2d overlay port.
kring 2e4857c
Update abseil overlay port to version 20260107.1.
kring a5825bc
Add sqlite3 overlay port pinned to version 3.51.3.
kring 9637266
Fix abseil UWP build: guard GetWindowsLocalTimeZone for WINAPI_FAMILY…
kring f590ce7
Add s2geometry overlay port to fix Android Clang 12 build failure.
kring 95cdb3a
Update cesium-native.
kring 5bb3412
Merge branch 'main' into vcpkg-upgrade
j9liu 6d0b956
Update to cesium-native main
j9liu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule cesium-native
updated
9 files
12 changes: 12 additions & 0 deletions
12
native~/vcpkg/ports/abseil/fix-heterogeneous_lookup_testing-target.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt | ||
| index 365c6ea..d12e585 100644 | ||
| --- a/absl/container/CMakeLists.txt | ||
| +++ b/absl/container/CMakeLists.txt | ||
| @@ -1119,6 +1119,7 @@ absl_cc_library( | ||
| absl::config | ||
| absl::test_instance_tracker | ||
| GTest::gmock | ||
| + TESTONLY | ||
| ) | ||
|
|
||
| absl_cc_library( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake | ||
| --- a/CMake/AbseilDll.cmake | ||
| +++ b/CMake/AbseilDll.cmake | ||
| @@ -457,12 +457,14 @@ set(ABSL_INTERNAL_DLL_FILES | ||
| "strings/string_view.h" | ||
| ) | ||
|
|
||
| -if(MSVC) | ||
| +if(MSVC OR MINGW) | ||
| list(APPEND ABSL_INTERNAL_DLL_FILES | ||
| "time/internal/cctz/src/time_zone_name_win.cc" | ||
| "time/internal/cctz/src/time_zone_name_win.h" | ||
| ) | ||
| -else() | ||
| +endif() | ||
| + | ||
| +if(NOT MSVC) | ||
| list(APPEND ABSL_INTERNAL_DLL_FILES | ||
| "flags/commandlineflag.cc" | ||
| "flags/commandlineflag.h" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --- a/absl/time/internal/cctz/src/time_zone_lookup.cc | ||
| +++ b/absl/time/internal/cctz/src/time_zone_lookup.cc | ||
| @@ -42,8 +42,12 @@ | ||
| #include "absl/time/internal/cctz/src/time_zone_impl.h" | ||
|
|
||
| #if defined(_WIN32) | ||
| +#include <winapifamily.h> | ||
| +#endif | ||
| + | ||
| +#if defined(_WIN32) && !(defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_APP) | ||
| #include "absl/time/internal/cctz/src/time_zone_name_win.h" | ||
| -#endif // _WIN32 | ||
| +#endif // _WIN32 && !UWP | ||
|
|
||
| namespace absl { | ||
| ABSL_NAMESPACE_BEGIN | ||
| @@ -164,7 +168,7 @@ | ||
| zone = primary_tz.c_str(); | ||
| } | ||
| #endif | ||
| -#if defined(_WIN32) | ||
| +#if defined(_WIN32) && !(defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_APP) | ||
| std::string win32_tz = GetWindowsLocalTimeZone(); | ||
| if (!win32_tz.empty()) { | ||
| zone = win32_tz.c_str(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,6 @@ | ||||||
| { | ||||||
| "name": "abseil", | ||||||
| "version": "20240722.0-cesium-for-unreal", | ||||||
| "version": "20260107.1-cesium-for-unreal", | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NIT: If it's not too much trouble...
Suggested change
|
||||||
| "description": [ | ||||||
| "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", | ||||||
| "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.", | ||||||
|
|
@@ -17,10 +17,6 @@ | |||||
| "name": "vcpkg-cmake-config", | ||||||
| "host": true | ||||||
| } | ||||||
| ], | ||||||
| "features": { | ||||||
| "cxx17": { | ||||||
| "description": "Enable compiler C++17." | ||||||
| } | ||||||
| } | ||||||
| ] | ||||||
| } | ||||||
|
|
||||||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
14 changes: 14 additions & 0 deletions
14
native~/vcpkg/ports/s2geometry/fix-android-clang12-spinlock.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/src/s2/base/spinlock.h b/src/s2/base/spinlock.h | ||
| index c1cdda3..3e1d4a7 100644 | ||
| --- a/src/s2/base/spinlock.h | ||
| +++ b/src/s2/base/spinlock.h | ||
| @@ -47,6 +47,8 @@ class ABSL_LOCKABLE ABSL_ATTRIBUTE_WARN_UNUSED SpinLock { | ||
| }; | ||
|
|
||
| -class [[nodiscard]] ABSL_SCOPED_LOCKABLE SpinLockHolder { | ||
| +// [[nodiscard]] removed: Clang 12 (Android NDK r23) fails to parse the combination of a | ||
| +// C++ standard attribute ([[nodiscard]]) and a GNU attribute (from ABSL_SCOPED_LOCKABLE). | ||
| +class ABSL_SCOPED_LOCKABLE SpinLockHolder { | ||
| public: | ||
| inline explicit SpinLockHolder(SpinLock& l) ABSL_EXCLUSIVE_LOCK_FUNCTION(l) | ||
| : lock_(l) { |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change the text throughout this doc for Unity?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I intentionally made this an exact copy of the overlay port in Cesium for Unreal. If I had it to do over again, I would have put less Unreal-specific stuff in there in the first place. But I think the benefit of keeping the two in sync outweighs the weirdness of the comments. The commit message explains exactly where the overlay came from (a particular commit of cesium-unreal). This is useful because, when I told Copilot to do this update, I told it specifically to look at the commit messages to understand what changed and why so that you know how to incorporate the relevant changes into the new version. That worked really well.