From b39173f330082506f47e30125ef4db5ac096b37d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 6 Jan 2016 09:27:06 +0100 Subject: Fix build on AArch64 --- firefox-webrtc-aarch64.patch | 14 ++++++++++++++ firefox.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 firefox-webrtc-aarch64.patch diff --git a/firefox-webrtc-aarch64.patch b/firefox-webrtc-aarch64.patch new file mode 100644 index 0000000..ba624ad --- /dev/null +++ b/firefox-webrtc-aarch64.patch @@ -0,0 +1,14 @@ +diff --git a/media/webrtc/trunk/build/build_config.h b/media/webrtc/trunk/build/build_config.h +index 1a9579e..4f311c5 100644 +--- a/media/webrtc/trunk/build/build_config.h ++++ b/media/webrtc/trunk/build/build_config.h +@@ -156,6 +156,9 @@ + #elif defined(__alpha__) + #define ARCH_CPU_ALPHA 1 + #define ARCH_CPU_64_BITS 1 ++#elif defined(__aarch64__) ++#define ARCH_CPU_AARCH64 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif diff --git a/firefox.spec b/firefox.spec index 04e8cd7..15e9400 100644 --- a/firefox.spec +++ b/firefox.spec @@ -77,7 +77,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 43.0.3 -Release: 2%{?pre_tag}%{?dist} +Release: 3%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -123,6 +123,8 @@ Patch222: firefox-gtk3-20.patch # Update https://bugzilla.mozilla.org/show_bug.cgi?id=1142056 # when removed Patch500: aarch64-fix-skia.patch +# Add AArch64 architecture definition for webrtc +Patch501: firefox-webrtc-aarch64.patch %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -261,6 +263,7 @@ cd %{tarballdir} %endif %patch500 -p1 +%patch501 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -753,6 +756,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jan 05 2016 Marcin Juszkiewicz - 43.0.3-3 +- Fix build on AArch64. + * Mon Jan 4 2016 Martin Stransky - 43.0.3-2 - Enabled Skia (rhbz#1282134) -- cgit