Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[skia] update to 126 #38856

Closed
wants to merge 1 commit into from
Closed

[skia] update to 126 #38856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/skia/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/skia
REF "e7bf161ff959268a2a2f37530a6ea61c27019d33"
SHA512 9cb0c39c6721c5e27a24bee97c93925b7b1f4dd774c08520384ccdf736ab5097e49692529a9fe46f50ae799e6aa9f3e8d7ec43cf9177914fcd6f6f01b76a52c4
REF "69980ce8d04144b41adbc5cc194f29adbc12ceaa"
SHA512 9687230628483887a99deed66b3b680f0a39eddc707e0abadf249de8af15bdc72d5778437c7f70a641c3e20909ee026d4eef44e0456573438aae00102c73fbf4
PATCHES
disable-msvc-env-setup.patch
disable-dev-test.patch
Expand All @@ -31,7 +31,7 @@ declare_external_from_git(d3d12allocator
)
declare_external_from_git(dawn
URL "https://dawn.googlesource.com/dawn.git"
REF "bac513d0ae286600ea0f75a75223a5b52a198b9b"
REF "1b2d3eb175fdf83e21e21b6167a34225a03d2bc2"
LICENSE_FILE LICENSE
)
declare_external_from_git(dng_sdk
Expand Down Expand Up @@ -61,12 +61,12 @@ declare_external_from_git(spirv-cross
)
declare_external_from_git(spirv-headers
URL "https://github.com/KhronosGroup/SPIRV-Headers.git"
REF "8b246ff75c6615ba4532fe4fde20f1be090c3764"
REF "49a1fceb9b1d087f3c25ad5ec077bb0e46231297"
LICENSE_FILE LICENSE
)
declare_external_from_git(spirv-tools
URL "https://github.com/KhronosGroup/SPIRV-Tools.git"
REF "f20663ca7fec48fdc88e4c4d7c5889f8b4cc5664"
REF "199038f10cbe56bf7cbfeb5472eb0a25af2f09f5"
LICENSE_FILE LICENSE
)
declare_external_from_git(wuffs
Expand Down
2 changes: 1 addition & 1 deletion ports/skia/skia-functions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function(third_party_from_vcpkg gn_group)
set(defines "")
set(include_dirs "${CURRENT_INSTALLED_DIR}/include")
set(libdirs_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/lib/debug")
set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
set(ldflags "")
foreach(config IN ITEMS DEBUG RELEASE)
set(lib_dirs "${libdirs_${config}}")
Expand Down
2 changes: 1 addition & 1 deletion ports/skia/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "skia",
"version": "124",
"version": "126",
"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.",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8169,7 +8169,7 @@
"port-version": 0
},
"skia": {
"baseline": "124",
"baseline": "126",
"port-version": 0
},
"skyr-url": {
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/skia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dba87ac34ccaa5ef418253282b1dfe9d1c5df501",
"version": "126",
"port-version": 0
},
{
"git-tree": "b993a94ad57f5f651ac7dfa08cf20f17134a1b0d",
"version": "124",
Expand Down