[firefox] aarch64 build fix

[Martin Stransky]

commit 2e164b4b38478782f9016cba0bc9c9745adbaeb0
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Mar 11 13:16:13 2015 +0100

    aarch64 build fix

 firefox-aarch64.patch | 36 +++++++++++++++++++++++++++++++++---
 firefox.spec          |  4 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/firefox-aarch64.patch b/firefox-aarch64.patch
index 2585f98..ebfa789 100644
--- a/firefox-aarch64.patch
+++ b/firefox-aarch64.patch
@@ -1,6 +1,6 @@
 diff -up firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py
---- firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64	2015-03-10 16:51:22.000000000 +0100
-+++ firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py	2015-03-10 20:23:07.561891942 +0100
+--- firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64	2015-03-11 12:58:25.871608312 +0100
++++ firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py	2015-03-11 12:58:25.877608353 +0100
 @@ -27,7 +27,7 @@ footer = """
  # can we find a better way of dealing with asm sources?
  
@@ -28,9 +28,39 @@ diff -up firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 fi
    write_sources(f, sources['arm'], 4)
  
    f.write("    if CONFIG['BUILD_ARM_NEON']:\n")
+diff -up firefox-36.0.1/mozilla-release/gfx/skia/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/moz.build
+--- firefox-36.0.1/mozilla-release/gfx/skia/moz.build.aarch64	2015-03-11 12:58:25.000000000 +0100
++++ firefox-36.0.1/mozilla-release/gfx/skia/moz.build	2015-03-11 13:14:49.627295630 +0100
+@@ -811,7 +811,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
+         'trunk/src/opts/SkUtils_opts_SSE2.cpp',
+         'trunk/src/opts/SkXfermode_opts_SSE2.cpp',
+     ]
+-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
++elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:
+     UNIFIED_SOURCES += [
+         'trunk/src/core/SkUtilsArm.cpp',
+         'trunk/src/opts/SkBitmapProcState_opts_arm.cpp',
+@@ -858,7 +858,7 @@ else:
+ # can we find a better way of dealing with asm sources?
+ 
+ # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
+-if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
++if not CONFIG['INTEL_ARCHITECTURE'] and (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:
+     SOURCES += [
+         'trunk/src/opts/memset.arm.S',
+     ]
+@@ -950,7 +950,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONF
+     SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+     SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+     SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
++elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
+     DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
+     DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
+ elif CONFIG['CLANG_CL']:
 diff -up firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build
 --- firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64	2015-03-05 11:28:10.000000000 +0100
-+++ firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build	2015-03-10 16:54:47.009663193 +0100
++++ firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build	2015-03-11 12:58:25.877608353 +0100
 @@ -61,7 +61,7 @@ else:
          'yuv_row_other.cpp',
      ]
diff --git a/firefox.spec b/firefox.spec
index c59ab3f..3b3345b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        36.0.1
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -767,7 +767,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Mar 10 2015 Martin Stransky <stransky at redhat.com> - 36.0.1-3
+* Tue Mar 10 2015 Martin Stransky <stransky at redhat.com> - 36.0.1-4
 - Arm build fix
 
 * Mon Mar  9 2015 Jan Horak <jhorak at redhat.com> - 36.0.1-1