diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 8c9bdf1e..e1116ef9 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -26,6 +26,7 @@ Tue Apr 7 12:18:27 UTC 2020 - Wolfgang Rosenauer * rust-cbindgen >= 0.13.1 * mozilla-nss >= 3.51 * nodejs10 >= 10.19 +- fix build issue in libvpx for i586 via mozilla-bmo1622013.patch ------------------------------------------------------------------- Mon Apr 6 11:19:24 UTC 2020 - Michel Normand diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8a0acd12..591660f0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -186,6 +186,7 @@ Patch19: mozilla-bmo1512162.patch Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch +Patch23: mozilla-bmo1622013.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -321,6 +322,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 diff --git a/mozilla-bmo1622013.patch b/mozilla-bmo1622013.patch new file mode 100644 index 00000000..8016939c --- /dev/null +++ b/mozilla-bmo1622013.patch @@ -0,0 +1,28 @@ +From be45ba20c33a8a247115e79fd4c1f3295d652ba3 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 23 Mar 2020 08:20:22 +0000 +Subject: [PATCH] Bug 1622013 - Build *_mmx.c files with -mmmx in bundled libvpx. + +diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build +index f3845941fe4de..47853d43408b7 100644 +--- a/media/libvpx/moz.build ++++ b/media/libvpx/moz.build +@@ -97,16 +97,18 @@ if CONFIG['OS_TARGET'] == 'Android': + DEFINES['__linux__'] = True + + SOURCES += [ + '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'], + ] + + for f in SOURCES: + if f.endswith('.c'): ++ if 'mmx.c' in f: ++ SOURCES[f].flags += ['-mmmx'] + if 'sse2.c' in f: + SOURCES[f].flags += CONFIG['SSE2_FLAGS'] + if 'ssse3.c' in f: + SOURCES[f].flags += ['-mssse3'] + if 'sse4.c' in f: + SOURCES[f].flags += ['-msse4.1'] + if 'avx.c' in f: + SOURCES[f].flags += ['-mavx']