diff --git a/ports/skia/disable-dev-test.patch b/ports/skia/disable-dev-test.patch deleted file mode 100644 index 9eb1be33d7..0000000000 --- a/ports/skia/disable-dev-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/BUILD.gn b/BUILD.gn -index 3691123..8682b8e 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -97,7 +97,7 @@ config("skia_private") { - if (is_skia_dev_build && !is_wasm) { - defines += [ - "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1", -- "GR_TEST_UTILS=1", -+ "GR_TEST_UTILS=0", - ] - if (skia_enable_graphite) { - defines += [ "GRAPHITE_TEST_UTILS=1" ] diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index c64ea06cdf..9d8bf5221e 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -3,11 +3,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/skia - REF "1c8089adffdabe3790cc4ca4fb36e24c2f6ab792" - SHA512 ef7c278802145215408646d564fd6b398c68a9c0ae7fb937e1517ac152fdf25a262896c78025b96a19ad965904ade37bc3de2de6f8255573301ca86e1271a022 + REF "501e9efaa2fc929ec67c44da6dbaf9335264b559" + SHA512 978af9894d23d7b97d95d402bbf6c0c1401d63990361aae80166b620b0aa06d9dc2c75537850ff4c2df539735b4a12713cb29840613a15cbbff68590c48c4fac PATCHES disable-msvc-env-setup.patch - disable-dev-test.patch + # disable-dev-test.patch skia-include-string.patch bentleyottmann-build.patch graphite.patch @@ -32,7 +32,7 @@ declare_external_from_git(d3d12allocator ) declare_external_from_git(dawn URL "https://dawn.googlesource.com/dawn.git" - REF "51d873f3e0d0e0dcc5c3a6b56019983a5a4cd155" + REF "db1fa936ad0a58846f179c81cdf60f55267099b9" LICENSE_FILE LICENSE ) declare_external_from_git(dng_sdk @@ -62,12 +62,12 @@ declare_external_from_git(spirv-cross ) declare_external_from_git(spirv-headers URL "https://github.com/KhronosGroup/SPIRV-Headers.git" - REF "eb49bb7b1136298b77945c52b4bbbc433f7885de" + REF "1b75a4ae0b4289014b4c369301dc925c366f78a6" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-tools URL "https://github.com/KhronosGroup/SPIRV-Tools.git" - REF "ce46482db7ab3ea9c52fce832d27ca40b14f8e87" + REF "87fcbaf1bc8346469e178711eff27cfd20aa1960" LICENSE_FILE LICENSE ) declare_external_from_git(wuffs diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index a52b473171..1e7cc8c6ef 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "skia", - "version": "127", + "version": "129", "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 9bc2a1f77b..fac53d153d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8313,7 +8313,7 @@ "port-version": 0 }, "skia": { - "baseline": "127", + "baseline": "129", "port-version": 0 }, "skyr-url": { diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 61855430da..c45d4b59bb 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76a242d24e0e810ad8c78e3deaef69d4b634e8fc", + "version": "129", + "port-version": 0 + }, { "git-tree": "c42e7903a61a76804479fe37f25899a58b5622e7", "version": "127",