# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1527323899 -7200
# Node ID 08307c08d990c7a7aee3eed412c60bcd878c5579
# Parent  a6a2360bc1bd93cac40eae7e540a8b5edaa37ac3
architecture fixes

diff -r a6a2360bc1bd -r 08307c08d990 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu May 17 22:15:44 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat May 26 10:38:19 2018 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed May 23 08:49:09 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Disable webrtc for aarch64 due to bmo#1434589
+- Add patch to fix skia build on AArch64:
+  * mozilla-fix-skia-aarch64.patch
+
+-------------------------------------------------------------------
 Thu May 17 14:01:18 UTC 2018 - wr@rosenauer.org
 
 - update to Firefox 60.0.1
diff -r a6a2360bc1bd -r 08307c08d990 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu May 17 22:15:44 2018 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat May 26 10:38:19 2018 +0200
@@ -156,10 +156,10 @@
 Patch9:         mozilla-i586-DecoderDoctorLogger.patch
 Patch10:        mozilla-i586-domPrefs.patch
 Patch11:        mozilla-enable-csd.patch
+Patch12:        mozilla-fix-skia-aarch64.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -271,6 +271,7 @@
 %patch10 -p1
 %endif
 %patch11 -p1
+%patch12 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -383,7 +384,7 @@
 ac_add_options --with-arch=armv7-a
 %endif
 %endif
-%ifarch %arm s390x
+%ifarch aarch64 %arm s390x
 ac_add_options --disable-webrtc
 %endif
 EOF
diff -r a6a2360bc1bd -r 08307c08d990 MozillaFirefox/mozilla-fix-skia-aarch64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-fix-skia-aarch64.patch	Sat May 26 10:38:19 2018 +0200
@@ -0,0 +1,1 @@
+../mozilla-fix-skia-aarch64.patch
\ No newline at end of file
diff -r a6a2360bc1bd -r 08307c08d990 mozilla-fix-skia-aarch64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-fix-skia-aarch64.patch	Sat May 26 10:38:19 2018 +0200
@@ -0,0 +1,20 @@
+--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.orig	2018-05-14 13:23:26.001095058 +0200
++++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp	2018-05-14 13:24:46.851416500 +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 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 -r a6a2360bc1bd -r 08307c08d990 series
--- a/series	Thu May 17 22:15:44 2018 +0200
+++ b/series	Sat May 26 10:38:19 2018 +0200
@@ -10,6 +10,7 @@
 mozilla-i586-DecoderDoctorLogger.patch
 mozilla-i586-domPrefs.patch
 mozilla-enable-csd.patch
+mozilla-fix-skia-aarch64.patch
 
 # Firefox patches
 firefox-kde.patch