From 9e38b7c8af4f80a71fe22d311d5eeaf31fee968e Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Thu, 15 Mar 2018 15:32:44 -0400
Subject: [PATCH] fix skia build issue on aarch64

---
 ...-65.0.3325.162-skia-aarch64-buildfix.patch | 21 +++++++++++++++++++
 chromium.spec                                 |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 chromium-65.0.3325.162-skia-aarch64-buildfix.patch

diff --git a/chromium-65.0.3325.162-skia-aarch64-buildfix.patch b/chromium-65.0.3325.162-skia-aarch64-buildfix.patch
new file mode 100644
index 00000000..e48346c7
--- /dev/null
+++ b/chromium-65.0.3325.162-skia-aarch64-buildfix.patch
@@ -0,0 +1,21 @@
+diff -up chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp
+--- chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix	2018-03-15 15:27:35.201345844 -0400
++++ chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp	2018-03-15 15:31:30.471777400 -0400
+@@ -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 defined(JUMPER_IS_NEON) && 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)
+@@ -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.
+     return vcvt_f16_f32(f);
+ 
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/chromium.spec b/chromium.spec
index ce610347..307e0d46 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -240,6 +240,8 @@ Patch83:	chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patc
 Patch84:	chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.patch
 # ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
 Patch85:	chromium-65.0.3325.162-boolfix.patch
+# From Debian
+Patch86:	chromium-65.0.3325.162-skia-aarch64-buildfix.patch
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -700,6 +702,7 @@ udev.
 %patch83 -p1 -b .GetString
 %patch84 -p1 -b .fully-declare
 %patch85 -p1 -b .boolfix
+%patch86 -p1 -b .aarch64fix
 
 %if 0%{?asan}
 export CC="clang"