From 36bdfddebba10f293834570557e6f097ab6893e5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 10 Oct 2023 00:03:35 -0500
Subject: user/{firefox-esr,thunderbird}: Fix ARM TEXTRELs

TEXTRELs are due to assembly code for FFTs in ffvpx/libavcodec.

Since this is only used on "Android32 FLAC optimisation", it's likely
not worth it for our use cases.  Disable it.

Fixes: #1015
---
 user/firefox-esr/APKBUILD | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'user/firefox-esr/APKBUILD')

diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index c4b881eaf..4c9e50068 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -5,7 +5,7 @@ pkgver=91.13.0
 pkgrel=3
 pkgdesc="Firefox web browser (extended support release)"
 url="https://www.mozilla.org/firefox/"
-arch="all !ppc !armv7"  # #837, #1015
+arch="all !ppc"  # #837
 options="!check"  # Tests disabled
 license="MPL-2.0"
 depends=""
@@ -33,6 +33,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
 
 	bad-google-code.patch
 	BTS-1074.patch
+	disable-arm-flac.patch
 	fix-mutex-build.patch
 	fix-seccomp-bpf.patch
 	gcc89074.patch
@@ -155,6 +156,7 @@ sha512sums="38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f25
 86168a5e5b8aa3ea7cc0d40174baa97595c82b8e599937155fbd7761e7df7220980c74f75e96c34e5f660423e42ad67761f57b2923389be363253868bac033a9  mozconfig
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
 57410e4b9199f3c7db1cd4a0cf3e67cd962b585730c073edb1cadc3bcac5b0aec4e6f7efe24f3eadd1020aefef475e08e97f13dc6b6534e639f33cc6fb1abe04  BTS-1074.patch
+33c6c9d845981137e41e396463c09a55c4effe56628f9f7a4e13b7328e4591b97bc607df484393994a9da07d701f2eaee4e30b463284159e4206e1c42a1a4cdc  disable-arm-flac.patch
 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0  gcc89074.patch
-- 
cgit v1.2.3-60-g2f50