xhorak pushed to xulrunner (f21). "Added skia patch for arm"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 16 15:37:38 UTC 2015
>From 5aaaab18aa9df5a3c33c8b42ac709fafbf151525 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak at redhat.com>
Date: Thu, 16 Apr 2015 14:27:09 +0200
Subject: Added skia patch for arm
diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch
new file mode 100644
index 0000000..4b9958d
--- /dev/null
+++ b/aarch64-fix-skia.patch
@@ -0,0 +1,18 @@
+Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a9516b553d
+
+Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/src/core/SkUtilsArm.h
++++ mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h
+@@ -21,9 +21,9 @@
+ #define SK_ARM_NEON_MODE_ALWAYS 1
+ #define SK_ARM_NEON_MODE_DYNAMIC 2
+
+-#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
++#if defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
+ # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC
+-#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64)
++#elif defined(__ARM_HAVE_NEON)
+ # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS
+ #else
+ # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
index f98cbe3..86e6f2e 100644
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@@ -1,12 +1,23 @@
-diff -up firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-29.0/mozilla-release/gfx/ycbcr/moz.build
---- firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-04-22 07:27:47.000000000 +0200
-+++ firefox-29.0/mozilla-release/gfx/ycbcr/moz.build 2014-04-22 16:40:34.862849368 +0200
-@@ -61,7 +61,7 @@ else:
- 'yuv_row_other.cpp',
- ]
-
--if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
-+if CONFIG['HAVE_ARM_NEON']:
- SOURCES += [
- 'yuv_row_arm.s',
- ]
+diff -up firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi
+--- firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm 2015-03-05 11:28:19.000000000 +0100
++++ firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2015-03-09 10:02:17.875243261 +0100
+@@ -235,19 +235,6 @@
+ 'defines': [
+ 'WEBRTC_ARCH_ARM',
+ ],
+- 'conditions': [
+- ['arm_version==7', {
+- 'defines': ['WEBRTC_ARCH_ARM_V7',
+- 'WEBRTC_BUILD_NEON_LIBS'],
+- 'conditions': [
+- ['arm_neon==1', {
+- 'defines': ['WEBRTC_ARCH_ARM_NEON',],
+- }, {
+- 'defines': ['WEBRTC_DETECT_ARM_NEON',],
+- }],
+- ],
+- }],
+- ],
+ }],
+ ['os_bsd==1', {
+ 'defines': [
diff --git a/xulrunner.spec b/xulrunner.spec
index dc0b15b..347a664 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -96,6 +96,7 @@ Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch
+Patch21: aarch64-fix-skia.patch
# Fedora specific patches
Patch200: mozilla-193-pkgconfig.patch
@@ -236,6 +237,7 @@ cd %{tarballdir}
%patch18 -p2 -b .jemalloc-ppc
%patch19 -p2 -b .s390-inlines
%patch20 -p1 -b .prbool
+%patch21 -p1 -b .aarch64-fix-skia
%patch200 -p2 -b .pk
%patch204 -p2 -b .966424
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xulrunner.git/commit/?h=f21&id=5aaaab18aa9df5a3c33c8b42ac709fafbf151525
More information about the scm-commits
mailing list