Meta: Patch angle vcpkg to build on Windows

Author: https://github.com/ayeteadoe
Commit: 8ef7df2a95
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5240
Reviewed-by: https://github.com/ADKaster ✅

Libraries/LibWeb/CMakeLists.txt

@@ -2,9 +2,7 @@ include(libweb_generators)
 include(vulkan)
 include(skia)
 
-if (APPLE OR LINUX)
+find_package(unofficial-angle REQUIRED CONFIG)
-    find_package(unofficial-angle REQUIRED CONFIG)
-endif()
 
 set(SOURCES
     Animations/Animatable.cpp
@@ -1014,13 +1012,7 @@ set(GENERATED_SOURCES
 
 serenity_lib(LibWeb web)
 
-target_link_libraries(LibWeb PRIVATE LibCore LibCompress LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests LibGC LibThreading skia)
+target_link_libraries(LibWeb PRIVATE LibCore LibCompress LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests LibGC LibThreading skia unofficial::angle::libEGL unofficial::angle::libGLESv2)
-
-if (APPLE OR LINUX)
-    target_link_libraries(LibWeb PRIVATE unofficial::angle::libEGL unofficial::angle::libGLESv2)
-else()
-    target_link_libraries(LibWeb PRIVATE GL)
-endif()
 
 # FIXME: https://github.com/microsoft/vcpkg/issues/42324
 target_include_directories(LibWeb PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)

Meta/CMake/vcpkg/overlay-ports/angle/cmake-buildsystem/PlatformWin.cmake

@@ -9,8 +9,8 @@ list(APPEND ANGLE_DEFINITIONS
 
 # We're targeting Windows 10 which will have DirectX 11
 list(APPEND ANGLE_SOURCES
-    ${_d3d11_backend_sources}
+    ${d3d11_backend_sources}
-    ${_d3d_shared_sources}
+    ${d3d_shared_sources}
 
     ${angle_translator_hlsl_sources}
 
@@ -25,11 +25,12 @@ list(APPEND ANGLE_DEFINITIONS
     "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
 )
 
-list(APPEND ANGLEGLESv2_LIBRARIES dxguid dxgi)
+# https://issues.angleproject.org/issues/345274916
+list(APPEND ANGLEGLESv2_LIBRARIES dxguid dxgi synchronization)
 
 if(NOT angle_is_winuwp) # vcpkg EDIT: Exclude DirectX 9 on UWP
     # DirectX 9 support should be optional but ANGLE will not compile without it
-    list(APPEND ANGLE_SOURCES ${_d3d9_backend_sources})
+    list(APPEND ANGLE_SOURCES ${d3d9_backend_sources})
     list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_D3D9)
     list(APPEND ANGLEGLESv2_LIBRARIES d3d9)
 endif()

Meta/CMake/vcpkg/overlay-ports/angle/portfile.cmake

@@ -156,7 +156,11 @@ function(checkout_in_path PATH URL REF)
         URL "${URL}"
         REF "${REF}"
     )
-    file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
+    if (WIN32)
+        file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${PATH}")
+    else()
+        file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
+    endif()
     file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
 endfunction()
 

vcpkg.json

@@ -10,7 +10,7 @@
     },
     {
       "name": "angle",
-      "platform": "linux"
+      "platform": "linux | windows"
     },
     {
       "name": "curl",