diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-09 08:21:39 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-09 11:21:25 +0000 |
| commit | fb1559b8f589bb2094238ce1e30691f9306014e4 (patch) | |
| tree | 6cdf0c68b4a27d49a20fdc0c9f41af4e3579af07 /community/firefox/disable-neon-in-aom.patch | |
| parent | d9bb7365e9c324aebb4a27d7484ca85a1e25f39e (diff) | |
| download | aports-fb1559b8f589bb2094238ce1e30691f9306014e4.tar.bz2 aports-fb1559b8f589bb2094238ce1e30691f9306014e4.tar.xz | |
community/firefox: re-enable on armv7
Diffstat (limited to 'community/firefox/disable-neon-in-aom.patch')
| -rw-r--r-- | community/firefox/disable-neon-in-aom.patch | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/community/firefox/disable-neon-in-aom.patch b/community/firefox/disable-neon-in-aom.patch index 1c1a3a9799..01be79c047 100644 --- a/community/firefox/disable-neon-in-aom.patch +++ b/community/firefox/disable-neon-in-aom.patch @@ -6,25 +6,36 @@ In file included from /home/buildozer/aports/community/firefox/src/firefox-75.0/ /usr/lib/gcc/armv7-alpine-linux-musleabihf/9.3.0/include/arm_neon.h:10303:1: error: inlining failed in call to always_inline 'vld1_u8': target specific option mismatch 10303 | vld1_u8 (const uint8_t * __a) | ^~~~~~~ ---- a/media/libaom/config/linux/arm/config/aom_config.asm.orig 2020-04-08 21:58:08.152208663 +0200 -+++ b/media/libaom/config/linux/arm/config/aom_config.asm 2020-04-08 21:58:30.775311580 +0200 -@@ -65,7 +65,7 @@ - .equ HAVE_MIPS64, 0 - .equ HAVE_MMX, 0 - .equ HAVE_MSA, 0 --.equ HAVE_NEON, 1 -+.equ HAVE_NEON, 0 - .equ HAVE_SSE, 0 - .equ HAVE_SSE2, 0 - .equ HAVE_SSE3, 0 ---- a/media/libaom/config/linux/arm/config/aom_config.h.orig 2020-04-08 21:58:16.878786419 +0200 -+++ a/media/libaom/config/linux/arm/config/aom_config.h 2020-04-08 21:58:23.078723273 +0200 -@@ -67,7 +67,7 @@ - #define HAVE_MIPS64 0 - #define HAVE_MMX 0 - #define HAVE_MSA 0 --#define HAVE_NEON 1 -+#define HAVE_NEON 0 - #define HAVE_SSE 0 - #define HAVE_SSE2 0 - #define HAVE_SSE3 0 +--- a/media/libaom/moz.build 2020-04-09 08:20:14.608439591 +0200 ++++ b/media/libaom/moz.build 2020-04-09 08:20:21.801745246 +0200 +@@ -42,30 +42,6 @@ + ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ] + LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ] + EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ] +-elif CONFIG['CPU_ARCH'] == 'arm': +- EXPORTS.aom += files['ARM_EXPORTS'] +- ASFLAGS += [ +- '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR, +- '-I%s/libaom' % OBJDIR, +- ] +- LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ] +- EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ] +- +- SOURCES += files['ARM_SOURCES'] +- +- for f in SOURCES: +- if f.endswith('neon.c'): +- SOURCES[f].flags += CONFIG['VPX_ASFLAGS'] +- +- if CONFIG['OS_TARGET'] == 'Android': +- # For cpu-features.h +- LOCAL_INCLUDES += [ +- '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], +- ] +- if CONFIG['CC_TYPE'] == 'clang': +- ASFLAGS += [ +- '-no-integrated-as', +- ] + else: + # Generic C-only configuration + EXPORTS.aom += files['GENERIC_EXPORTS'] |