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.

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

[skia] update to 126 #38856

Closed
wants to merge 1 commit into from
Closed

[skia] update to 126 #38856

wants to merge 1 commit into from

Conversation

abique
Copy link
Contributor

@abique abique commented May 22, 2024

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@abique
Copy link
Contributor Author

abique commented May 22, 2024

x64_uwp failure:

FAILED: obj/src/pdf/pdf.SkPDFSubsetFont.obj 
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC/Tools/MSVC/14.38.33130/bin/HostX64/x64/cl.exe" /nologo /showIncludes /FC -D_CRT_SECURE_NO_WARNINGS -D_HAS_EXCEPTIONS=0 -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DSK_CODEC_DECODES_BMP -DSK_CODEC_DECODES_WBMP -DSKIA_DLL -DSK_ENABLE_PRECOMPILE -DSK_GANESH -DSK_GAMMA_APPLY_TO_A8 -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1 -DGR_TEST_UTILS=0 -DSK_WINUWP -DSK_ENABLE_AVX512_OPTS -DSKIA_IMPLEMENTATION=1 -DSK_SUPPORT_PDF -DSK_CODEC_DECODES_JPEG "-IC:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.38.33130/include" "-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/shared" "-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/ucrt" "-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/um" "-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.22621.0/winrt" -I../src/f4d1f7e488-c77bada2e9.clean -ID:/installed/x64-uwp/include /wd5030 /wd5051 /bigobj /utf-8 /Z7 /W3 /wd4244 /wd4267 /wd4800 /wd4291 /wd4251 /wd4275 /wd4723 /wd5041  /std:c++17 /GR- -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D__WRL_NO_DEFAULT_LIB__ -nologo -Z7 -MP -GS -Gd -Gm- -W3 -WX- -Zc:wchar_t -Zc:inline -Zc:forScope -fp:precise -Oy- -EHsc -utf-8 -D_DEBUG -MDd -Od -RTC1 -ZW:nostdlib /c ../src/f4d1f7e488-c77bada2e9.clean/src/pdf/SkPDFSubsetFont.cpp /Foobj/src/pdf/pdf.SkPDFSubsetFont.obj /Fd"obj/pdf_c.pdb"
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\include\core\SkRefCnt.h(151): error C2027: use of undefined type 'SkData'
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\src\pdf\SkPDFSubsetFont.h(9): note: see declaration of 'SkData'
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\include\core\SkRefCnt.h(151): note: the template instantiation context (the oldest one first) is
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\src\pdf\SkPDFSubsetFont.cpp(109): note: see reference to class template instantiation 'sk_sp<SkData>' being compiled
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\include\core\SkRefCnt.h(255): note: while compiling class template member function 'sk_sp<SkData>::~sk_sp(void)'
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\src\pdf\SkPDFSubsetFont.cpp(110): note: see the first reference to 'sk_sp<SkData>::~sk_sp' in 'SkPDFSubsetFont'
D:\b\skia\src\f4d1f7e488-c77bada2e9.clean\include\core\SkRefCnt.h(256): note: see reference to function template instantiation 'void SkSafeUnref<T>(T *)' being compiled
        with
        [
            T=SkData
        ]

@abique
Copy link
Contributor Author

abique commented May 22, 2024

x64_windows failure:

