From f0570dc4113820df0f3657cf5773403150613332 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <andrewdkaster@gmail.com>
Date: Tue, 15 Oct 2024 21:55:40 -0600
Subject: [PATCH] [skia] Set the win_sdk gn arg to %WindowsSdkDir% on Windows
 (#41486)

---
 ports/skia/portfile.cmake | 2 ++
 ports/skia/vcpkg.json     | 2 +-
 versions/baseline.json    | 2 +-
 versions/s-/skia.json     | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake
index 9afb39554f..9984aa9042 100644
--- a/ports/skia/portfile.cmake
+++ b/ports/skia/portfile.cmake
@@ -262,7 +262,9 @@ vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")
 if(VCPKG_TARGET_IS_WINDOWS)
     string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}")
+    string(REGEX REPLACE "[\\]\$" "" WIN_SDK "$ENV{WindowsSdkDir}")
     string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"")
+    string(APPEND OPTIONS " win_sdk=\"${WIN_SDK}\"")
 elseif(VCPKG_TARGET_IS_ANDROID)
     string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}")
 else()
diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json
index 41dbca8ca2..349b94a55b 100644
--- a/ports/skia/vcpkg.json
+++ b/ports/skia/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "skia",
   "version": "129",
-  "port-version": 1,
+  "port-version": 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.",
diff --git a/versions/baseline.json b/versions/baseline.json
index e7bdb1401b..b1a87706af 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8362,7 +8362,7 @@
     },
     "skia": {
       "baseline": "129",
-      "port-version": 1
+      "port-version": 2
     },
     "skyr-url": {
       "baseline": "1.13.0",
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 2e7b10bd0b..469be4cb5f 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "942c0f5227b85eb96fad153a7b57c12debb33b4c",
+      "version": "129",
+      "port-version": 2
+    },
     {
       "git-tree": "886519547ba2addf980c4c567bca7f4c4d686d2f",
       "version": "129",