From d5644a46ae1ae8691b011510eea759c41bdb5c1b Mon Sep 17 00:00:00 2001
From: "xiaozhuai, Weihang Ding" <798047000@qq.com>
Date: Wed, 3 May 2023 05:47:47 +0800
Subject: [PATCH] [angle] Fix crash on macos #29622 (#31163)

* [angle] Fix crash on macos #29622

* update version database
---
 ports/angle/cmake-buildsystem/PlatformMac.cmake | 7 ++++++-
 ports/angle/vcpkg.json                          | 2 +-
 versions/a-/angle.json                          | 5 +++++
 versions/baseline.json                          | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/angle/cmake-buildsystem/PlatformMac.cmake b/ports/angle/cmake-buildsystem/PlatformMac.cmake
index c9f0a23275..52c2c08961 100644
--- a/ports/angle/cmake-buildsystem/PlatformMac.cmake
+++ b/ports/angle/cmake-buildsystem/PlatformMac.cmake
@@ -41,8 +41,13 @@ endif()
 
 # OpenGL backend
 if(USE_OPENGL)
+    list(APPEND ANGLE_SOURCES
+        ${angle_translator_glsl_base_sources}
+        ${angle_translator_glsl_sources}
+        ${angle_translator_apple_sources}
+    )
     # Enable GLSL compiler output.
-    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL)
+    list(APPEND ANGLE_DEFINITIONS ANGLE_ENABLE_GLSL ANGLE_ENABLE_GL_DESKTOP_BACKEND ANGLE_ENABLE_APPLE_WORKAROUNDS)
 endif()
 
 if(USE_ANGLE_EGL OR ENABLE_WEBGL)
diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
index 1058ec6040..d63a12f202 100644
--- a/ports/angle/vcpkg.json
+++ b/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 1,
+  "port-version": 2,
   "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 f5f1544a2e..2a5e5e0ff2 100644
--- a/versions/a-/angle.json
+++ b/versions/a-/angle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "784aa16c1dacc9aedb49de3bd1393bb6ef6b853d",
+      "version-string": "chromium_5414",
+      "port-version": 2
+    },
     {
       "git-tree": "b9840e4a2d643b94dc27bf1adc2803f16501cadd",
       "version-string": "chromium_5414",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6da4cc75d6..2d32a91128 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -118,7 +118,7 @@
     },
     "angle": {
       "baseline": "chromium_5414",
-      "port-version": 1
+      "port-version": 2
     },
     "annoy": {
       "baseline": "1.17.2",