Skip to content

Update SkiaSharp and HarfBuzzSharp version to support LA64 and RV64 #18571

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

4Darmygeometry
Copy link

What does the pull request do?

Update SkiaSharp and HarfBuzzSharp version to support LoongArch64 ABI2.0 and RISC-V 64, which has native library in nuget.org.
Also, it fixes the build to support Linux with old Glibc.
https://www.nuget.org/packages/SkiaSharp.NativeAssets.Linux/3.119.0-preview.1.2
https://www.nuget.org/packages/HarfBuzzSharp.NativeAssets.Linux/8.3.1.1-preview.1.2
Add riscv64 build support
Add LoongArch64 build support
Extend clang-cross to support alpine
Increase Linux support

What is the current behavior?

Incorrect behavior:Wrong version of SkiaSharp and HarfBuzzSharp that Can't be support in LoongArch64 ABI2.0, RISC-V 64, and old X64 and AArch64 Linux distribution with old Glibc.

What is the updated/expected behavior with this PR?

Use the Watt Toolkit project to test the PR.
https://github.com/4Darmygeometry/SteamTools

How was the solution implemented (if it's not obvious)?

Update the SkiaSharp and HarfBuzzSharp version.

Checklist

Breaking changes

N/A

Obsoletions / Deprecations

@grokys

Fixed issues

Fixes [FEATURE] riscv64 flavor of libSkiaSharp and libHarfBuzzSharp
Fixes [FEATURE] LoongArch64 flavor of libSkiaSharp and libHarfBuzzSharp

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.3.999-cibuild0055861-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@cla-avalonia
Copy link
Collaborator

cla-avalonia commented Apr 2, 2025

  • All contributors have signed the CLA.

@4Darmygeometry
Copy link
Author

@4Darmygeometry,

Please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following:

@cla-avalonia agree
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ),
and conveys certain license rights to the AvaloniaUI OÜ ( “AvaloniaUI OÜ” ) for Your contributions to
AvaloniaUI OÜ open source projects. This Agreement is effective as of the latest signature date below.

1. Definitions.

“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to AvaloniaUI OÜ under this Agreement.

“Project” means any of the projects owned or managed by AvaloniaUI OÜ and offered under a license
approved by the Open Source Initiative (www.opensource.org).

“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”

“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.

2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.

3. Originality of Work. You represent that each of Your Submissions is entirely Your
original work. Should You wish to Submit materials that are not Your original work,
You may Submit them separately to the Project if You (a) retain all copyright and
license information that was in the materials as you received them, (b) in the
description accompanying your Submission, include the phrase "Submission
containing materials of a third party:" followed by the names of the third party and any
licenses or other restrictions of which You are aware, and (c) follow any other
instructions in the Project's written guidelines concerning Submissions.

4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.

5. Licenses.

a. Copyright License. You grant AvaloniaUI OÜ, and those who receive the Submission directly
or indirectly from AvaloniaUI OÜ, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable
license in the Submission to reproduce, prepare derivative works of, publicly display, publicly perform,
and distribute the Submission and such derivative works, and to sublicense any or all of the foregoing
rights to third parties.

b. Patent License. You grant AvaloniaUI OÜ, and those who receive the Submission directly or
indirectly from AvaloniaUI OÜ, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license
under Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.

c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.

6. Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3 ). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6 , THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.

7. Notice to AvaloniaUI OÜ. You agree to notify AvaloniaUI OÜ in writing of any facts or
circumstances of which You later become aware that would make Your representations in this
Agreement inaccurate in any respect.

8. Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.

9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the Republic of Estonia, and
the parties consent to exclusive jurisdiction and venue in the courts sitting in Talinn,
Estonia. The parties waive all defenses of lack of personal jurisdiction and forum non-conveniens.

10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by AvaloniaUI OÜ.

AvaloniaUI OÜ dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1.

@cla-avalonia agree

@4Darmygeometry
Copy link
Author

@cla-avalonia agree

@4Darmygeometry
Copy link
Author

You can test this PR using the following package version. 11.3.999-cibuild0055861-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

Can run successfully.

@maxkatz6
Copy link
Member

maxkatz6 commented Apr 2, 2025

No issues with preview versions for the skiasharp 3.0.
But we would prefer to wait for stable skiasharp 2.x/harfbuzz release for non-critical updates like this.

@maxkatz6 maxkatz6 closed this Apr 2, 2025
@maxkatz6
Copy link
Member

maxkatz6 commented Apr 2, 2025

Accidentally pressed wrong button...reopening

@maxkatz6 maxkatz6 reopened this Apr 2, 2025
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.3.999-cibuild0055883-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@4Darmygeometry
Copy link
Author

Accidentally pressed wrong button...reopening

😂

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 12.0.999-cibuild0055936-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@christallire
Copy link
Contributor

christallire commented Apr 8, 2025

We might need this PR to be backported to 11.x since we might need to incorporate mono/SkiaSharp#3098 (also see: mono/SkiaSharp#3025) due to the 16KB page limit. Sims won't launch the apps built without it in Android API 15.
See Here for details.

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 12.0.999-cibuild0055960-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@maxkatz6 maxkatz6 added backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch backport-candidate-11.2.x Consider this PR for backporting to 11.2 branch labels Apr 8, 2025
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 12.0.999-cibuild0055972-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@kasperk81
Copy link

@maxkatz6 would you reconsider? it is going from 118 preview to 119 preview. their pace of updating stuff is terribly slow. it took them 4 months to go from one preview to the next so you can see why their "preview" claim doesn't mean much to the rest of us (including Avalonia using 118 preview).

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 12.0.999-cibuild0055991-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@kekekeks
Copy link
Member

The version targeted by Avalonia is the minimum supported one, you can use newer versions in your projects by adding a PackageReference.

@kasperk81
Copy link

it doesn't explain why bumping preview-old to preview-new is a problem? if anything, new version should be better

@maxkatz6
Copy link
Member

@kasperk81 AvsIncludeSkiaSharp3 is not included in the publish builds. It's only there for dev-testing Avalonia with different skia versions. When you install a package, it transitively references 2.88.9 either way. As Nikita mentioned, you can easily force 3.119 by just including it in your project.

Also, I am not so much considered about SkiaSharp version change in this PR (since it doesn't affect stable builds), but more about HarfBuzz using preview in stable builds. Waiting until HarfBuzzSharp 8.1.1 stable release before merging this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-skia backport-candidate-11.2.x Consider this PR for backporting to 11.2 branch backport-candidate-11.3.x Consider this PR for backporting to 11.3 branch enhancement
Projects
None yet
8 participants