Skip to content

Upgrade to vcpkg 2026.04.27 release#1832

Merged
j9liu merged 15 commits into
mainfrom
vcpkg-upgrade
Jun 3, 2026
Merged

Upgrade to vcpkg 2026.04.27 release#1832
j9liu merged 15 commits into
mainfrom
vcpkg-upgrade

Conversation

@kring

@kring kring commented May 7, 2026

Copy link
Copy Markdown
Member

This depends on CesiumGS/cesium-native#1360 so merge that first.

This PR upgrades cesium-unreal's vcpkg dependency stack to the 2026.04.27 release.

Changes

cesium-native submodule

  • Updated the cesium-native submodule to the vcpkg-upgrade branch, which bumps the vcpkg baseline and includes a Windows zlib fix.

abseil overlay port → 20260107.1

  • All Unreal-specific customizations are preserved: C++17 build, inline-namespace rename to avoid ODR violations, suppressed ABSL_LTS_RELEASE_VERSION macros, forced ABSL_OPTION_USE_STD_ORDERING=0 for Android NDK compatibility, and the cord.h NDK r25 fix.
  • Two new upstream patch files (fix-heterogeneous_lookup_testing-target.patch, fix-mingw-dll.patch) are included.

sqlite3 overlay port → 3.53.0

  • The Cesium-specific symbol renaming (sqlite3cesium_sqlite3) is preserved to prevent linker conflicts with Unreal Engine's bundled sqlite3.

blend2d overlay port removed

  • Removed the blend2d overlay port as it is no longer needed.

kring and others added 11 commits May 4, 2026 12:48
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The new vcpkg baseline includes abseil 20260107.1 (up from 20240722.0).
s2geometry now requires absl::byteswap which is present in the new
abseil but was missing from the old version, so this upgrade is
necessary.

All Unreal-specific customizations are preserved and documented in
the portfile.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…nts.

- Change CMAKE_CXX_STANDARD from 14 to 17. Abseil 20260107.1 requires
  C++17 minimum. The original C++14 setting was incorrect - Unreal uses
  C++20, not C++14. C++17 is the right build standard: it avoids C++20
  library dependencies that are missing from Unreal's Android NDK while
  still satisfying abseil's own minimum requirement.
- Restore the cord.h Android NDK r25 fix that was accidentally dropped.
  Even though we build abseil with C++17, Unreal's C++20 build includes
  the installed cord.h header and hits the same issue.
- Update all comments to accurately describe the constraint: Unreal uses
  C++20, but its Android NDK has incomplete C++20 library support.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Synced with the upstream vcpkg port for this version. New features
(dbpage-vtab, snapshot, unicode/ICU) are included. The Cesium-specific
symbol renaming (sqlite3 -> cesium_sqlite3) is preserved to avoid
linker conflicts with Unreal Engine's bundled sqlite3.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…L_CONFIGURE from abseil.

The add-config-include.patch was originally copied from vcpkg 2024.02.14
and had context lines from an older SQLite version. The patch failed to
apply against SQLite 3.53.0 because the surrounding code structure changed
(the old version lacked the '#ifndef SQLITE_AMALGAMATION' guard). Update
the context lines to match 3.53.0, taken directly from the upstream vcpkg
port at 56bb2411.

Also remove DISABLE_PARALLEL_CONFIGURE from the abseil portfile. It was
carried over from the old overlay but the upstream vcpkg port removed it,
and there is no evidence it is needed for Unreal specifically.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- abseil/portfile.cmake: restore upstream MINGW comments that were
  accidentally dropped, add back ${ABSL_TEST_HELPERS_OPTIONS}, match
  upstream line ordering in vcpkg_cmake_configure.
- sqlite3/add-config-include.patch: copy directly from upstream (now
  identical, no reason to differ).
- sqlite3/sqlite3-config.in.cmake: copy directly from upstream (was
  whitespace-only different).
- sqlite3/sqlite3.pc.in: copy directly from upstream (was missing the
  Requires.private line for no reason).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
It looks like it shouldn't be needed anymore.
@j9liu j9liu added this to the June 2026 Release milestone May 7, 2026
@j9liu j9liu removed this from the June 2026 Release milestone May 19, 2026
@j9liu j9liu added this to the July 2026 Release milestone May 29, 2026
@j9liu j9liu self-requested a review June 2, 2026 15:14
@j9liu j9liu merged commit 223a683 into main Jun 3, 2026
45 of 46 checks passed
@j9liu j9liu deleted the vcpkg-upgrade branch June 3, 2026 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants