[skia] Fix vulkan feature

Use vendored copies of headers and tools, as already done by feature 'dawn'.
Guard vulkan inclusion in vulkanmemoryallocator as would be done in vendored copy.

ports/skia/portfile.cmake

@@ -178,8 +178,17 @@ if("metal" IN_LIST FEATURES)
 endif()
 
 if("vulkan" IN_LIST FEATURES)
+    list(APPEND required_externals
+        vulkan-headers
+        vulkan-tools
+    )
     string(APPEND OPTIONS " skia_use_vulkan=true")
-    file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/vulkanmemoryallocator")
+    file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include")
+    # Cf. third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:25
+    vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include/vk_mem_alloc.h"
+        "#include <vulkan/vulkan.h>"
+        "#ifndef VULKAN_H_\n    #include <vulkan/vulkan.h>\n#endif"
+    )
 endif()
 
 if("direct3d" IN_LIST FEATURES)
@@ -230,6 +239,7 @@ They can be installed on Debian based systems via
     )
 endif()
 
+list(REMOVE_DUPLICATES required_externals)
 get_externals(${required_externals})
 if(EXISTS "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py")
     vcpkg_find_acquire_program(GIT)

ports/skia/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "skia",
   "version": "0.36.0",
-  "port-version": 7,
+  "port-version": 8,
   "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,6 @@
     "vulkan": {
       "description": "Vulkan support for skia",
       "dependencies": [
-        "vulkan",
         "vulkan-memory-allocator"
       ]
     }

versions/baseline.json

@@ -7578,7 +7578,7 @@
     },
     "skia": {
       "baseline": "0.36.0",
-      "port-version": 7
+      "port-version": 8
     },
     "skyr-url": {
       "baseline": "1.13.0",

versions/s-/skia.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "49678515153e01e17bca9a3b2cd0445af43d1ebf",
+      "version": "0.36.0",
+      "port-version": 8
+    },
     {
       "git-tree": "508710af38e0b50675532741bf899ec4c3f20c3b",
       "version": "0.36.0",