summaryrefslogtreecommitdiff
path: root/build-aarch64-skia.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-06-20 15:03:59 +0200
committerMartin Stransky <stransky@redhat.com>2018-06-20 15:03:59 +0200
commit86072c7d9c5ff4ac8c4d89a64093344fd048a947 (patch)
treef2bbdd61e4de51781eb0c9edf51decdf0d35d580 /build-aarch64-skia.patch
parentbuild fix (diff)
downloadlibrewolf-fedora-ff-86072c7d9c5ff4ac8c4d89a64093344fd048a947.tar.gz
librewolf-fedora-ff-86072c7d9c5ff4ac8c4d89a64093344fd048a947.tar.bz2
librewolf-fedora-ff-86072c7d9c5ff4ac8c4d89a64093344fd048a947.zip
Added missing patches from 60.0.2
Diffstat (limited to 'build-aarch64-skia.patch')
-rw-r--r--build-aarch64-skia.patch17
1 files changed, 4 insertions, 13 deletions
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index 33d2d35..1ecad24 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,20 +1,11 @@
-diff -up firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp
---- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-04-20 12:07:26.242037226 +0200
-+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-04-20 12:12:58.916428432 +0200
-@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
- }
-
- SI F from_half(U16 h) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- return vcvt_f32_f16(h);
-
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+diff -up firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp
+--- firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-06-20 09:19:11.411939714 +0200
++++ firefox-61.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-06-20 09:23:36.831919894 +0200
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
}
SI U16 to_half(F f) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
return vcvt_f16_f32(f);
bgstack15