[angle] Update to chromium/4472 (#18432)

* [angle] Update to chromium/4472 * Run x-add-version angle
microsoft · Jul 20, 2021 · 1c20782 · 1c20782
1 parent 0e1dc12
commit 1c20782
Show file tree

Hide file tree

Showing 8 changed files with 381 additions and 84 deletions.
diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
diff --git a/ports/angle/commit.h → ports/angle/angle_commit.h b/ports/angle/commit.h → ports/angle/angle_commit.h
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
@@ -18,17 +18,39 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/angle
-    REF d949154da428bb3e924e28a8eadfe2327631c8bb # chromium/4148
-    SHA512 3ef1c94fccfca592057652e0ad305e3025184675e2323a714428ec934048496fbd242b5e1298bb5e3b3058b53d54f6889e446cbd81af7bea2cc6d5e13c7356bd
+    REF d15be77864e18f407c317be6f6bc06ee2b7d070a # chromium/4472
+    SHA512 aad8563ee65458a7865ec7c668d1f90ac2891583c569a22dcd2c557263b72b26386f56b74a7294398be2cf5c548df513159e4be53f3f096f19819ca06227d9ac
     # On update check headers against opengl-registry
     PATCHES
         001-fix-uwp.patch
         002-fix-builder-error.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH}/src/common)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common)
+
+function(checkout_in_path_with_patches PATH URL REF PATCHES)
+    if(EXISTS "${PATH}")
+        return()
+    endif()
+
+    vcpkg_from_git(
+        OUT_SOURCE_PATH DEP_SOURCE_PATH
+        URL "${URL}"
+        REF "${REF}"
+        PATCHES ${PATCHES}
+    )
+    file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
+    file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
+endfunction()
+
+checkout_in_path_with_patches(
+    "${SOURCE_PATH}/third_party/zlib"
+    "https://chromium.googlesource.com/chromium/src/third_party/zlib"
+    "09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e"
+    "third-party-zlib-far-undef.patch"
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}

diff --git a/ports/angle/third-party-zlib-far-undef.patch b/ports/angle/third-party-zlib-far-undef.patch
@@ -0,0 +1,13 @@
+diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h
+--- a/google/compression_utils_portable.h
++++ b/google/compression_utils_portable.h
+@@ -13,6 +13,9 @@
+  * zlib.
+  */
+ #if defined(USE_SYSTEM_ZLIB)
++#    if defined(WIN32) && defined(FAR)
++#        undef FAR
++#    endif
+ #include <zlib.h>
+ /* AOSP build requires relative paths. */
+ #else
diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "angle",
+  "version-string": "chromium_4472",
+  "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."
+  ],
+  "homepage": "https://github.com/google/angle",
+  "dependencies": [
+    "egl-registry",
+    "opengl-registry",
+    "zlib"
+  ]
+}
diff --git a/versions/a-/angle.json b/versions/a-/angle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5bd610babb6f0fb15119aa94644494c0dc2bcd2c",
+      "version-string": "chromium_4472",
+      "port-version": 0
+    },
     {
       "git-tree": "48342ccfb3565a61cc9ed878a2ff422e294b4e56",
       "version-string": "2020-05-15",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -77,8 +77,8 @@
       "port-version": 0
     },
     "angle": {
-      "baseline": "2020-05-15",
-      "port-version": 2
+      "baseline": "chromium_4472",
+      "port-version": 0
     },
     "antlr4": {
       "baseline": "4.9.1",