From dff78ec7cb417d4762d8c021503167ddc8a2c372 Mon Sep 17 00:00:00 2001 From: Super Zheng Date: Fri, 9 Aug 2024 12:47:30 +0800 Subject: [PATCH] [angle] Fix missing `DetectSSE2.cmake` on x86 builds (#40322) --- ports/angle/portfile.cmake | 7 +++++++ ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index ac34ff91bf..01c1d7166b 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -117,6 +117,13 @@ vcpkg_download_distfile(WK_ANGLE_CMAKE_WEBKITCOMPILERFLAGS ) file(COPY "${WK_ANGLE_CMAKE_WEBKITCOMPILERFLAGS}" DESTINATION "${SOURCE_PATH}/cmake") +vcpkg_download_distfile(WK_ANGLE_CMAKE_DETECTSSE2 + URLS "https://github.com/WebKit/WebKit/raw/${ANGLE_WEBKIT_BUILDSYSTEM_COMMIT}/Source/cmake/DetectSSE2.cmake" + FILENAME "DetectSSE2.cmake" + SHA512 219a4c8591ee31d11eb3d1e4803cc3c9d4573984bb25ecac6f2c76e6a3dab598c00b0157d0f94b18016de6786e49d8b29a161693a5ce23d761c8fe6a798c1bca +) +file(COPY "${WK_ANGLE_CMAKE_DETECTSSE2}" DESTINATION "${SOURCE_PATH}/cmake") + vcpkg_download_distfile(WK_ANGLE_CMAKE_WEBKITMACROS URLS "https://github.com/WebKit/WebKit/raw/${ANGLE_WEBKIT_BUILDSYSTEM_COMMIT}/Source/cmake/WebKitMacros.cmake" FILENAME "WebKitMacros.cmake" diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 6f0de0743e..a42d9356b2 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_5414", - "port-version": 8, + "port-version": 9, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 2443c3bd47..dad20a27bc 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0e6049d392ece97ba5be00c7c3e4410aa78d3f0", + "version-string": "chromium_5414", + "port-version": 9 + }, { "git-tree": "1729007831807f980abc75357ab0e73f0f9216cf", "version-string": "chromium_5414", diff --git a/versions/baseline.json b/versions/baseline.json index e0c0d05120..818306c6a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -130,7 +130,7 @@ }, "angle": { "baseline": "chromium_5414", - "port-version": 8 + "port-version": 9 }, "ankurvdev-embedresource": { "baseline": "0.0.11",