[2278/2281] link skunicode_icu.dll skunicode_icu.dll.lib skunicode_icu.dll.pdb
FAILED: skunicode_icu.dll skunicode_icu.dll.lib skunicode_icu.dll.pdb 
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC/Tools/MSVC/14.38.33130/bin/HostX64/x64/link.exe" /nologo /IMPLIB:./skunicode_icu.dll.lib /DLL /OUT:./skunicode_icu.dll /PDB:./skunicode_icu.dll.pdb @./skunicode_icu.dll.rsp
   Creating library ./skunicode_icu.dll.lib and object ./skunicode_icu.dll.exp
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_errorName referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_hasBinaryProperty referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_getIntPropertyValue referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_isspace referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_isWhitespace referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_iscntrl referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_openSized referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_close referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_setPara referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_getDirection referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_getLength referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_getLevelAt referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubidi_reorderVisual referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol uloc_getDefault referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol uloc_forLanguageTag referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol utext_close referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol utext_openUTF8 referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol utext_openUChars referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_open referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_clone referenced in function "public: static struct UBreakIterator * __cdecl `anonymous namespace'::SkUbrkClone<struct UBreakIterator const *,void>::clone(struct UBreakIterator const *,enum UErrorCode *)" (?clone@?$SkUbrkClone@PEBUUBreakIterator@@X@?A0x2141876c@@SAPEAUUBreakIterator@@PEBU3@PEAW4UErrorCode@@@Z)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_close referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_setText referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_setUText referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_current referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_next referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_first referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_preceding referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_following referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_getRuleStatus referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol ubrk_getLocaleByType referenced in function "public: static char const * __cdecl `anonymous namespace'::SkUbrkGetLocaleByType<struct UBreakIterator const *,void>::getLocaleByType(struct UBreakIterator const *,enum ULocDataLocaleType,enum UErrorCode *)" (?getLocaleByType@?$SkUbrkGetLocaleByType@PEBUUBreakIterator@@X@?A0x2141876c@@SAPEBDPEBUUBreakIterator@@W4ULocDataLocaleType@@PEAW4UErrorCode@@@Z)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol uscript_getScript referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)
skunicode_icu.SkUnicode_icu_builtin.obj : error LNK2019: unresolved external symbol u_strToUpper referenced in function "class std::unique_ptr<struct SkICULib,struct std::default_delete<struct SkICULib> > __cdecl SkLoadICULib(void)" (?SkLoadICULib@@YA?AV?$unique_ptr@USkICULib@@U?$default_delete@USkICULib@@@std@@@std@@XZ)

.\skunicode_icu.dll : fatal error LNK1120: 32 unresolved externals

@abique
Copy link
Contributor Author

abique commented May 22, 2024

Maybe we need a more recent version of ICU for skia.

@abique
Copy link
Contributor Author

abique commented May 22, 2024

it seems that ICU 75.1 is out.
https://icu.unicode.org/download/75

@abique
Copy link
Contributor Author

abique commented May 22, 2024

I pushed an update to ICU as well to 75.1.

@abique abique changed the title [skia] update to 126 [skia] update to 126, [icu] update to 75.1 May 22, 2024
@Cheney-W Cheney-W added the category:port-update The issue is with a library, which is requesting update new revision label May 22, 2024
@dg0yt
Copy link
Contributor

dg0yt commented May 22, 2024

It is not a problem with our icu. It is the problem of picking icu link libs from the windows SDK. This is what took so long to fix in the previous revision of skia.

And for the icu update: you don't want to touch it now: #38826

@abique
Copy link
Contributor Author

abique commented May 22, 2024

I reverted the ICU change.

@Cheney-W Cheney-W changed the title [skia] update to 126, [icu] update to 75.1 [skia] update to 126 May 23, 2024
@dg0yt
Copy link
Contributor

dg0yt commented May 29, 2024

I don't know where the icu problems come from. The build is using full filepaths for the icu libs, according to desc-x64-windows-dbg-out.log:

"D:/installed/x64-windows/debug/lib/icuucd.lib", "D:/installed/x64-windows/debug/lib/icudtd.lib"

I would probably manually "bisect" the changes since m124 in https://github.com/google/skia/commits/chrome/m126/modules/skunicode, limiting CI to x64-windows, and then study the changes at the failing commit.

@dg0yt
Copy link
Contributor

dg0yt commented May 29, 2024

In addition, I spotted a bug in skia-functions.cmake line 149:

-    set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/lib/debug")
+    set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")

@abique
Copy link
Contributor Author

abique commented May 29, 2024

In addition, I spotted a bug in skia-functions.cmake line 149:

-    set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/lib/debug")
+    set(libdirs_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")

I can add that one.

@abique
Copy link
Contributor Author

abique commented May 29, 2024

I don't know where the icu problems come from. The build is using full filepaths for the icu libs, according to desc-x64-windows-dbg-out.log:

"D:/installed/x64-windows/debug/lib/icuucd.lib", "D:/installed/x64-windows/debug/lib/icudtd.lib"

I would probably manually "bisect" the changes since m124 in https://github.com/google/skia/commits/chrome/m126/modules/skunicode, limiting CI to x64-windows, and then study the changes at the failing commit.

I may look into it in the future but we're currently in a rush with the 5.2 Beta of Bitwig Studio.

@abique abique mentioned this pull request Jun 13, 2024
7 tasks
@abique abique closed this Jun 13, 2024
@abique abique deleted the skia/m126 branch June 13, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants