From 873263a7c0d7cde9dd36f32c29990899d34d0d6c Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 6 Feb 2023 20:53:39 +0100
Subject: [PATCH] [skia] Fix vulkan (#29448)

* [skia] Fix vulkan

* Use vulkan-memory-allocator
---
 ports/skia/portfile.cmake | 3 ++-
 ports/skia/vcpkg.json     | 5 +++--
 versions/baseline.json    | 2 +-
 versions/s-/skia.json     | 5 +++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake
index 22f312609ba..1d6c0adb071 100644
--- a/ports/skia/portfile.cmake
+++ b/ports/skia/portfile.cmake
@@ -178,7 +178,8 @@ if("metal" IN_LIST FEATURES)
 endif()
 
 if("vulkan" IN_LIST FEATURES)
-    string(APPEND OPTIONS "${OPTIONS} skia_use_vulkan=true")
+    string(APPEND OPTIONS " skia_use_vulkan=true")
+    file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/vulkanmemoryallocator")
 endif()
 
 if("direct3d" IN_LIST FEATURES)
diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json
index 39c3867cfde..83703ad499d 100644
--- a/ports/skia/vcpkg.json
+++ b/ports/skia/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "skia",
   "version": "0.36.0",
-  "port-version": 6,
+  "port-version": 7,
   "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.",
@@ -136,7 +136,8 @@
     "vulkan": {
       "description": "Vulkan support for skia",
       "dependencies": [
-        "vulkan"
+        "vulkan",
+        "vulkan-memory-allocator"
       ]
     }
   }
diff --git a/versions/baseline.json b/versions/baseline.json
index a70c923fbe7..ff25ec75f03 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7170,7 +7170,7 @@
     },
     "skia": {
       "baseline": "0.36.0",
-      "port-version": 6
+      "port-version": 7
     },
     "skyr-url": {
       "baseline": "1.13.0",
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 508ce7ff36b..886fade1038 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "508710af38e0b50675532741bf899ec4c3f20c3b",
+      "version": "0.36.0",
+      "port-version": 7
+    },
     {
       "git-tree": "0458cf18e0a28b607b8d3a2ca9fba56395d5f147",
       "version": "0.36.0",