diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index d9d593ddcf..77e22253c6 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -194,7 +194,8 @@ if("vulkan" IN_LIST FEATURES) vulkan-tools ) string(APPEND OPTIONS " skia_use_vulkan=true") - file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include") + find_file(vk_mem_alloc_h "vk_mem_alloc.h" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES "vma" REQUIRED) + file(COPY "${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 " diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 4053b61003..928c840da9 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.38.2", - "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.", @@ -57,7 +57,7 @@ }, { "name": "gl", - "platform": "!uwp" + "platform": "!(windows & arm) & !uwp" }, { "name": "harfbuzz", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 66e4f29c9d..1b4aacf308 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1333,6 +1333,18 @@ vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-skia:arm-neon-android=pass +vcpkg-ci-skia:arm64-android=pass +vcpkg-ci-skia:arm64-uwp=pass +vcpkg-ci-skia:arm64-windows=pass +vcpkg-ci-skia:x64-android=pass +vcpkg-ci-skia:x64-linux=pass +vcpkg-ci-skia:x64-osx=pass +vcpkg-ci-skia:x64-uwp=pass +vcpkg-ci-skia:x64-windows-static-md=pass +vcpkg-ci-skia:x64-windows-static=pass +vcpkg-ci-skia:x64-windows=pass +vcpkg-ci-skia:x86-windows=pass vcpkg-ci-soci:x64-linux=pass vcpkg-ci-soci:x64-osx=pass vcpkg-ci-soci:x64-windows=pass diff --git a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json index 586b3a3a53..54a5c2c64d 100644 --- a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-ci-skia", - "version-date": "2023-11-12", + "version-date": "2023-12-22", "description": "Builds an app in order to validate the skia port.", "license": "BSD-3-Clause", "dependencies": [ @@ -8,6 +8,14 @@ "name": "skia", "default-features": false }, + { + "name": "skia", + "default-features": false, + "features": [ + "vulkan" + ], + "platform": "linux | osx | (windows & !uwp)" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 5b7d100d69..17ea6a9116 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7938,7 +7938,7 @@ }, "skia": { "baseline": "0.38.2", - "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 d8f3ddbfbc..951d085a09 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce919437fcbcbfe2c364757efdc117a286f44fa2", + "version": "0.38.2", + "port-version": 2 + }, { "git-tree": "7363d84372c8a2a6e3c06a7fcc6c1ef1d1b7b97a", "version": "0.38.2",