From 2e1caaee2dd0d06b100ae751b6bf309ea95a13b1 Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Mon, 12 Jan 2026 18:22:11 +0900 Subject: [PATCH] [eastl] update to 3.27.1 While eastl uses a leading 0 for minor versions, we drop the leading 0. --- ports/eabase/portfile.cmake | 4 ++-- ports/eabase/vcpkg.json | 3 ++- ports/eastl/0001-fix-cmake-install.patch | 2 +- ports/eastl/portfile.cmake | 7 +++++-- ports/eastl/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/e-/eabase.json | 5 +++++ versions/e-/eastl.json | 5 +++++ 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ports/eabase/portfile.cmake b/ports/eabase/portfile.cmake index 21c520f538f418..c8e4c00fa36ebd 100644 --- a/ports/eabase/portfile.cmake +++ b/ports/eabase/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EABase - REF 123363eb82e132c0181ac53e43226d8ee76dea12 - SHA512 8df5279d1b303047e832b8b0ddb6cdf51cca753efaeb2a36f7fa5ebc015c2f37cc6a68184b919deb45f09dfd89f9f8f79f18c487817d231f1b049102ceae610f + REF 0699a15efdfd20b6cecf02153bfa5663decb653c + SHA512 6852fcef08002c503d7ca23a22ef25d4b3136787c505d9b7ad55e821a6369d1dcc1773ff8042d7a9c306a52f33dd8da35b2f3fdbd8ea0ff1ca0f765fbe7ac240 HEAD_REF master PATCHES fix_cmake_install.patch diff --git a/ports/eabase/vcpkg.json b/ports/eabase/vcpkg.json index f4af37e6aa84bc..4674c5465af648 100644 --- a/ports/eabase/vcpkg.json +++ b/ports/eabase/vcpkg.json @@ -1,8 +1,9 @@ { "name": "eabase", - "version-date": "2024-08-18", + "version-date": "2025-08-01", "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.", "homepage": "https://github.com/electronicarts/EABase", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/eastl/0001-fix-cmake-install.patch b/ports/eastl/0001-fix-cmake-install.patch index 263fce32b8a102..3bc4edc2253fc1 100644 --- a/ports/eastl/0001-fix-cmake-install.patch +++ b/ports/eastl/0001-fix-cmake-install.patch @@ -37,7 +37,7 @@ index a5870f8..1553513 100644 -FetchContent_Declare( - EABase - GIT_REPOSITORY https://github.com/electronicarts/EABase.git -- GIT_TAG 123363eb82e132c0181ac53e43226d8ee76dea12 +- GIT_TAG 0699a15efdfd20b6cecf02153bfa5663decb653c - GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase. + +target_link_libraries(EASTL PUBLIC EABase) diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 1d4919fb8f6f9a..1d563d889c1644 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -1,10 +1,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +# EASTL uses leading zeros in tags (e.g., 3.27.01), but vcpkg drops them in versions +string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$" "\\1.\\2.0\\3" EASTL_REF "${VERSION}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF "${VERSION}" - SHA512 b061660b58aea8944b7b1488bbf344d004a93a06c89fa43881a02cdaf9d0fce5db3db3c5efd9c09e3e000b502c5dc197ab57b298d1bc935fc7603d285f8563db + REF "${EASTL_REF}" + SHA512 08ac403fceb032cc8622e3f15eef0b00246b8abb2daceb8fabd66d23408c738e82126a4b5187201ec7f6606df46cca1fcda1ec646cfe18ec8e9e081a057101e3 HEAD_REF master PATCHES 0001-fix-cmake-install.patch diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index 2ca0a4a87f4a2a..42a6520630a872 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "eastl", - "version": "3.21.23", + "version": "3.27.1", "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 58f30602e0c655..39abd17c4d6ce9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2625,7 +2625,7 @@ "port-version": 0 }, "eabase": { - "baseline": "2024-08-18", + "baseline": "2025-08-01", "port-version": 0 }, "earcut-hpp": { @@ -2633,7 +2633,7 @@ "port-version": 0 }, "eastl": { - "baseline": "3.21.23", + "baseline": "3.27.1", "port-version": 0 }, "easycl": { diff --git a/versions/e-/eabase.json b/versions/e-/eabase.json index c18c9075394f9a..003cbb1e6ede6f 100644 --- a/versions/e-/eabase.json +++ b/versions/e-/eabase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1efd9d29b604be799cd16293cad542689c44a6fb", + "version-date": "2025-08-01", + "port-version": 0 + }, { "git-tree": "414a2b49e81c82eefcd778b01c1dc66ade9ad4fc", "version-date": "2024-08-18", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index b91ae25f25fd8b..2c933bb9250146 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7286404f816e9615ccb0b595180bda6b0111fa3", + "version": "3.27.1", + "port-version": 0 + }, { "git-tree": "608dd9b821938172ad3c17c982e0883f8f6a8287", "version": "3.21.23",