[skia] Update version to 0.38.2 (#34787)

* [skia] Update version to 0.38.2

* version

* add dep wuffs

* version

* add support x86 MSVC build

* version

ports/skia/core-opengl32.patch

@@ -1,14 +1,15 @@
 diff --git a/BUILD.gn b/BUILD.gn
-index 71d19dd..3691123 100644
+index 577dd00..07f9882 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -1393,6 +1393,9 @@ skia_component("skia") {
- 
-   defines = [ "SK_HAS_ANDROID_CODEC" ]
+@@ -1478,6 +1478,10 @@ skia_component("skia") {
+   defines = []
    libs = []
+ 
 +  if (is_win && target_cpu != "arm64" && !skia_enable_winuwp) {
 +    libs += [ "OpenGL32.lib" ] # for src/utils/win/SkWGL_win.cpp
 +  }
- 
++
    if (skia_enable_sksl) {
-     deps += [ ":dehydrate_sksl" ]
+     deps += [ ":minify_sksl" ]
+     sources += skia_sksl_sources

ports/skia/disable-msvc-env-setup.patch

@@ -1,12 +0,0 @@
-diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
-index ba85c3d..901ba99 100644
---- a/gn/toolchain/BUILD.gn
-+++ b/gn/toolchain/BUILD.gn
-@@ -94,6 +94,7 @@ toolchain("msvc") {
-     # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory.
-     env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "
-   }
-+  env_setup = "" # overwrite
- 
-   cl_m32_flag = ""
- 

ports/skia/portfile.cmake

@@ -1,14 +1,15 @@
 include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake")
 
-vcpkg_from_git(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL https://github.com/google/skia
-    REF f86f242886692a18f5adc1cf9cbd6740cd0870fd
+    REPO google/skia
+    REF "canvaskit/${VERSION}"
+    SHA512 4672cfef8c92f37418e27df30a4e3fd6f7ca6273521e9d6b7755d9285800ad1ea6eff66639a17f591e6921ec8b78aa828500399a83295f9984ab58ebaff0ec24
     PATCHES
-        disable-msvc-env-setup.patch
         uwp.patch
         core-opengl32.patch
         disable-dev-test.patch
+        support-x86-MSVC-build.patch
 )
 
 # these following aren't available in vcpkg
@@ -83,6 +84,11 @@ declare_external_from_git(vulkan-tools
     REF "d55c7aaf041af331bee8c22fb448a6ff4c797f73"
     LICENSE_FILE LICENSE.txt
 )
+declare_external_from_git(wuffs
+    URL "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+    REF "e3f919ccfe3ef542cfc983a82146070258fb57f8"
+    LICENSE_FILE LICENSE
+)
 
 declare_external_from_pkgconfig(expat)
 declare_external_from_pkgconfig(fontconfig PATH "third_party")
@@ -135,6 +141,7 @@ set(required_externals
     piex
     sfntly
     zlib
+    wuffs
 )
 
 if("fontconfig" IN_LIST FEATURES)

ports/skia/support-x86-MSVC-build.patch

@@ -0,0 +1,13 @@
+diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
+index dcf79cc..599629a 100644
+--- a/gn/toolchain/BUILD.gn
++++ b/gn/toolchain/BUILD.gn
+@@ -89,7 +89,7 @@ toolchain("msvc") {
+   if (target_cpu == "x86") {
+     # Toolchain asset includes a script that configures for x86 building.
+     # We don't support x86 builds with local MSVC installations.
+-    env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && "
++    env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x86\" && "
+   } else if (target_cpu == "arm64") {
+     # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory.
+     env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "

ports/skia/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "skia",
-  "version": "0.36.0",
-  "port-version": 10,
+  "version": "0.38.2",
   "description": [
     "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
     "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",

versions/baseline.json

@@ -7849,8 +7849,8 @@
       "port-version": 0
     },
     "skia": {
-      "baseline": "0.36.0",
-      "port-version": 10
+      "baseline": "0.38.2",
+      "port-version": 0
     },
     "skyr-url": {
       "baseline": "1.13.0",

versions/s-/skia.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a7376b3d299acc253980a36193079fbb42eea1b",
+      "version": "0.38.2",
+      "port-version": 0
+    },
     {
       "git-tree": "df5e0eb3dc6aa8ee9b5829caf01ce7876bc7c2fe",
       "version": "0.36.0",