download.lst
| 4
external/skia/0001-loong64-fix-some-bugs-in-type-conversion-on-Loongarc.patch
| 119 ----------
external/skia/UnpackedTarball_skia.mk
| 1
external/skia/fontconfig-get-typeface.patch.1
| 14 -
4 files changed, 9 insertions(+), 129 deletions(-)
New commits:
commit 5284fbe7b4358426f4236157009dfb9e6c69a2f7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Mar 11 13:13:31 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 11 13:46:15 2025 +0100
update to skia m132
dropping patch that is already upstream
Change-Id: I7f0dc4b964499eb1ea6db0b32846ed9328f22ced
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182768
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/download.lst b/download.lst
index 8a929cf94e0a..4e31ed9c1b86 100644
--- a/download.lst
+++ b/download.lst
@@ -631,8 +631,8 @@ RHINO_TARBALL := rhino-1.7.15.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
-SKIA_SHA256SUM :=
17fe9e70ba51a2873b805e2ad7617046d4b8449cde5a4d29cba353c2c1921325
-SKIA_TARBALL := skia-m131-47af57460e62268bdee4ada42e9c37999411da80.tar.xz
+SKIA_SHA256SUM :=
103f63a8414a506c887cfe788f7653c130df1278b2cc1d1ae6827b2b90e59377
+SKIA_TARBALL := skia-m132-ee9db7d1348f76780fd0184b9b0243d653e36411.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git
a/external/skia/0001-loong64-fix-some-bugs-in-type-conversion-on-Loongarc.patch
b/external/skia/0001-loong64-fix-some-bugs-in-type-conversion-on-Loongarc.patch
deleted file mode 100644
index d1d9acda5643..000000000000
---
a/external/skia/0001-loong64-fix-some-bugs-in-type-conversion-on-Loongarc.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From a65c19ee42e9c9a2728497d6ea42a32dd516ea93 Mon Sep 17 00:00:00 2001
-From: Kai Zou <double1...@gmail.com>
-Date: Fri, 18 Oct 2024 10:01:39 +0800
-Subject: [PATCH 1/4] [loong64] fix some bugs in type conversion on Loongarch
-X-Developer-Signature: v=1; a=openpgp-sha256; l=4201; i=x...@aosc.io;
- h=from:subject; bh=XTSCL4cd9w9LM40ioj+FZRuks/XFKeHfRWGBQfQdrWE=;
- b=owGbwMvMwCW2U4Ij7wZL9ETG02pJDOmr/sbfCshtPdTqW/9lttfaXbYdfb9WnqxiMDrPY27Ow
- x4g9j+8o5SFQYyLQVZMkaXIsMGbVSedX3RZuSzMHFYmkCEMXJwCMJGz7xgZXvbdNJ0eeDbII2NR
- fObeCr82UW7W//P0l7w8sqFmysuJVxj+CjaUTNptuKahJOrs7m/GPE9jLzpt2ipQ9phl9e+3P17
- P5QcA
-X-Developer-Key: i=x...@aosc.io; a=openpgp;
- fpr=7231804B052C670F15A6771DB918086ED8045B91
-
-Backported of 7e8c7385e673 ("fix some bugs in type conversion on
-Loongarch").
-
-Change-Id: I5751928376acbe298d923b465cc9303bd5bac2bb
-Reviewed-on: https://skia-review.googlesource.com/c/skia/+/909436
-Reviewed-by: Greg Daniel <egdan...@google.com>
-Reviewed-by: Ben Wagner <bunge...@google.com>
-Commit-Queue: Ben Wagner <bunge...@google.com>
-Signed-off-by: Bingwu Zhang <x...@aosc.io>
----
- src/opts/SkRasterPipeline_opts.h | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/src/opts/SkRasterPipeline_opts.h
b/src/opts/SkRasterPipeline_opts.h
-index e1783a589075..d12968d876b5 100644
---- a/src/opts/SkRasterPipeline_opts.h
-+++ b/src/opts/SkRasterPipeline_opts.h
-@@ -943,22 +943,22 @@ namespace SK_OPTS_NS {
- SI F abs_ (F v) { return (F)__lasx_xvand_v((I32)v,
(I32)(0-v)); }
- SI I32 abs_(I32 v) { return max(v, -v); }
- SI F rcp_approx(F v) { return __lasx_xvfrecip_s(v); }
-- SI F rcp_precise (F v) { F e = rcp_approx(v); return e * nmad(v, e,
2.0f); }
-+ SI F rcp_precise (F v) { F e = rcp_approx(v); return e * nmad(v, e,
F() + 2.0f); }
- SI F rsqrt_approx (F v) { return __lasx_xvfrsqrt_s(v); }
- SI F sqrt_(F v) { return __lasx_xvfsqrt_s(v); }
-
- SI U32 iround(F v) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lasx_xvftintrz_w_s(v + t);
- }
-
- SI U32 round(F v) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lasx_xvftintrz_w_s(v + t);
- }
-
- SI U32 round(F v, F scale) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lasx_xvftintrz_w_s(mad(v, scale, t));
- }
-
-@@ -993,8 +993,8 @@ namespace SK_OPTS_NS {
-
- template <typename T>
- SI V<T> gather(const T* p, U32 ix) {
-- return { p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]],
-- p[ix[4]], p[ix[5]], p[ix[6]], p[ix[7]], };
-+ return V<T>{ p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]],
-+ p[ix[4]], p[ix[5]], p[ix[6]], p[ix[7]], };
- }
-
- template <typename V, typename S>
-@@ -1147,20 +1147,20 @@ namespace SK_OPTS_NS {
- SI F abs_(F v) { return (F)__lsx_vand_v((I32)v, (I32)(0-v));
}
- SI I32 abs_(I32 v) { return max(v, -v); }
- SI F rcp_approx (F v) { return __lsx_vfrecip_s(v); }
-- SI F rcp_precise (F v) { F e = rcp_approx(v); return e * nmad(v, e,
2.0f); }
-+ SI F rcp_precise (F v) { F e = rcp_approx(v); return e * nmad(v, e,
F() + 2.0f); }
- SI F rsqrt_approx (F v) { return __lsx_vfrsqrt_s(v); }
- SI F sqrt_(F v) { return __lsx_vfsqrt_s (v); }
-
- SI U32 iround(F v) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lsx_vftintrz_w_s(v + t); }
-
- SI U32 round(F v) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lsx_vftintrz_w_s(v + t); }
-
- SI U32 round(F v, F scale) {
-- F t = F(0.5);
-+ F t = F() + 0.5f;
- return __lsx_vftintrz_w_s(mad(v, scale, t)); }
-
- SI U16 pack(U32 v) {
-@@ -1196,15 +1196,15 @@ namespace SK_OPTS_NS {
-
- template <typename T>
- SI V<T> gather(const T* p, U32 ix) {
-- return {p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
-+ return V<T>{p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
- }
- // Using 'int*' prevents data from passing through floating-point
registers.
- SI F gather(const int* p, int ix0, int ix1, int ix2, int ix3) {
- F ret = {0.0};
-- ret = __lsx_vinsgr2vr_w(ret, p[ix0], 0);
-- ret = __lsx_vinsgr2vr_w(ret, p[ix1], 1);
-- ret = __lsx_vinsgr2vr_w(ret, p[ix2], 2);
-- ret = __lsx_vinsgr2vr_w(ret, p[ix3], 3);
-+ ret = (F)__lsx_vinsgr2vr_w(ret, p[ix0], 0);
-+ ret = (F)__lsx_vinsgr2vr_w(ret, p[ix1], 1);
-+ ret = (F)__lsx_vinsgr2vr_w(ret, p[ix2], 2);
-+ ret = (F)__lsx_vinsgr2vr_w(ret, p[ix3], 3);
- return ret;
- }
-
-
-base-commit: b988efa06f8aa3bfeaa18c5b8c716ff244ab43cf
---
-2.48.1
-
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index cc7f0dd29633..88a634e95da0 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -41,7 +41,6 @@ skia_patches := \
help-msvc-analyzer.patch \
always_inline_and_multiversioning_conflict.patch.1 \
windows-define-conflict.patch.1 \
- 0001-loong64-fix-some-bugs-in-type-conversion-on-Loongarc.patch \
0002-loong64-Honor-existing-LASX-LSX-settings.patch \
0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \
0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \
diff --git a/external/skia/fontconfig-get-typeface.patch.1
b/external/skia/fontconfig-get-typeface.patch.1
index e4f07d6c5bd6..6653b50255b5 100644
--- a/external/skia/fontconfig-get-typeface.patch.1
+++ b/external/skia/fontconfig-get-typeface.patch.1
@@ -1,10 +1,10 @@
diff -ur skia.org/include/ports/SkFontMgr_fontconfig.h
skia/include/ports/SkFontMgr_fontconfig.h
--- skia.org/include/ports/SkFontMgr_fontconfig.h 2024-10-09
10:25:16.421928663 +0200
+++ skia/include/ports/SkFontMgr_fontconfig.h 2024-10-09 10:27:17.914640682
+0200
-@@ -19,4 +19,9 @@
- */
+@@ -21,4 +21,9 @@
+ class SkFontScanner;
+ SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc,
std::unique_ptr<SkFontScanner> scanner);
SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc);
-
+struct _FcPattern;
+typedef struct _FcPattern FcPattern;
+class SkTypeface;
@@ -22,13 +22,13 @@ diff -ur skia.org/src/ports/SkFontMgr_fontconfig.cpp
skia/src/ports/SkFontMgr_fo
sk_sp<SkTypeface> createTypefaceFromFcPattern(SkAutoFcPattern pattern)
const {
if (!pattern) {
return nullptr;
-@@ -966,6 +967,16 @@
- }
- };
+@@ -1043,6 +1044,16 @@
+ return sk_make_sp<SkFontMgr_fontconfig>(fc, std::move(scanner));
+ }
-sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) {
+SK_API sk_sp<SkFontMgr> SkFontMgr_New_FontConfig(FcConfig* fc) {
- return sk_make_sp<SkFontMgr_fontconfig>(fc);
+ return sk_make_sp<SkFontMgr_fontconfig>(fc,
SkFontScanner_Make_FreeType());
}
+
+SK_API sk_sp<SkTypeface> SkFontMgr_createTypefaceFromFcPattern(const
sk_sp<SkFontMgr>& mgr, FcPattern* pattern)
