[skia] Adding support for other graphics APIs by dave-juicelabs · Pull Request #19788 · microsoft/vcpkg

dave-juicelabs · 2021-08-29T12:46:58Z

Updating skia to add support for other APIs other than OpenGL.

What does your PR fix?
Which triplets are supported/not supported? Have you updated the CI baseline?

Unchanged from previous. CI baseline is updated.
Does your PR follow the maintainer guide?

Yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for skia but no changes to version or port version.
-- Version: 2020-05-18#4
-- Old SHA: eea166718304da2660d795937fe2528dbd2909cc
-- New SHA: 34d347e2848208e4e98f1003ad196000f5e66f3e
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 21935b744dc411e0fb1926618fdfb18c67d4b188 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 05090ed..f3ab363 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "1d80dcb05c6608eaf63cfb07380f82c602e2cb56",
+      "git-tree": "eea166718304da2660d795937fe2528dbd2909cc",
       "version-string": "2020-05-18",
       "port-version": 4
     },

JonLiu1993 · 2021-08-30T07:25:13Z

Please run command "./vcpkg x-add-version skia --overwrite-version" then commit the changes again

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 21935b744dc411e0fb1926618fdfb18c67d4b188 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 338b6da..b29b0e0 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,12 +1,12 @@
 {
   "versions": [
     {
-      "git-tree": "34d347e2848208e4e98f1003ad196000f5e66f3e",
+      "git-tree": "a5bb0d8f9e2b9476ab2550831f723398a95a88c3",
       "version-string": "2021-08-30",
       "port-version": 4
     },
     {
-      "git-tree": "1d80dcb05c6608eaf63cfb07380f82c602e2cb56",
+      "git-tree": "eea166718304da2660d795937fe2528dbd2909cc",
       "version-string": "2020-05-18",
       "port-version": 4
     },

ports/skia/CONTROL

JonLiu1993 · 2021-08-31T02:22:04Z

@dave-juicelabs ,Please run command "./vcpkg x-add-version skia --overwrite-version" then commit the changes again

versions/s-/skia.json

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 21935b744dc411e0fb1926618fdfb18c67d4b188 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index cf79f62..a4c32fb 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -6,12 +6,7 @@
       "port-version": 5
     },
     {
-      "git-tree": "bf350ede3bd4cfe0d7de80ab835348414f7313f5",
-      "version-string": "2021-08-30",
-      "port-version": 4
-    },
-    {
-      "git-tree": "1d80dcb05c6608eaf63cfb07380f82c602e2cb56",
+      "git-tree": "eea166718304da2660d795937fe2528dbd2909cc",
       "version-string": "2020-05-18",
       "port-version": 4
     },

versions/s-/skia.json

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout dfcd4e4b30799c4ce02fe3939b62576fec444224 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 608ec44..c20a63d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5961,8 +5961,8 @@
       "port-version": 5
     },
     "skia": {
-      "baseline": "2020-05-18",
-      "port-version": 5
+      "baseline": "2021-08-06",
+      "port-version": 0
     },
     "skyr-url": {
       "baseline": "1.13.0",
diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 9fe32e7..7c7c262 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1b51e424aff1de40a55ee90460c3b1f754844f90",
+      "version-string": "2021-08-06",
+      "port-version": 0
+    },
     {
       "git-tree": "19fcd9cfd0b0a27e87e04bf2d1f8f03c7b1e8ab0",
       "version-string": "2020-05-18",

ports/skia/vcpkg.json

JonLiu1993 · 2021-09-13T06:59:34Z

@dave-juicelabs ,Could you please take a look:

[799/799] link skia.dll skia.dll.lib skia.dll.pdb
FAILED: skia.dll skia.dll.lib skia.dll.pdb 
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/link.exe" /nologo /IMPLIB:./skia.dll.lib /DLL /OUT:./skia.dll /PDB:./skia.dll.pdb @./skia.dll.rsp
   Creating library ./skia.dll.lib and object ./skia.dll.exp
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_blob_create referenced in function "class std::unique_ptr<struct hb_blob_t,struct SkFunctionWrapper<void __cdecl(struct hb_blob_t *),&void __cdecl hb_blob_destroy(struct hb_blob_t *)> > __cdecl to_blob(class sk_sp<class SkData>)" (?to_blob@@YA?AV?$unique_ptr@Uhb_blob_t@@U?$SkFunctionWrapper@$$A6AXPEAUhb_blob_t@@@Z$1?hb_blob_destroy@@YAX0@Z@@@std@@V?$sk_sp@VSkData@@@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_blob_destroy referenced in function "public: __cdecl <lambda_1b826c87cf9bf7a1c0fcf379fd41c482>::operator()(void const *,void *)const " (??R<lambda_1b826c87cf9bf7a1c0fcf379fd41c482>@@QEBA@PEBXPEAX@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_blob_get_data referenced in function "class sk_sp<class SkData> __cdecl to_data(class std::unique_ptr<struct hb_blob_t,struct SkFunctionWrapper<void __cdecl(struct hb_blob_t *),&void __cdecl hb_blob_destroy(struct hb_blob_t *)> >)" (?to_data@@YA?AV?$sk_sp@VSkData@@@@V?$unique_ptr@Uhb_blob_t@@U?$SkFunctionWrapper@$$A6AXPEAUhb_blob_t@@@Z$1?hb_blob_destroy@@YAX0@Z@@@std@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_set_add referenced in function "public: __cdecl <lambda_7aa85c9c4411a3e1c4254e48c2302f10>::operator()(unsigned int)const " (??R<lambda_7aa85c9c4411a3e1c4254e48c2302f10>@@QEBA@I@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_face_create referenced in function "class sk_sp<class SkData> __cdecl subset_harfbuzz(class sk_sp<class SkData>,class SkPDFGlyphUse const &,int)" (?subset_harfbuzz@@YA?AV?$sk_sp@VSkData@@@@V1@AEBVSkPDFGlyphUse@@H@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_face_destroy referenced in function "public: void __cdecl SkFunctionWrapper<void __cdecl(struct hb_face_t *),&void __cdecl hb_face_destroy(struct hb_face_t *)>::operator()<struct hb_face_t * &>(struct hb_face_t * &)const " (??$?RAEAPEAUhb_face_t@@@?$SkFunctionWrapper@$$A6AXPEAUhb_face_t@@@Z$1?hb_face_destroy@@YAX0@Z@@QEBAXAEAPEAUhb_face_t@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_face_reference_blob referenced in function "class sk_sp<class SkData> __cdecl subset_harfbuzz(class sk_sp<class SkData>,class SkPDFGlyphUse const &,int)" (?subset_harfbuzz@@YA?AV?$sk_sp@VSkData@@@@V1@AEBVSkPDFGlyphUse@@H@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset_input_create_or_fail referenced in function "class sk_sp<class SkData> __cdecl subset_harfbuzz(class sk_sp<class SkData>,class SkPDFGlyphUse const &,int)" (?subset_harfbuzz@@YA?AV?$sk_sp@VSkData@@@@V1@AEBVSkPDFGlyphUse@@H@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset_input_destroy referenced in function "public: void __cdecl SkFunctionWrapper<void __cdecl(struct hb_subset_input_t *),&void __cdecl hb_subset_input_destroy(struct hb_subset_input_t *)>::operator()<struct hb_subset_input_t * &>(struct hb_subset_input_t * &)const " (??$?RAEAPEAUhb_subset_input_t@@@?$SkFunctionWrapper@$$A6AXPEAUhb_subset_input_t@@@Z$1?hb_subset_input_destroy@@YAX0@Z@@QEBAXAEAPEAUhb_subset_input_t@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset_input_glyph_set referenced in function "class sk_sp<class SkData> __cdecl subset_harfbuzz(class sk_sp<class SkData>,class SkPDFGlyphUse const &,int)" (?subset_harfbuzz@@YA?AV?$sk_sp@VSkData@@@@V1@AEBVSkPDFGlyphUse@@H@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset_input_set_drop_hints referenced in function "public: static class std::unique_ptr<struct hb_face_t,struct SkFunctionWrapper<void __cdecl(struct hb_face_t *),&void __cdecl hb_face_destroy(struct hb_face_t *)> > __cdecl SkPDFHarfBuzzSubset<struct hb_subset_input_t *,void>::Make(struct hb_subset_input_t *,struct hb_face_t *)" (?Make@?$SkPDFHarfBuzzSubset@PEAUhb_subset_input_t@@X@@SA?AV?$unique_ptr@Uhb_face_t@@U?$SkFunctionWrapper@$$A6AXPEAUhb_face_t@@@Z$1?hb_face_destroy@@YAX0@Z@@@std@@PEAUhb_subset_input_t@@PEAUhb_face_t@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset_input_set_retain_gids referenced in function "public: static class std::unique_ptr<struct hb_face_t,struct SkFunctionWrapper<void __cdecl(struct hb_face_t *),&void __cdecl hb_face_destroy(struct hb_face_t *)> > __cdecl SkPDFHarfBuzzSubset<struct hb_subset_input_t *,void>::Make(struct hb_subset_input_t *,struct hb_face_t *)" (?Make@?$SkPDFHarfBuzzSubset@PEAUhb_subset_input_t@@X@@SA?AV?$unique_ptr@Uhb_face_t@@U?$SkFunctionWrapper@$$A6AXPEAUhb_face_t@@@Z$1?hb_face_destroy@@YAX0@Z@@@std@@PEAUhb_subset_input_t@@PEAUhb_face_t@@@Z)
pdf.SkPDFSubsetFont.obj : error LNK2019: unresolved external symbol hb_subset referenced in function "public: static class std::unique_ptr<struct hb_face_t,struct SkFunctionWrapper<void __cdecl(struct hb_face_t *),&void __cdecl hb_face_destroy(struct hb_face_t *)> > __cdecl SkPDFHarfBuzzSubset<struct hb_subset_input_t *,void>::Make(struct hb_subset_input_t *,struct hb_face_t *)" (?Make@?$SkPDFHarfBuzzSubset@PEAUhb_subset_input_t@@X@@SA?AV?$unique_ptr@Uhb_face_t@@U?$SkFunctionWrapper@$$A6AXPEAUhb_face_t@@@Z$1?hb_face_destroy@@YAX0@Z@@@std@@PEAUhb_subset_input_t@@PEAUhb_face_t@@@Z)
.\skia.dll : fatal error LNK1120: 13 unresolved externals
ninja: build stopped: subcommand failed.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout e0aee0ddcfdab86b4f7d28371f7923fa948599d3 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 7c7c262..14f014f 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "1b51e424aff1de40a55ee90460c3b1f754844f90",
-      "version-string": "2021-08-06",
+      "git-tree": "e2ab5c384ba90b3d76bd4c092536892c76673da0",
+      "version-date": "2021-08-06",
       "port-version": 0
     },
     {

JonLiu1993 · 2021-09-14T02:12:39Z

@damcclos ,It seems that the CI error has not changed from last time，after finish your suggesstion changes,please run command "./vcpkg x-add-version skia --overwrite-version" then commit the changes again

JonLiu1993 · 2021-09-26T09:25:15Z

@dave-juicelabs ，Is this PR being worked on?

dave-juicelabs · 2021-09-27T18:49:35Z

@JonLiu1993 Yes, I will be updating this PR.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout e0aee0ddcfdab86b4f7d28371f7923fa948599d3 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index a02aa90..28e0b86 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -5,11 +5,6 @@
       "version-date": "2021-08-06",
       "port-version": 1
     },
-    {
-      "git-tree": "3759f77a4491b71a367eaf619d6af66d2782678d",
-      "version-string": "2021-08-06",
-      "port-version": 0
-    },
     {
       "git-tree": "19fcd9cfd0b0a27e87e04bf2d1f8f03c7b1e8ab0",
       "version-string": "2020-05-18",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 2a31089e777fc187f1cc05338250b8e1810cfb52 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/s-/skia.json b/versions/s-/skia.json
index 6d64f0b..860bd15 100644
--- a/versions/s-/skia.json
+++ b/versions/s-/skia.json
@@ -5,11 +5,6 @@
       "version-date": "2021-08-06",
       "port-version": 1
     },
-    {
-      "git-tree": "1b51e424aff1de40a55ee90460c3b1f754844f90",
-      "version-string": "2021-08-06",
-      "port-version": 0
-    },
     {
       "git-tree": "19fcd9cfd0b0a27e87e04bf2d1f8f03c7b1e8ab0",
       "version-string": "2020-05-18",

JonLiu1993 · 2022-03-17T02:50:32Z

@dave-juicelabs, Could you please merge the master? I have no permission to push your branch

…ies to vcpkg versions.

JonLiu1993 · 2022-04-02T07:25:42Z

/azp run

azure-pipelines · 2022-04-02T07:25:50Z

Azure Pipelines successfully started running 1 pipeline(s).

JonLiu1993 · 2022-04-21T06:52:00Z

@dave-juicelabs ,Is there any progress on this pr?

JonLiu1993 · 2022-05-07T07:12:25Z

Closing this PR since it seems that no progress is being made. Please reopen if work is still being done.

dave-juicelabs force-pushed the skia-update branch 3 times, most recently from a53a86f to 5f96a43 Compare August 29, 2021 18:44

PhoebeHui assigned JonLiu1993 Aug 30, 2021

JonLiu1993 added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Aug 30, 2021

github-actions bot requested changes Aug 30, 2021

View reviewed changes

JonLiu1993 added requires:all-feature-testing labels Aug 30, 2021

github-actions bot requested changes Aug 31, 2021

View reviewed changes

JonLiu1993 suggested changes Aug 31, 2021

View reviewed changes

ports/skia/CONTROL Outdated Show resolved Hide resolved

JonLiu1993 reviewed Sep 3, 2021

View reviewed changes

versions/s-/skia.json Outdated Show resolved Hide resolved

github-actions bot requested changes Sep 3, 2021

View reviewed changes

JonLiu1993 reviewed Sep 3, 2021

View reviewed changes

versions/s-/skia.json Outdated Show resolved Hide resolved

dave-juicelabs force-pushed the skia-update branch 2 times, most recently from 1cb9d94 to bd0bd71 Compare September 10, 2021 20:37

github-actions bot requested changes Sep 10, 2021

View reviewed changes

github-actions bot approved these changes Sep 13, 2021

View reviewed changes

JonLiu1993 removed the requires:all-feature-testing label Sep 13, 2021

JonLiu1993 reviewed Sep 13, 2021

View reviewed changes

ports/skia/vcpkg.json Outdated Show resolved Hide resolved

github-actions bot requested changes Sep 14, 2021

View reviewed changes

github-actions bot requested changes Oct 2, 2021

View reviewed changes

dave-juicelabs force-pushed the skia-update branch from 391a56c to 45ecdaf Compare October 2, 2021 17:24

github-actions bot requested changes Oct 2, 2021

View reviewed changes

dave-juicelabs force-pushed the skia-update branch from 45ecdaf to 9cc6fc9 Compare October 2, 2021 17:35

JonLiu1993 added the requires:author-response label Mar 17, 2022

damcclos added 21 commits March 18, 2022 13:20

[skia] Adding support for other graphics APIs

f638d79

[skia] Trying an alternative to fix library finding.

a453b88

[skia] Removing OpenGL from the default features.

47af8fa

[skia] Trying to fix debug build.

710baa2

[skia] Updating to tag canvaskit/0.29.0

b3d12cd

[skia] Updating port version.

f42a1b9

Hopefully fixing skia harfbuzz linking issue.

f763693

Fixing dawn build

c741db4

Dawn support is now building. Need to move spirv-cross related librar…

e50ee4d

…ies to vcpkg versions.

Trying to fix Windows with Direct3D.

f87b15c

Fixing compile errors in ubuntu with dawn and windows with direct3d.

02a1b28

Removing unused variable patch.

ab383bf

Updating ci.baseline.txt

8ae8b88

Adding fontconfig dependency for linux.

6e97510

Patch skia to use fontconfig from vcpkg

595393c

Adding updates for vcpkg-gn

4daa4b0

As requested.

de45d14

Updating dawn support in skia.

e99086d

Fixing platform support.

d9a7695

skia does not support building on x86 without their sdks

c58c283

Updating skia version

e09d657

dave-juicelabs force-pushed the skia-update branch from c0e7374 to e09d657 Compare March 18, 2022 17:20

bold84 mentioned this pull request Apr 17, 2022

[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports #24066

Merged

JonLiu1993 closed this May 7, 2022

Conversation

dave-juicelabs commented Aug 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

JonLiu1993 commented Aug 30, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JonLiu1993 commented Aug 31, 2021

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JonLiu1993 commented Sep 13, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

JonLiu1993 commented Sep 14, 2021

Uh oh!

JonLiu1993 commented Sep 26, 2021

Uh oh!

dave-juicelabs commented Sep 27, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

JonLiu1993 commented Mar 17, 2022

Uh oh!

JonLiu1993 commented Apr 2, 2022

Uh oh!

azure-pipelines bot commented Apr 2, 2022

Uh oh!

JonLiu1993 commented Apr 21, 2022

Uh oh!

JonLiu1993 commented May 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dave-juicelabs commented Aug 29, 2021 •

edited

Loading

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?