pool/MozillaFirefox
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 608990 from home:Guillaume_G:branches:mozilla:Factory

Browse Source 
- Disable webrtc for aarch64 due to bmo#1434589
- Add patch to fix skia build on AArch64:
  * mozilla-fix-skia-aarch64.patch

OBS-URL: https://build.opensuse.org/request/show/608990
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=663
This commit is contained in:
Wolfgang Rosenauer 2018-05-23 08:43:47 +00:00 committed by Git OBS Bridge
parent c31f9e8b0c
commit 45b6b99978
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MozillaFirefox.changes
View File

@ -13,6 +13,13 @@ Thu May 17 14:01:18 UTC 2018 - wr@rosenauer.org
* Restored translations of the Preferences panels when using a
language pack (bmo#1461590)
-------------------------------------------------------------------
Tue May 15 06:23:42 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
-------------------------------------------------------------------
Mon May 14 13:37:38 UTC 2018 - pcerny@suse.com

5
MozillaFirefox.spec
View File

@ -156,10 +156,10 @@ Patch8: mozilla-bmo256180.patch
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 @@ cd $RPM_BUILD_DIR/%{source_prefix}
%patch10 -p1
%endif
%patch11 -p1
%patch12 -p1
# Firefox
%patch101 -p1
%patch102 -p1
@ -383,7 +384,7 @@ ac_add_options --with-arch=armv6
ac_add_options --with-arch=armv7-a
%endif
%endif
%ifarch %arm s390x
%ifarch aarch64 %arm s390x
ac_add_options --disable-webrtc
%endif
EOF

20
mozilla-fix-skia-aarch64.patch Normal file
View File

@ -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)