diff --git a/Meta/CMake/vcpkg/overlay-ports/angle/cmake-buildsystem/CMakeLists.txt b/Meta/CMake/vcpkg/overlay-ports/angle/cmake-buildsystem/CMakeLists.txt index e9491301210..e370a503ee2 100644 --- a/Meta/CMake/vcpkg/overlay-ports/angle/cmake-buildsystem/CMakeLists.txt +++ b/Meta/CMake/vcpkg/overlay-ports/angle/cmake-buildsystem/CMakeLists.txt @@ -261,6 +261,7 @@ if (USE_ANGLE_EGL OR ENABLE_WEBGL) target_compile_definitions(ANGLEFramework INTERFACE ${gl_prototypes}) add_library(GLESv2 ${GLESv2_LIBRARY_TYPE} + ${libglesv2_entry_point_sources} ${libglesv2_sources} ) target_include_directories(GLESv2 PRIVATE ${ANGLE_PRIVATE_INCLUDE_DIRECTORIES}) diff --git a/Meta/CMake/vcpkg/overlay-ports/angle/portfile.cmake b/Meta/CMake/vcpkg/overlay-ports/angle/portfile.cmake index 14d9f8ff498..6fe67642958 100644 --- a/Meta/CMake/vcpkg/overlay-ports/angle/portfile.cmake +++ b/Meta/CMake/vcpkg/overlay-ports/angle/portfile.cmake @@ -35,11 +35,11 @@ if ("metal" IN_LIST FEATURES) set(USE_METAL ON) endif() -# chromium/7067 -set(ANGLE_COMMIT 48103cb2f2b292cb50cc5a29546b358b2e47fd29) -set(ANGLE_VERSION 7085) -set(ANGLE_SHA512 d3ff7fdef0989bfebb660a2935fa5ec7788e67d59ebecca475ba3c9b1e6ea84e77e8d0130ff6d8457ae4f24885d572b8ac0d44d599ed25fbd38c0f4749c6fe82) -set(ANGLE_THIRDPARTY_ZLIB_COMMIT 788cb3c270e8700b425c7bdca1f9ce6b0c1400a9) +# chromium/7258 +set(ANGLE_COMMIT 79ac1a8cd767a32cce6401203e20c4bd4ca4d539) +set(ANGLE_VERSION 7258) +set(ANGLE_SHA512 a3d5d09460f05f1f1c081411bf15f585bb8add5f3db7c4854dc2cf2ef1fd22dd5b2dd5d3de78bfb8bcdae8459dd9581f7dce331acd34053c87c84cfe6c3d134c) +set(ANGLE_THIRDPARTY_ZLIB_COMMIT 4028ebf8710ee39d2286cb0f847f9b95c59f84d8) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -70,13 +70,13 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/ANGLEShaderProgramVersion.h.in" "${SOU file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-angle-config.cmake" DESTINATION "${SOURCE_PATH}") -set(ANGLE_WEBKIT_BUILDSYSTEM_COMMIT "624839dfc8c8b65c9ac45252fb1121ded39e3366") +set(ANGLE_WEBKIT_BUILDSYSTEM_COMMIT "0742522b24152262b04913242cb0b3c48de92ba0") # Download WebKit gni-to-cmake.py conversion script vcpkg_download_distfile(GNI_TO_CMAKE_PY URLS "https://github.com/WebKit/WebKit/raw/${ANGLE_WEBKIT_BUILDSYSTEM_COMMIT}/Source/ThirdParty/ANGLE/gni-to-cmake.py" FILENAME "gni-to-cmake.py" - SHA512 51ca45d4d2384d641b6672cb7cdfac200c58889b4b4cb83f1b04c1a0a2c9ab8b68f1c90d77763983684bcde674b073cfd85cfc160285332c0414d8ec6397601b + SHA512 cf9dab1b59cd44b9ce05a2dc4636115e770dfe7d5cfbd90c3fef659628ac8155c57b866480f7cfe9a0afeb31ff5ce5eed74473f386120a7fc5910e8b032bd61d ) # Generate CMake files from GN / GNI files @@ -126,7 +126,7 @@ configure_file("${WK_ANGLE_INCLUDE_CMAKELISTS}" "${SOURCE_PATH}/include/CMakeLis vcpkg_download_distfile(WK_ANGLE_CMAKE_WEBKITCOMPILERFLAGS URLS "https://github.com/WebKit/WebKit/raw/${ANGLE_WEBKIT_BUILDSYSTEM_COMMIT}/Source/cmake/WebKitCompilerFlags.cmake" FILENAME "WebKitCompilerFlags.cmake" - SHA512 006173ad9a4138bf546023d6a46b05b834bbd4e94a443655ebf08b90ca722f4cb4a200a33fde8483f69d0b1f883948035db5c8b784c4f21729d1298222f98eba + SHA512 8b281ffcf9209c845a5fdae48a4e05f08ca677c37a7fb00d9270de81bd103160d26e091724ce8df8d428ad604900b5202b221fed5bafffd4bf00025718ef9d8e ) file(COPY "${WK_ANGLE_CMAKE_WEBKITCOMPILERFLAGS}" DESTINATION "${SOURCE_PATH}/cmake") diff --git a/vcpkg.json b/vcpkg.json index 73570334e52..335feb6f0da 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -142,7 +142,7 @@ "overrides": [ { "name": "angle", - "version": "chromium_5414#9" + "version": "chromium_7258#0" }, { "name": "curl",