diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 4fbee52..c0499db 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Jun 11 09:21:24 UTC 2024 - Wolfgang Rosenauer + +- Mozilla Firefox 127.0 + https://www.mozilla.org/en-US/firefox/127.0/releasenotes + MFSA 2024-25 (bsc#1226027) + * CVE-2024-5687 (bmo#1889066) + An incorrect principal could have been used when opening new tabs + * CVE-2024-5688 (bmo#1895086) + Use-after-free in JavaScript object transplant + * CVE-2024-5689 (bmo#1389707) + User confusion and possible phishing vector via Firefox Screenshots + * CVE-2024-5690 (bmo#1883693) + External protocol handlers leaked by timing attack + * CVE-2024-5691 (bmo#1888695) + Sandboxed iframes were able to bypass sandbox restrictions to + open a new window + * CVE-2024-5692 (bmo#1837514, bmo#1891234) + Bypass of file name restrictions during saving + * CVE-2024-5693 (bmo#1891319) + Cross-Origin Image leak via Offscreen Canvas + * CVE-2024-5694 (bmo#1895055) + Use-after-free in JavaScript Strings + * CVE-2024-5695 (bmo#1895579) + Memory Corruption using allocation using out-of-memory conditions + * CVE-2024-5696 (bmo#1896555) + Memory Corruption in Text Fragments + * CVE-2024-5697 (bmo#1414937) + Website was able to detect when Firefox was taking a + screenshot of them + * CVE-2024-5698 (bmo#1828259) + Data-list could have overlaid address bar + * CVE-2024-5699 (bmo#1891349) + Cookie prefixes not treated as case-sensitive + * CVE-2024-5700 (bmo#1862809, bmo#1889355, bmo#1893388, bmo#1895123) + Memory safety bugs fixed in Firefox 127, Firefox ESR 115.12, + and Thunderbird 115.12 + * CVE-2024-5701 (bmo#1890909, bmo#1891422, bmo#1893915, + bmo#1894047, bmo#1896024) + Memory safety bugs fixed in Firefox 127 +- removed obsolete mozilla-bmo1886378.patch + ------------------------------------------------------------------- Wed May 29 06:05:07 UTC 2024 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index fedc750..54e39f0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -28,9 +28,9 @@ # orig_suffix b3 # major 69 # mainver %%major.99 -%define major 126 -%define mainver %major.0.1 -%define orig_version 126.0.1 +%define major 127 +%define mainver %major.0 +%define orig_version 127.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -229,7 +229,6 @@ Patch21: svg-rendering.patch Patch22: mozilla-partial-revert-1768632.patch Patch23: mozilla-rust-disable-future-incompat.patch Patch24: mozilla-bmo1822730.patch -Patch25: mozilla-bmo1886378.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch diff --git a/firefox-126.0.1.source.tar.xz b/firefox-126.0.1.source.tar.xz deleted file mode 100644 index 82418a2..0000000 --- a/firefox-126.0.1.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63026359f678a5d45cea4c7744fcef512abbb58a5b016bbbb1c6ace723a263b -size 552965660 diff --git a/firefox-126.0.1.source.tar.xz.asc b/firefox-126.0.1.source.tar.xz.asc deleted file mode 100644 index 6e7c711..0000000 --- a/firefox-126.0.1.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmZUvKsACgkQ4207E/PZ -MnRyIA//RmJnrGX1k1J3T9zBknzbhFPxUu3HYp4D7kKrIMJKfzhXpsaIzMaP5AF+ -gYC8ixY7o3EbkJtMK8MDXV7Pq+Si+KEmMMgNT+2MQIgGodizBIxUDb+/q8Vl3SCk -LyPAvLIN2nqfVIV3jZ2TNO3fa1U6mW1qswy38Gg0K+/lftG5oZt3nDkJ/Ieqr8Qj -ll36Yoi1ClqD1DhAn5zRBfFpi3InuX7SRMyrNqi7xdo/4v9aG5aWHPn7EbH9LWmW -vDVX1tMh7sWZqJxDT/hofoCuNxX9coS+8alCHSSTZt9DoKQmNjox1Xz/gaNL6xjz -fuNC4WuWUs9/hYkxrRuHKWSzVxq5Qon6QssrrF3pfEXrDwQeb7txQlBesXRpwlq7 -LzgQaudIcRU3SgIS7qaUjS3uKNTV8Jivhm0PBuz+FvhuheXTYK0jnk1Ddkkv0Cfq -0SZk4QiZG8Z73HHjEyifHT9QMe5hQbl132momsDRBhUrJpKXyPWNvcq6yxrWFOkL -NWsrnHMDINbonkAgkX1JTxe5MbNts74INzGZJkIMsC/Y33+dmOhePySKd+OcG2eM -DqdsrQLComWpye1FTwYzynR8yVqjbdUoLjfUFWQmliI/wwI7CYfxathxHV1Q5J3N -101fLb5TR4tQOuw8zsnQCPKurVlztx2j/5K90WIL+s1fxnnPGwI= -=gkjp ------END PGP SIGNATURE----- diff --git a/firefox-127.0.source.tar.xz b/firefox-127.0.source.tar.xz new file mode 100644 index 0000000..18407c0 --- /dev/null +++ b/firefox-127.0.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea6b089ff046ca503978fdaf11ea123c64f66bbcdc4a968bed8f7c93e9994321 +size 558840124 diff --git a/firefox-127.0.source.tar.xz.asc b/firefox-127.0.source.tar.xz.asc new file mode 100644 index 0000000..e79aa87 --- /dev/null +++ b/firefox-127.0.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmZiLSAACgkQ4207E/PZ +MnSBbA//Xn5pxTREkgot1JwNl1JB3+uYqLjjDcTbZFWhJ/wf6gqokRSbGl+PSVGM +5kOYvggfleRcqc8/OUicD2/SlCXAP/SnxZPmKQXhZJ5o6MLxLELWyeVpgQQNPQAM +5FfkHDGWGyt2B7i5Zfh380IM5KsFso0sglAmeANngI66ePYx/0kOdvUa6YxM/uss +4SjxO6JaquWnQFxG3tmknQZYMQ3u+Zfqq2D6wVD3B+j2oTToQTGXvWHIzT7VEyaj +2xs7s0pecVYiWP92LJlrNV6vFnG8lVyv/zRQURdJ4UYmgRXx5/AZ+k8SFCvQwii3 +eHVDJ4IjG7fa36ttubaWf3HZYcWvVV7jnZhLF3MnRmTo0cbY9L4XHCWSEsUq5QnH +q2BSRq+cjE0GwzBw1NFf5b0yIbzy3EQWdhAOH6jpaTZ4veb4yl9UNLg5ms2nkfv7 +dpwzhruDa7WWjICELcwyd420tMrL12EuvOORcenXsY+Mqz8k4DpiS5pmBxzN5o8q +/vQbtuOQLM2ZzIjSYKv82egGvEOkuzTCR2UfN4QuWztLbp96PoCZ7No1j4cWjdUV +A/UMT0CjG7G1DDndhMHMfQMFiIRNz0Sduy79PXsLWMtvtD1Y6Bf0PL5YmMbAQOU+ +adxeokSOc1WEXvw7N5T3BdWtqTDo4VF41tf/tDFDm+7YGvI3OmM= +=tKU/ +-----END PGP SIGNATURE----- diff --git a/l10n-126.0.1.tar.xz b/l10n-126.0.1.tar.xz deleted file mode 100644 index 8de18db..0000000 --- a/l10n-126.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fb67354817ee6319fbe56189ef248105bc3025983dabfe654992f31a86c7f98 -size 31696716 diff --git a/l10n-127.0.tar.xz b/l10n-127.0.tar.xz new file mode 100644 index 0000000..7164b27 --- /dev/null +++ b/l10n-127.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68c4f9dc1ae31acaf51cde83abafad3f308211c260b398b2ac58e390344a4119 +size 31787988 diff --git a/mozilla-bmo1886378.patch b/mozilla-bmo1886378.patch deleted file mode 100644 index 7a07a90..0000000 --- a/mozilla-bmo1886378.patch +++ /dev/null @@ -1,2295 +0,0 @@ - -# HG changeset patch -# User Chun-Min Chang -# Date 1713285444 0 -# Node ID 2143ac890f2659f2612c8a1edec1cc93586feffa -# Parent 3b76cb83627af4607b79caf70a03243e6ee6369b -Bug 1886378 - Disable SVE on linux/aarch64 r=glandium - -This patch, akin to D204798 in bug 1880814 [1, 2], disables the SVE -features on the Linux/AArch64 platform. - -[1] https://phabricator.services.mozilla.com/D204798 -[2] https://hg.mozilla.org/mozilla-central/rev/d3a921beb422 - -Differential Revision: https://phabricator.services.mozilla.com/D206718 - -diff --git a/media/libvpx/generate_sources_mozbuild.sh b/media/libvpx/generate_sources_mozbuild.sh ---- a/media/libvpx/generate_sources_mozbuild.sh -+++ b/media/libvpx/generate_sources_mozbuild.sh -@@ -209,17 +209,17 @@ disable_sve="--disable-sve" # Bug 188558 - gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}" - gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}" - gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}" - gen_config_files mac/ia32 "--target=x86-darwin9-gcc ${all_platforms} ${x86_platforms}" - gen_config_files win/x64 "--target=x86_64-win64-vs15 ${all_platforms} ${x86_platforms}" - gen_config_files win/ia32 "--target=x86-win32-gcc ${all_platforms} ${x86_platforms}" - - gen_config_files linux/arm "--target=armv7-linux-gcc ${all_platforms} ${arm_platforms}" --gen_config_files linux/arm64 "--target=arm64-linux-gcc ${all_platforms} ${arm64_platforms}" -+gen_config_files linux/arm64 "--target=arm64-linux-gcc ${all_platforms} ${arm64_platforms} ${disable_sve}" # Bug 1889813 - gen_config_files win/aarch64 "--target=arm64-win64-vs15 ${all_platforms} ${arm64_platforms} ${disable_sve}" # Bug 1885585 - - gen_config_files generic "--target=generic-gnu ${all_platforms}" - - echo "Remove temporary directory." - cd $BASE_DIR - rm -rf $TEMP_DIR - -@@ -232,17 +232,17 @@ cd $TEMP_DIR - gen_rtcd_header linux/x64 x86_64 - gen_rtcd_header linux/ia32 x86 - gen_rtcd_header mac/x64 x86_64 - gen_rtcd_header mac/ia32 x86 - gen_rtcd_header win/x64 x86_64 - gen_rtcd_header win/ia32 x86 - - gen_rtcd_header linux/arm armv7 --gen_rtcd_header linux/arm64 arm64 -+gen_rtcd_header linux/arm64 arm64 $disable_sve # Bug 1889813 - gen_rtcd_header win/aarch64 arm64 $disable_sve # Bug 1885585 - - gen_rtcd_header generic generic - - echo "Prepare Makefile." - ./configure --target=generic-gnu > /dev/null - make_clean - -@@ -273,16 +273,17 @@ make libvpx_srcs.txt target=libs $config - convert_srcs_to_project_files libvpx_srcs.txt ARM - - echo "Generate ARM64 source list." - config=$(print_config linux/arm64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null - convert_srcs_to_project_files libvpx_srcs.txt ARM64 - # Bug 1885585: The sve files will be excluded from the win/aarch64 build in moz.build. -+# Bug 1889813: The sve files will be excluded from the linux/arm64 build in moz.build. - - echo "Generate generic source list." - config=$(print_config generic) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null - convert_srcs_to_project_files libvpx_srcs.txt GENERIC - - echo "}" >> $BASE_DIR/sources.mozbuild - - -# HG changeset patch -# User Chun-Min Chang -# Date 1713285444 0 -# Node ID bdcc287fced58c64dffca97a8d9126606a2b8c1e -# Parent 2143ac890f2659f2612c8a1edec1cc93586feffa -Bug 1886378 - Rework source-list generation across platforms and architectrues r=glandium - -Previously, source lists on different platforms were generated solely -based on architecture. Each architecture's source list would be copied -to lists on various platforms with the same architecture, with -modifications as necessary. However, with recently divergent settings -for platforms sharing the same architecture, maintaining a single list -and modifying it across different platforms becomes cumbersome. - -To streamline this process and accommodate differing platform-specific -settings, this patch introduces a new approach. It generates source -lists for each platform-architecture combination. Consequently, source -lists for all platform-architecture combinations can be directly copied -without subsequent modifications. This simplifies maintenance across -different platforms and architectures. - -Differential Revision: https://phabricator.services.mozilla.com/D206719 - -diff --git a/media/libvpx/generate_sources_mozbuild.sh b/media/libvpx/generate_sources_mozbuild.sh ---- a/media/libvpx/generate_sources_mozbuild.sh -+++ b/media/libvpx/generate_sources_mozbuild.sh -@@ -199,17 +199,17 @@ cd $TEMP_DIR - - echo "Generate config files." - all_platforms="--enable-external-build --disable-examples --disable-install-docs --disable-unit-tests" - all_platforms="${all_platforms} --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic" - all_platforms="${all_platforms} --disable-avx512" - x86_platforms="--enable-postproc --enable-vp9-postproc --as=yasm" - arm_platforms="--enable-runtime-cpu-detect --enable-realtime-only" - arm64_platforms="--enable-realtime-only" --disable_sve="--disable-sve" # Bug 1885585 -+disable_sve="--disable-sve" # Bug 1885585, Bug 1889813 - - gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}" - gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}" - gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}" - gen_config_files mac/ia32 "--target=x86-darwin9-gcc ${all_platforms} ${x86_platforms}" - gen_config_files win/x64 "--target=x86_64-win64-vs15 ${all_platforms} ${x86_platforms}" - gen_config_files win/ia32 "--target=x86-win32-gcc ${all_platforms} ${x86_platforms}" - -@@ -246,44 +246,72 @@ echo "Prepare Makefile." - ./configure --target=generic-gnu > /dev/null - make_clean - - # Remove existing source files. - rm -rf $BASE_DIR/sources.mozbuild - write_license $BASE_DIR/sources.mozbuild - echo "files = {" >> $BASE_DIR/sources.mozbuild - --echo "Generate X86_64 source list." -+echo "Generate X86_64 source list on Linux." - config=$(print_config linux/x64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt X64 -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_X64 -+ -+echo "Generate X86_64 source list on Mac." -+config=$(print_config mac/x64) -+make_clean -+make libvpx_srcs.txt target=libs $config > /dev/null -+convert_srcs_to_project_files libvpx_srcs.txt MAC_X64 -+ -+echo "Generate X86_64 source list on Windows." -+config=$(print_config win/x64) -+make_clean -+make libvpx_srcs.txt target=libs $config > /dev/null -+convert_srcs_to_project_files libvpx_srcs.txt WIN_X64 - - # Copy vpx_version.h once. The file is the same for all platforms. - cp vpx_version.h $BASE_DIR/$LIBVPX_CONFIG_DIR - --echo "Generate IA32 source list." -+echo "Generate IA32 source list on Linux." - config=$(print_config linux/ia32) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt IA32 -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_IA32 -+ -+echo "Generate IA32 source list on Mac." -+config=$(print_config mac/ia32) -+make_clean -+make libvpx_srcs.txt target=libs $config > /dev/null -+convert_srcs_to_project_files libvpx_srcs.txt MAC_IA32 - --echo "Generate ARM source list." -+echo "Generate IA32 source list on Windows." -+config=$(print_config win/ia32) -+make_clean -+make libvpx_srcs.txt target=libs $config > /dev/null -+convert_srcs_to_project_files libvpx_srcs.txt WIN_IA32 -+ -+echo "Generate ARM source list on Linux." - config=$(print_config linux/arm) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt ARM -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM - --echo "Generate ARM64 source list." -+echo "Generate ARM64 source list on Linux" - config=$(print_config linux/arm64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt ARM64 --# Bug 1885585: The sve files will be excluded from the win/aarch64 build in moz.build. --# Bug 1889813: The sve files will be excluded from the linux/arm64 build in moz.build. -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM64 -+ -+echo "Generate AARCH64 source list on Windows." -+config=$(print_config win/aarch64) -+make_clean -+make libvpx_srcs.txt target=libs $config > /dev/null -+convert_srcs_to_project_files libvpx_srcs.txt WIN_AARCH64 - - echo "Generate generic source list." - config=$(print_config generic) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null - convert_srcs_to_project_files libvpx_srcs.txt GENERIC - - echo "}" >> $BASE_DIR/sources.mozbuild -diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build ---- a/media/libvpx/moz.build -+++ b/media/libvpx/moz.build -@@ -9,55 +9,63 @@ with Files('*'): - - include('sources.mozbuild') - - if CONFIG['VPX_USE_NASM']: - USE_NASM = True - - # Linux, Mac and Win share file lists for x86* but not configurations. - if CONFIG['TARGET_CPU'] == 'x86_64': -- EXPORTS.vpx += files['X64_EXPORTS'] -- SOURCES += files['X64_SOURCES'] - if CONFIG['OS_TARGET'] == 'WINNT': -+ EXPORTS.vpx += files['WIN_X64_EXPORTS'] -+ SOURCES += files['WIN_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/x64/' ] - SOURCES += [ '/media/libvpx/config/win/x64/vpx_config.c' ] - elif CONFIG['OS_TARGET'] == 'Darwin': -+ EXPORTS.vpx += files['MAC_X64_EXPORTS'] -+ SOURCES += files['MAC_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/mac/x64/' ] - SOURCES += [ '/media/libvpx/config/mac/x64/vpx_config.c' ] - else: # Android, Linux, BSDs, etc. -+ EXPORTS.vpx += files['LINUX_X64_EXPORTS'] -+ SOURCES += files['LINUX_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/x64/' ] - SOURCES += [ '/media/libvpx/config/linux/x64/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'x86': -- EXPORTS.vpx += files['IA32_EXPORTS'] -- SOURCES += files['IA32_SOURCES'] - if CONFIG['OS_TARGET'] == 'WINNT': -+ EXPORTS.vpx += files['WIN_IA32_EXPORTS'] -+ SOURCES += files['WIN_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/ia32/' ] - SOURCES += [ '/media/libvpx/config/win/ia32/vpx_config.c' ] - elif CONFIG['OS_TARGET'] == 'Darwin': -+ EXPORTS.vpx += files['MAC_IA32_EXPORTS'] -+ SOURCES += files['MAC_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/mac/ia32/' ] - SOURCES += [ '/media/libvpx/config/mac/ia32/vpx_config.c' ] - else: # Android, Linux, BSDs, etc. -+ EXPORTS.vpx += files['LINUX_IA32_EXPORTS'] -+ SOURCES += files['LINUX_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/ia32/' ] - SOURCES += [ '/media/libvpx/config/linux/ia32/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'arm': -- EXPORTS.vpx += files['ARM_EXPORTS'] -+ EXPORTS.vpx += files['LINUX_ARM_EXPORTS'] - ASFLAGS += [ - '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR, - '-I%s/libvpx' % OBJDIR, - ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm/' ] - SOURCES += [ '/media/libvpx/config/linux/arm/vpx_config.c' ] - -- arm_asm_files = files['ARM_SOURCES'] -+ arm_asm_files = files['LINUX_ARM_SOURCES'] - - if CONFIG['GNU_AS']: - SOURCES += sorted([ - "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files - ]) - else: - SOURCES += sorted(arm_asm_files) - -@@ -66,27 +74,24 @@ elif CONFIG['TARGET_CPU'] == 'arm': - SOURCES[f].flags += CONFIG['VPX_ASFLAGS'] - - if CONFIG['OS_TARGET'] == 'Android': - # For cpu-features.h - LOCAL_INCLUDES += [ - '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], - ] - elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] == 'WINNT': -- EXPORTS.vpx += files['ARM64_EXPORTS'] -- # Bug 1885585: clang on win/aarch64 cannot compile SVInt8_t type for now. -- SOURCES += [ -- f for f in files['ARM64_SOURCES'] if not f.endswith('_sve.c') -- ] -+ EXPORTS.vpx += files['WIN_AARCH64_EXPORTS'] -+ SOURCES += files['WIN_AARCH64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/aarch64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/aarch64/' ] - SOURCES += [ '/media/libvpx/config/win/aarch64/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'aarch64': -- EXPORTS.vpx += files['ARM64_EXPORTS'] -- SOURCES += files['ARM64_SOURCES'] -+ EXPORTS.vpx += files['LINUX_ARM64_EXPORTS'] -+ SOURCES += files['LINUX_ARM64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm64/' ] - SOURCES += [ '/media/libvpx/config/linux/arm64/vpx_config.c' ] - else: - # Generic C-only configuration - EXPORTS.vpx += files['GENERIC_EXPORTS'] - SOURCES += files['GENERIC_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/generic/' % TOPSRCDIR ] - - -# HG changeset patch -# User Chun-Min Chang -# Date 1713285445 0 -# Node ID e82d37e48dcd7191cbaa50fc592df4c1277fdf86 -# Parent bdcc287fced58c64dffca97a8d9126606a2b8c1e -Bug 1886378 - Include vpx_config.c directly in source list r=glandium - -Initially, *vpx_config.c* on various platform-architecture combinations -was revmoed from the input list for source list generation and later -added to the source list in moz.build. This was necessary because the -generated list was based solely on architecture, while the vpx_config.c -differed across platform-architecture combinations. - -With the source list generation reworked in the previous patch, each -platform-architecture combination now has its own list. Therefore, -vpx_config.c can be directly included in the source list, simplifying -the process. - -Differential Revision: https://phabricator.services.mozilla.com/D207183 - -diff --git a/media/libvpx/generate_sources_mozbuild.sh b/media/libvpx/generate_sources_mozbuild.sh ---- a/media/libvpx/generate_sources_mozbuild.sh -+++ b/media/libvpx/generate_sources_mozbuild.sh -@@ -64,26 +64,35 @@ function write_sources { - echo " 'libvpx/$f'," >> "$3" - done - echo "]," >> "$3" - } - - # Convert a list of source files into sources.mozbuild. - # $1 - Input file. - # $2 - Output prefix. -+# $3 - Path of vpx_config.c under $LIBVPX_CONFIG_DIR - function convert_srcs_to_project_files { - # Do the following here: - # 1. Filter .c, .h, .s, .S and .asm files. - # 3. Convert .asm.s to .asm because moz.build will do the conversion. - - local source_list=$(grep -E '(\.c|\.h|\.S|\.s|\.asm)$' $1) - -+ # Adjust the path for vpx_config.c while maintaining list order: -+ # Since the config file resides in $BASE_DIR/$LIBVPX_CONFIG_DIR, while the -+ # files in $source_list are placed under $BASE_DIR/libvpx (see write_sources), -+ # the config file path requires adjustment. To ensure the list remains sorted, -+ # we must first remove it and then insert it at the beginning of the list. -+ - # Remove vpx_config.c. -- # The platform-specific vpx_config.c will be added into in moz.build later. - source_list=$(echo "$source_list" | grep -v 'vpx_config\.c') -+ # Insert vpx_config.c at the beginning of the list. -+ local config=$(echo "../$LIBVPX_CONFIG_DIR/$3/vpx_config.c") -+ source_list=$(echo "$config" ; echo "$source_list") - - # Remove include-only asm files (no object code emitted) - source_list=$(echo "$source_list" | grep -v 'x86_abi_support\.asm') - source_list=$(echo "$source_list" | grep -v 'config\.asm') - - # The actual ARM files end in .asm. We have rules to translate them to .S - source_list=$(echo "$source_list" | sed s/\.asm\.s$/.asm/) - -@@ -250,74 +259,74 @@ make_clean - rm -rf $BASE_DIR/sources.mozbuild - write_license $BASE_DIR/sources.mozbuild - echo "files = {" >> $BASE_DIR/sources.mozbuild - - echo "Generate X86_64 source list on Linux." - config=$(print_config linux/x64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt LINUX_X64 -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_X64 linux/x64 - - echo "Generate X86_64 source list on Mac." - config=$(print_config mac/x64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt MAC_X64 -+convert_srcs_to_project_files libvpx_srcs.txt MAC_X64 mac/x64 - - echo "Generate X86_64 source list on Windows." - config=$(print_config win/x64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt WIN_X64 -+convert_srcs_to_project_files libvpx_srcs.txt WIN_X64 win/x64 - - # Copy vpx_version.h once. The file is the same for all platforms. - cp vpx_version.h $BASE_DIR/$LIBVPX_CONFIG_DIR - - echo "Generate IA32 source list on Linux." - config=$(print_config linux/ia32) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt LINUX_IA32 -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_IA32 linux/ia32 - - echo "Generate IA32 source list on Mac." - config=$(print_config mac/ia32) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt MAC_IA32 -+convert_srcs_to_project_files libvpx_srcs.txt MAC_IA32 mac/ia32 - - echo "Generate IA32 source list on Windows." - config=$(print_config win/ia32) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt WIN_IA32 -+convert_srcs_to_project_files libvpx_srcs.txt WIN_IA32 win/ia32 - - echo "Generate ARM source list on Linux." - config=$(print_config linux/arm) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM linux/arm - - echo "Generate ARM64 source list on Linux" - config=$(print_config linux/arm64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM64 -+convert_srcs_to_project_files libvpx_srcs.txt LINUX_ARM64 linux/arm64 - - echo "Generate AARCH64 source list on Windows." - config=$(print_config win/aarch64) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt WIN_AARCH64 -+convert_srcs_to_project_files libvpx_srcs.txt WIN_AARCH64 win/aarch64 - - echo "Generate generic source list." - config=$(print_config generic) - make_clean - make libvpx_srcs.txt target=libs $config > /dev/null --convert_srcs_to_project_files libvpx_srcs.txt GENERIC -+convert_srcs_to_project_files libvpx_srcs.txt GENERIC generic - - echo "}" >> $BASE_DIR/sources.mozbuild - - echo "Remove temporary directory." - cd $BASE_DIR - rm -rf $TEMP_DIR - - cd $BASE_DIR/$LIBVPX_SRC_DIR -diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build ---- a/media/libvpx/moz.build -+++ b/media/libvpx/moz.build -@@ -14,56 +14,49 @@ if CONFIG['VPX_USE_NASM']: - - # Linux, Mac and Win share file lists for x86* but not configurations. - if CONFIG['TARGET_CPU'] == 'x86_64': - if CONFIG['OS_TARGET'] == 'WINNT': - EXPORTS.vpx += files['WIN_X64_EXPORTS'] - SOURCES += files['WIN_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/x64/' ] -- SOURCES += [ '/media/libvpx/config/win/x64/vpx_config.c' ] - elif CONFIG['OS_TARGET'] == 'Darwin': - EXPORTS.vpx += files['MAC_X64_EXPORTS'] - SOURCES += files['MAC_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/mac/x64/' ] -- SOURCES += [ '/media/libvpx/config/mac/x64/vpx_config.c' ] - else: # Android, Linux, BSDs, etc. - EXPORTS.vpx += files['LINUX_X64_EXPORTS'] - SOURCES += files['LINUX_X64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/x64/' ] -- SOURCES += [ '/media/libvpx/config/linux/x64/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'x86': - if CONFIG['OS_TARGET'] == 'WINNT': - EXPORTS.vpx += files['WIN_IA32_EXPORTS'] - SOURCES += files['WIN_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/ia32/' ] -- SOURCES += [ '/media/libvpx/config/win/ia32/vpx_config.c' ] - elif CONFIG['OS_TARGET'] == 'Darwin': - EXPORTS.vpx += files['MAC_IA32_EXPORTS'] - SOURCES += files['MAC_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/mac/ia32/' ] -- SOURCES += [ '/media/libvpx/config/mac/ia32/vpx_config.c' ] - else: # Android, Linux, BSDs, etc. - EXPORTS.vpx += files['LINUX_IA32_EXPORTS'] - SOURCES += files['LINUX_IA32_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/ia32/' ] -- SOURCES += [ '/media/libvpx/config/linux/ia32/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'arm': - EXPORTS.vpx += files['LINUX_ARM_EXPORTS'] - ASFLAGS += [ - '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR, - '-I%s/libvpx' % OBJDIR, - ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm/' ] -- SOURCES += [ '/media/libvpx/config/linux/arm/vpx_config.c' ] - - arm_asm_files = files['LINUX_ARM_SOURCES'] - - if CONFIG['GNU_AS']: - SOURCES += sorted([ - "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files - ]) - else: -@@ -78,30 +71,27 @@ elif CONFIG['TARGET_CPU'] == 'arm': - LOCAL_INCLUDES += [ - '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], - ] - elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] == 'WINNT': - EXPORTS.vpx += files['WIN_AARCH64_EXPORTS'] - SOURCES += files['WIN_AARCH64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/win/aarch64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/win/aarch64/' ] -- SOURCES += [ '/media/libvpx/config/win/aarch64/vpx_config.c' ] - elif CONFIG['TARGET_CPU'] == 'aarch64': - EXPORTS.vpx += files['LINUX_ARM64_EXPORTS'] - SOURCES += files['LINUX_ARM64_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/linux/arm64/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/linux/arm64/' ] -- SOURCES += [ '/media/libvpx/config/linux/arm64/vpx_config.c' ] - else: - # Generic C-only configuration - EXPORTS.vpx += files['GENERIC_EXPORTS'] - SOURCES += files['GENERIC_SOURCES'] - ASFLAGS += [ '-I%s/media/libvpx/config/generic/' % TOPSRCDIR ] - LOCAL_INCLUDES += [ '/media/libvpx/config/generic/' ] -- SOURCES += [ '/media/libvpx/config/generic/vpx_config.c' ] - - # We allow warnings for third-party code that can be updated from upstream. - AllowCompilerWarnings() - - FINAL_LIBRARY = 'gkcodecs' - NoVisibilityFlags() - - DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h' - - -# HG changeset patch -# User Chun-Min Chang -# Date 1713285445 0 -# Node ID bfaf7b3f0e79df98841fc26d892458631b162e11 -# Parent e82d37e48dcd7191cbaa50fc592df4c1277fdf86 -Bug 1886378 - Update linux/aarch64 sources to SVE-disabled version r=glandium - -This patch updates the linux/aarch64 sources in our code base to the -SVE-disabled version. The commit version remains at 7fb8cec. - -Differential Revision: https://phabricator.services.mozilla.com/D206720 - -diff --git a/media/libvpx/config/linux/arm64/vp9_rtcd.h b/media/libvpx/config/linux/arm64/vp9_rtcd.h ---- a/media/libvpx/config/linux/arm64/vp9_rtcd.h -+++ b/media/libvpx/config/linux/arm64/vp9_rtcd.h -@@ -30,23 +30,21 @@ union int_mv; - struct yv12_buffer_config; - - #ifdef __cplusplus - extern "C" { - #endif - - int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz); - int64_t vp9_block_error_neon(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz); --int64_t vp9_block_error_sve(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz); --RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz); -+#define vp9_block_error vp9_block_error_neon - - int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); - int64_t vp9_block_error_fp_neon(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); --int64_t vp9_block_error_fp_sve(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); --RTCD_EXTERN int64_t (*vp9_block_error_fp)(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -+#define vp9_block_error_fp vp9_block_error_fp_neon - - int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, uint32_t start_mv_sad, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_sad_table *sad_fn_ptr, const struct mv *center_mv); - int vp9_diamond_search_sad_neon(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, uint32_t start_mv_sad, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_sad_table *sad_fn_ptr, const struct mv *center_mv); - #define vp9_diamond_search_sad vp9_diamond_search_sad_neon - - void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); - void vp9_fht16x16_neon(const int16_t *input, tran_low_t *output, int stride, int tx_type); - #define vp9_fht16x16 vp9_fht16x16_neon -@@ -93,20 +91,16 @@ void vp9_rtcd(void); - #ifdef RTCD_C - #include "vpx_ports/arm.h" - static void setup_rtcd_internal(void) - { - int flags = arm_cpu_caps(); - - (void)flags; - -- vp9_block_error = vp9_block_error_neon; -- if (flags & HAS_SVE) vp9_block_error = vp9_block_error_sve; -- vp9_block_error_fp = vp9_block_error_fp_neon; -- if (flags & HAS_SVE) vp9_block_error_fp = vp9_block_error_fp_sve; - } - #endif - - #ifdef __cplusplus - } // extern "C" - #endif - - #endif -diff --git a/media/libvpx/config/linux/arm64/vpx_config.asm b/media/libvpx/config/linux/arm64/vpx_config.asm ---- a/media/libvpx/config/linux/arm64/vpx_config.asm -+++ b/media/libvpx/config/linux/arm64/vpx_config.asm -@@ -7,18 +7,18 @@ - .equ VPX_ARCH_X86 , 0 - .equ VPX_ARCH_X86_64 , 0 - .equ VPX_ARCH_PPC , 0 - .equ VPX_ARCH_LOONGARCH , 0 - .equ HAVE_NEON_ASM , 0 - .equ HAVE_NEON , 1 - .equ HAVE_NEON_DOTPROD , 1 - .equ HAVE_NEON_I8MM , 1 --.equ HAVE_SVE , 1 --.equ HAVE_SVE2 , 1 -+.equ HAVE_SVE , 0 -+.equ HAVE_SVE2 , 0 - .equ HAVE_MIPS32 , 0 - .equ HAVE_DSPR2 , 0 - .equ HAVE_MSA , 0 - .equ HAVE_MIPS64 , 0 - .equ HAVE_MMX , 0 - .equ HAVE_SSE , 0 - .equ HAVE_SSE2 , 0 - .equ HAVE_SSE3 , 0 -diff --git a/media/libvpx/config/linux/arm64/vpx_config.c b/media/libvpx/config/linux/arm64/vpx_config.c ---- a/media/libvpx/config/linux/arm64/vpx_config.c -+++ b/media/libvpx/config/linux/arm64/vpx_config.c -@@ -1,10 +1,10 @@ - /* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ - /* */ - /* Use of this source code is governed by a BSD-style license */ - /* that can be found in the LICENSE file in the root of the source */ - /* tree. An additional intellectual property rights grant can be found */ - /* in the file PATENTS. All contributing project authors may */ - /* be found in the AUTHORS file in the root of the source tree. */ - #include "vpx/vpx_codec.h" --static const char* const cfg = "--target=arm64-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --disable-avx512 --enable-realtime-only --log=/home/cm/Work/gecko-dev/media/libvpx/config/linux/arm64/config.log"; -+static const char* const cfg = "--target=arm64-linux-gcc --enable-external-build --disable-examples --disable-install-docs --disable-unit-tests --enable-multi-res-encoding --size-limit=8192x4608 --enable-pic --disable-avx512 --enable-realtime-only --disable-sve --log=/home/cm/Work/gecko-dev/media/libvpx/config/linux/arm64/config.log"; - const char *vpx_codec_build_config(void) {return cfg;} -diff --git a/media/libvpx/config/linux/arm64/vpx_config.h b/media/libvpx/config/linux/arm64/vpx_config.h ---- a/media/libvpx/config/linux/arm64/vpx_config.h -+++ b/media/libvpx/config/linux/arm64/vpx_config.h -@@ -16,18 +16,18 @@ - #define VPX_ARCH_X86 0 - #define VPX_ARCH_X86_64 0 - #define VPX_ARCH_PPC 0 - #define VPX_ARCH_LOONGARCH 0 - #define HAVE_NEON_ASM 0 - #define HAVE_NEON 1 - #define HAVE_NEON_DOTPROD 1 - #define HAVE_NEON_I8MM 1 --#define HAVE_SVE 1 --#define HAVE_SVE2 1 -+#define HAVE_SVE 0 -+#define HAVE_SVE2 0 - #define HAVE_MIPS32 0 - #define HAVE_DSPR2 0 - #define HAVE_MSA 0 - #define HAVE_MIPS64 0 - #define HAVE_MMX 0 - #define HAVE_SSE 0 - #define HAVE_SSE2 0 - #define HAVE_SSE3 0 -diff --git a/media/libvpx/config/linux/arm64/vpx_dsp_rtcd.h b/media/libvpx/config/linux/arm64/vpx_dsp_rtcd.h ---- a/media/libvpx/config/linux/arm64/vpx_dsp_rtcd.h -+++ b/media/libvpx/config/linux/arm64/vpx_dsp_rtcd.h -@@ -911,18 +911,17 @@ uint32_t vpx_sub_pixel_variance8x8_neon( - #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_neon - - void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); - void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride); - #define vpx_subtract_block vpx_subtract_block_neon - - uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size); - uint64_t vpx_sum_squares_2d_i16_neon(const int16_t *src, int stride, int size); --uint64_t vpx_sum_squares_2d_i16_sve(const int16_t *src, int stride, int size); --RTCD_EXTERN uint64_t (*vpx_sum_squares_2d_i16)(const int16_t *src, int stride, int size); -+#define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_neon - - void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left); - void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left); - #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_neon - - void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left); - void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left); - #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_neon -@@ -1144,18 +1143,16 @@ static void setup_rtcd_internal(void) - vpx_sad_skip_64x32x4d = vpx_sad_skip_64x32x4d_neon; - if (flags & HAS_NEON_DOTPROD) vpx_sad_skip_64x32x4d = vpx_sad_skip_64x32x4d_neon_dotprod; - vpx_sad_skip_64x64 = vpx_sad_skip_64x64_neon; - if (flags & HAS_NEON_DOTPROD) vpx_sad_skip_64x64 = vpx_sad_skip_64x64_neon_dotprod; - vpx_sad_skip_64x64x4d = vpx_sad_skip_64x64x4d_neon; - if (flags & HAS_NEON_DOTPROD) vpx_sad_skip_64x64x4d = vpx_sad_skip_64x64x4d_neon_dotprod; - vpx_sse = vpx_sse_neon; - if (flags & HAS_NEON_DOTPROD) vpx_sse = vpx_sse_neon_dotprod; -- vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_neon; -- if (flags & HAS_SVE) vpx_sum_squares_2d_i16 = vpx_sum_squares_2d_i16_sve; - vpx_variance16x16 = vpx_variance16x16_neon; - if (flags & HAS_NEON_DOTPROD) vpx_variance16x16 = vpx_variance16x16_neon_dotprod; - vpx_variance16x32 = vpx_variance16x32_neon; - if (flags & HAS_NEON_DOTPROD) vpx_variance16x32 = vpx_variance16x32_neon_dotprod; - vpx_variance16x8 = vpx_variance16x8_neon; - if (flags & HAS_NEON_DOTPROD) vpx_variance16x8 = vpx_variance16x8_neon_dotprod; - vpx_variance32x16 = vpx_variance32x16_neon; - if (flags & HAS_NEON_DOTPROD) vpx_variance32x16 = vpx_variance32x16_neon_dotprod; -diff --git a/media/libvpx/generate_sources_mozbuild.sh b/media/libvpx/generate_sources_mozbuild.sh ---- a/media/libvpx/generate_sources_mozbuild.sh -+++ b/media/libvpx/generate_sources_mozbuild.sh -@@ -78,17 +78,17 @@ function convert_srcs_to_project_files { - local source_list=$(grep -E '(\.c|\.h|\.S|\.s|\.asm)$' $1) - - # Adjust the path for vpx_config.c while maintaining list order: - # Since the config file resides in $BASE_DIR/$LIBVPX_CONFIG_DIR, while the - # files in $source_list are placed under $BASE_DIR/libvpx (see write_sources), - # the config file path requires adjustment. To ensure the list remains sorted, - # we must first remove it and then insert it at the beginning of the list. - -- # Remove vpx_config.c. -+ # Remove vpx_config.c - source_list=$(echo "$source_list" | grep -v 'vpx_config\.c') - # Insert vpx_config.c at the beginning of the list. - local config=$(echo "../$LIBVPX_CONFIG_DIR/$3/vpx_config.c") - source_list=$(echo "$config" ; echo "$source_list") - - # Remove include-only asm files (no object code emitted) - source_list=$(echo "$source_list" | grep -v 'x86_abi_support\.asm') - source_list=$(echo "$source_list" | grep -v 'config\.asm') -diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild ---- a/media/libvpx/sources.mozbuild -+++ b/media/libvpx/sources.mozbuild -@@ -1,12 +1,12 @@ - # This file is generated. Do not edit. - - files = { -- 'X64_EXPORTS': [ -+ 'LINUX_X64_EXPORTS': [ - 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', - 'libvpx/vpx/vp8dx.h', - 'libvpx/vpx/vpx_codec.h', - 'libvpx/vpx/vpx_decoder.h', - 'libvpx/vpx/vpx_encoder.h', - 'libvpx/vpx/vpx_ext_ratectrl.h', - 'libvpx/vpx/vpx_frame_buffer.h', -@@ -20,17 +20,574 @@ files = { - 'libvpx/vpx_ports/mem.h', - 'libvpx/vpx_ports/static_assert.h', - 'libvpx/vpx_ports/system_state.h', - 'libvpx/vpx_ports/vpx_timer.h', - 'libvpx/vpx_ports/x86.h', - 'libvpx/vpx_scale/vpx_scale.h', - 'libvpx/vpx_scale/yv12config.h', - ], -- 'X64_SOURCES': [ -+ 'LINUX_X64_SOURCES': [ -+ 'libvpx/../config/linux/x64/vpx_config.c', -+ 'libvpx/vp8/common/alloccommon.c', -+ 'libvpx/vp8/common/blockd.c', -+ 'libvpx/vp8/common/dequantize.c', -+ 'libvpx/vp8/common/entropy.c', -+ 'libvpx/vp8/common/entropymode.c', -+ 'libvpx/vp8/common/entropymv.c', -+ 'libvpx/vp8/common/extend.c', -+ 'libvpx/vp8/common/filter.c', -+ 'libvpx/vp8/common/findnearmv.c', -+ 'libvpx/vp8/common/generic/systemdependent.c', -+ 'libvpx/vp8/common/idct_blk.c', -+ 'libvpx/vp8/common/idctllm.c', -+ 'libvpx/vp8/common/loopfilter_filters.c', -+ 'libvpx/vp8/common/mbpitch.c', -+ 'libvpx/vp8/common/mfqe.c', -+ 'libvpx/vp8/common/modecont.c', -+ 'libvpx/vp8/common/postproc.c', -+ 'libvpx/vp8/common/quant_common.c', -+ 'libvpx/vp8/common/reconinter.c', -+ 'libvpx/vp8/common/reconintra.c', -+ 'libvpx/vp8/common/reconintra4x4.c', -+ 'libvpx/vp8/common/rtcd.c', -+ 'libvpx/vp8/common/setupintrarecon.c', -+ 'libvpx/vp8/common/swapyv12buffer.c', -+ 'libvpx/vp8/common/treecoder.c', -+ 'libvpx/vp8/common/vp8_loopfilter.c', -+ 'libvpx/vp8/common/vp8_skin_detection.c', -+ 'libvpx/vp8/common/x86/bilinear_filter_sse2.c', -+ 'libvpx/vp8/common/x86/dequantize_mmx.asm', -+ 'libvpx/vp8/common/x86/idct_blk_mmx.c', -+ 'libvpx/vp8/common/x86/idct_blk_sse2.c', -+ 'libvpx/vp8/common/x86/idctllm_mmx.asm', -+ 'libvpx/vp8/common/x86/idctllm_sse2.asm', -+ 'libvpx/vp8/common/x86/iwalsh_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm', -+ 'libvpx/vp8/common/x86/loopfilter_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_x86.c', -+ 'libvpx/vp8/common/x86/mfqe_sse2.asm', -+ 'libvpx/vp8/common/x86/recon_mmx.asm', -+ 'libvpx/vp8/common/x86/recon_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_mmx.asm', -+ 'libvpx/vp8/common/x86/subpixel_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_ssse3.asm', -+ 'libvpx/vp8/common/x86/vp8_asm_stubs.c', -+ 'libvpx/vp8/decoder/dboolhuff.c', -+ 'libvpx/vp8/decoder/decodeframe.c', -+ 'libvpx/vp8/decoder/decodemv.c', -+ 'libvpx/vp8/decoder/detokenize.c', -+ 'libvpx/vp8/decoder/onyxd_if.c', -+ 'libvpx/vp8/decoder/threading.c', -+ 'libvpx/vp8/encoder/bitstream.c', -+ 'libvpx/vp8/encoder/boolhuff.c', -+ 'libvpx/vp8/encoder/copy_c.c', -+ 'libvpx/vp8/encoder/dct.c', -+ 'libvpx/vp8/encoder/denoising.c', -+ 'libvpx/vp8/encoder/encodeframe.c', -+ 'libvpx/vp8/encoder/encodeintra.c', -+ 'libvpx/vp8/encoder/encodemb.c', -+ 'libvpx/vp8/encoder/encodemv.c', -+ 'libvpx/vp8/encoder/ethreading.c', -+ 'libvpx/vp8/encoder/firstpass.c', -+ 'libvpx/vp8/encoder/lookahead.c', -+ 'libvpx/vp8/encoder/mcomp.c', -+ 'libvpx/vp8/encoder/modecosts.c', -+ 'libvpx/vp8/encoder/mr_dissim.c', -+ 'libvpx/vp8/encoder/onyx_if.c', -+ 'libvpx/vp8/encoder/pickinter.c', -+ 'libvpx/vp8/encoder/picklpf.c', -+ 'libvpx/vp8/encoder/ratectrl.c', -+ 'libvpx/vp8/encoder/rdopt.c', -+ 'libvpx/vp8/encoder/segmentation.c', -+ 'libvpx/vp8/encoder/temporal_filter.c', -+ 'libvpx/vp8/encoder/tokenize.c', -+ 'libvpx/vp8/encoder/treewriter.c', -+ 'libvpx/vp8/encoder/vp8_quantize.c', -+ 'libvpx/vp8/encoder/x86/block_error_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse3.asm', -+ 'libvpx/vp8/encoder/x86/dct_sse2.asm', -+ 'libvpx/vp8/encoder/x86/denoising_sse2.c', -+ 'libvpx/vp8/encoder/x86/fwalsh_sse2.asm', -+ 'libvpx/vp8/encoder/x86/quantize_sse4.c', -+ 'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm', -+ 'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c', -+ 'libvpx/vp8/vp8_cx_iface.c', -+ 'libvpx/vp8/vp8_dx_iface.c', -+ 'libvpx/vp9/common/vp9_alloccommon.c', -+ 'libvpx/vp9/common/vp9_blockd.c', -+ 'libvpx/vp9/common/vp9_common_data.c', -+ 'libvpx/vp9/common/vp9_entropy.c', -+ 'libvpx/vp9/common/vp9_entropymode.c', -+ 'libvpx/vp9/common/vp9_entropymv.c', -+ 'libvpx/vp9/common/vp9_filter.c', -+ 'libvpx/vp9/common/vp9_frame_buffers.c', -+ 'libvpx/vp9/common/vp9_idct.c', -+ 'libvpx/vp9/common/vp9_loopfilter.c', -+ 'libvpx/vp9/common/vp9_mfqe.c', -+ 'libvpx/vp9/common/vp9_mvref_common.c', -+ 'libvpx/vp9/common/vp9_postproc.c', -+ 'libvpx/vp9/common/vp9_pred_common.c', -+ 'libvpx/vp9/common/vp9_quant_common.c', -+ 'libvpx/vp9/common/vp9_reconinter.c', -+ 'libvpx/vp9/common/vp9_reconintra.c', -+ 'libvpx/vp9/common/vp9_rtcd.c', -+ 'libvpx/vp9/common/vp9_scale.c', -+ 'libvpx/vp9/common/vp9_scan.c', -+ 'libvpx/vp9/common/vp9_seg_common.c', -+ 'libvpx/vp9/common/vp9_thread_common.c', -+ 'libvpx/vp9/common/vp9_tile_common.c', -+ 'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c', -+ 'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm', -+ 'libvpx/vp9/decoder/vp9_decodeframe.c', -+ 'libvpx/vp9/decoder/vp9_decodemv.c', -+ 'libvpx/vp9/decoder/vp9_decoder.c', -+ 'libvpx/vp9/decoder/vp9_detokenize.c', -+ 'libvpx/vp9/decoder/vp9_dsubexp.c', -+ 'libvpx/vp9/decoder/vp9_job_queue.c', -+ 'libvpx/vp9/encoder/vp9_alt_ref_aq.c', -+ 'libvpx/vp9/encoder/vp9_aq_360.c', -+ 'libvpx/vp9/encoder/vp9_aq_complexity.c', -+ 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', -+ 'libvpx/vp9/encoder/vp9_aq_variance.c', -+ 'libvpx/vp9/encoder/vp9_bitstream.c', -+ 'libvpx/vp9/encoder/vp9_context_tree.c', -+ 'libvpx/vp9/encoder/vp9_cost.c', -+ 'libvpx/vp9/encoder/vp9_dct.c', -+ 'libvpx/vp9/encoder/vp9_encodeframe.c', -+ 'libvpx/vp9/encoder/vp9_encodemb.c', -+ 'libvpx/vp9/encoder/vp9_encodemv.c', -+ 'libvpx/vp9/encoder/vp9_encoder.c', -+ 'libvpx/vp9/encoder/vp9_ethread.c', -+ 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_extend.c', -+ 'libvpx/vp9/encoder/vp9_firstpass.c', -+ 'libvpx/vp9/encoder/vp9_frame_scale.c', -+ 'libvpx/vp9/encoder/vp9_lookahead.c', -+ 'libvpx/vp9/encoder/vp9_mbgraph.c', -+ 'libvpx/vp9/encoder/vp9_mcomp.c', -+ 'libvpx/vp9/encoder/vp9_multi_thread.c', -+ 'libvpx/vp9/encoder/vp9_noise_estimate.c', -+ 'libvpx/vp9/encoder/vp9_picklpf.c', -+ 'libvpx/vp9/encoder/vp9_pickmode.c', -+ 'libvpx/vp9/encoder/vp9_quantize.c', -+ 'libvpx/vp9/encoder/vp9_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_rd.c', -+ 'libvpx/vp9/encoder/vp9_rdopt.c', -+ 'libvpx/vp9/encoder/vp9_resize.c', -+ 'libvpx/vp9/encoder/vp9_segmentation.c', -+ 'libvpx/vp9/encoder/vp9_skin_detection.c', -+ 'libvpx/vp9/encoder/vp9_speed_features.c', -+ 'libvpx/vp9/encoder/vp9_subexp.c', -+ 'libvpx/vp9/encoder/vp9_svc_layercontext.c', -+ 'libvpx/vp9/encoder/vp9_temporal_filter.c', -+ 'libvpx/vp9/encoder/vp9_tokenize.c', -+ 'libvpx/vp9/encoder/vp9_tpl_model.c', -+ 'libvpx/vp9/encoder/vp9_treewriter.c', -+ 'libvpx/vp9/encoder/x86/temporal_filter_sse4.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_error_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_error_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c', -+ 'libvpx/vp9/vp9_cx_iface.c', -+ 'libvpx/vp9/vp9_dx_iface.c', -+ 'libvpx/vp9/vp9_iface_common.c', -+ 'libvpx/vpx/src/vpx_codec.c', -+ 'libvpx/vpx/src/vpx_decoder.c', -+ 'libvpx/vpx/src/vpx_encoder.c', -+ 'libvpx/vpx/src/vpx_image.c', -+ 'libvpx/vpx/src/vpx_tpl.c', -+ 'libvpx/vpx_dsp/add_noise.c', -+ 'libvpx/vpx_dsp/avg.c', -+ 'libvpx/vpx_dsp/bitreader.c', -+ 'libvpx/vpx_dsp/bitreader_buffer.c', -+ 'libvpx/vpx_dsp/bitwriter.c', -+ 'libvpx/vpx_dsp/bitwriter_buffer.c', -+ 'libvpx/vpx_dsp/deblock.c', -+ 'libvpx/vpx_dsp/fwd_txfm.c', -+ 'libvpx/vpx_dsp/intrapred.c', -+ 'libvpx/vpx_dsp/inv_txfm.c', -+ 'libvpx/vpx_dsp/loopfilter.c', -+ 'libvpx/vpx_dsp/prob.c', -+ 'libvpx/vpx_dsp/psnr.c', -+ 'libvpx/vpx_dsp/quantize.c', -+ 'libvpx/vpx_dsp/sad.c', -+ 'libvpx/vpx_dsp/skin_detection.c', -+ 'libvpx/vpx_dsp/sse.c', -+ 'libvpx/vpx_dsp/subtract.c', -+ 'libvpx/vpx_dsp/sum_squares.c', -+ 'libvpx/vpx_dsp/variance.c', -+ 'libvpx/vpx_dsp/vpx_convolve.c', -+ 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', -+ 'libvpx/vpx_dsp/x86/add_noise_sse2.asm', -+ 'libvpx/vpx_dsp/x86/avg_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_ssse3_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/deblock_sse2.asm', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_sse2.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/inv_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c', -+ 'libvpx/vpx_dsp/x86/inv_wht_sse2.asm', -+ 'libvpx/vpx_dsp/x86/loopfilter_avx2.c', -+ 'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/post_proc_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx2.c', -+ 'libvpx/vpx_dsp/x86/quantize_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_ssse3.c', -+ 'libvpx/vpx_dsp/x86/sad4d_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad4d_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sad_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sse_avx2.c', -+ 'libvpx/vpx_dsp/x86/sse_sse4.c', -+ 'libvpx/vpx_dsp/x86/ssim_opt_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm', -+ 'libvpx/vpx_dsp/x86/subtract_avx2.c', -+ 'libvpx/vpx_dsp/x86/subtract_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sum_squares_sse2.c', -+ 'libvpx/vpx_dsp/x86/variance_avx2.c', -+ 'libvpx/vpx_dsp/x86/variance_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm', -+ 'libvpx/vpx_mem/vpx_mem.c', -+ 'libvpx/vpx_ports/emms_mmx.asm', -+ 'libvpx/vpx_ports/float_control_word.asm', -+ 'libvpx/vpx_scale/generic/gen_scalers.c', -+ 'libvpx/vpx_scale/generic/vpx_scale.c', -+ 'libvpx/vpx_scale/generic/yv12config.c', -+ 'libvpx/vpx_scale/generic/yv12extend.c', -+ 'libvpx/vpx_scale/vpx_scale_rtcd.c', -+ 'libvpx/vpx_util/vpx_thread.c', -+ 'libvpx/vpx_util/vpx_write_yuv_frame.c', -+], -+ 'MAC_X64_EXPORTS': [ -+ 'libvpx/vpx/vp8.h', -+ 'libvpx/vpx/vp8cx.h', -+ 'libvpx/vpx/vp8dx.h', -+ 'libvpx/vpx/vpx_codec.h', -+ 'libvpx/vpx/vpx_decoder.h', -+ 'libvpx/vpx/vpx_encoder.h', -+ 'libvpx/vpx/vpx_ext_ratectrl.h', -+ 'libvpx/vpx/vpx_frame_buffer.h', -+ 'libvpx/vpx/vpx_image.h', -+ 'libvpx/vpx/vpx_integer.h', -+ 'libvpx/vpx/vpx_tpl.h', -+ 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', -+ 'libvpx/vpx_mem/vpx_mem.h', -+ 'libvpx/vpx_ports/bitops.h', -+ 'libvpx/vpx_ports/compiler_attributes.h', -+ 'libvpx/vpx_ports/mem.h', -+ 'libvpx/vpx_ports/static_assert.h', -+ 'libvpx/vpx_ports/system_state.h', -+ 'libvpx/vpx_ports/vpx_timer.h', -+ 'libvpx/vpx_ports/x86.h', -+ 'libvpx/vpx_scale/vpx_scale.h', -+ 'libvpx/vpx_scale/yv12config.h', -+], -+ 'MAC_X64_SOURCES': [ -+ 'libvpx/../config/mac/x64/vpx_config.c', -+ 'libvpx/vp8/common/alloccommon.c', -+ 'libvpx/vp8/common/blockd.c', -+ 'libvpx/vp8/common/dequantize.c', -+ 'libvpx/vp8/common/entropy.c', -+ 'libvpx/vp8/common/entropymode.c', -+ 'libvpx/vp8/common/entropymv.c', -+ 'libvpx/vp8/common/extend.c', -+ 'libvpx/vp8/common/filter.c', -+ 'libvpx/vp8/common/findnearmv.c', -+ 'libvpx/vp8/common/generic/systemdependent.c', -+ 'libvpx/vp8/common/idct_blk.c', -+ 'libvpx/vp8/common/idctllm.c', -+ 'libvpx/vp8/common/loopfilter_filters.c', -+ 'libvpx/vp8/common/mbpitch.c', -+ 'libvpx/vp8/common/mfqe.c', -+ 'libvpx/vp8/common/modecont.c', -+ 'libvpx/vp8/common/postproc.c', -+ 'libvpx/vp8/common/quant_common.c', -+ 'libvpx/vp8/common/reconinter.c', -+ 'libvpx/vp8/common/reconintra.c', -+ 'libvpx/vp8/common/reconintra4x4.c', -+ 'libvpx/vp8/common/rtcd.c', -+ 'libvpx/vp8/common/setupintrarecon.c', -+ 'libvpx/vp8/common/swapyv12buffer.c', -+ 'libvpx/vp8/common/treecoder.c', -+ 'libvpx/vp8/common/vp8_loopfilter.c', -+ 'libvpx/vp8/common/vp8_skin_detection.c', -+ 'libvpx/vp8/common/x86/bilinear_filter_sse2.c', -+ 'libvpx/vp8/common/x86/dequantize_mmx.asm', -+ 'libvpx/vp8/common/x86/idct_blk_mmx.c', -+ 'libvpx/vp8/common/x86/idct_blk_sse2.c', -+ 'libvpx/vp8/common/x86/idctllm_mmx.asm', -+ 'libvpx/vp8/common/x86/idctllm_sse2.asm', -+ 'libvpx/vp8/common/x86/iwalsh_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_block_sse2_x86_64.asm', -+ 'libvpx/vp8/common/x86/loopfilter_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_x86.c', -+ 'libvpx/vp8/common/x86/mfqe_sse2.asm', -+ 'libvpx/vp8/common/x86/recon_mmx.asm', -+ 'libvpx/vp8/common/x86/recon_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_mmx.asm', -+ 'libvpx/vp8/common/x86/subpixel_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_ssse3.asm', -+ 'libvpx/vp8/common/x86/vp8_asm_stubs.c', -+ 'libvpx/vp8/decoder/dboolhuff.c', -+ 'libvpx/vp8/decoder/decodeframe.c', -+ 'libvpx/vp8/decoder/decodemv.c', -+ 'libvpx/vp8/decoder/detokenize.c', -+ 'libvpx/vp8/decoder/onyxd_if.c', -+ 'libvpx/vp8/decoder/threading.c', -+ 'libvpx/vp8/encoder/bitstream.c', -+ 'libvpx/vp8/encoder/boolhuff.c', -+ 'libvpx/vp8/encoder/copy_c.c', -+ 'libvpx/vp8/encoder/dct.c', -+ 'libvpx/vp8/encoder/denoising.c', -+ 'libvpx/vp8/encoder/encodeframe.c', -+ 'libvpx/vp8/encoder/encodeintra.c', -+ 'libvpx/vp8/encoder/encodemb.c', -+ 'libvpx/vp8/encoder/encodemv.c', -+ 'libvpx/vp8/encoder/ethreading.c', -+ 'libvpx/vp8/encoder/firstpass.c', -+ 'libvpx/vp8/encoder/lookahead.c', -+ 'libvpx/vp8/encoder/mcomp.c', -+ 'libvpx/vp8/encoder/modecosts.c', -+ 'libvpx/vp8/encoder/mr_dissim.c', -+ 'libvpx/vp8/encoder/onyx_if.c', -+ 'libvpx/vp8/encoder/pickinter.c', -+ 'libvpx/vp8/encoder/picklpf.c', -+ 'libvpx/vp8/encoder/ratectrl.c', -+ 'libvpx/vp8/encoder/rdopt.c', -+ 'libvpx/vp8/encoder/segmentation.c', -+ 'libvpx/vp8/encoder/temporal_filter.c', -+ 'libvpx/vp8/encoder/tokenize.c', -+ 'libvpx/vp8/encoder/treewriter.c', -+ 'libvpx/vp8/encoder/vp8_quantize.c', -+ 'libvpx/vp8/encoder/x86/block_error_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse3.asm', -+ 'libvpx/vp8/encoder/x86/dct_sse2.asm', -+ 'libvpx/vp8/encoder/x86/denoising_sse2.c', -+ 'libvpx/vp8/encoder/x86/fwalsh_sse2.asm', -+ 'libvpx/vp8/encoder/x86/quantize_sse4.c', -+ 'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm', -+ 'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c', -+ 'libvpx/vp8/vp8_cx_iface.c', -+ 'libvpx/vp8/vp8_dx_iface.c', -+ 'libvpx/vp9/common/vp9_alloccommon.c', -+ 'libvpx/vp9/common/vp9_blockd.c', -+ 'libvpx/vp9/common/vp9_common_data.c', -+ 'libvpx/vp9/common/vp9_entropy.c', -+ 'libvpx/vp9/common/vp9_entropymode.c', -+ 'libvpx/vp9/common/vp9_entropymv.c', -+ 'libvpx/vp9/common/vp9_filter.c', -+ 'libvpx/vp9/common/vp9_frame_buffers.c', -+ 'libvpx/vp9/common/vp9_idct.c', -+ 'libvpx/vp9/common/vp9_loopfilter.c', -+ 'libvpx/vp9/common/vp9_mfqe.c', -+ 'libvpx/vp9/common/vp9_mvref_common.c', -+ 'libvpx/vp9/common/vp9_postproc.c', -+ 'libvpx/vp9/common/vp9_pred_common.c', -+ 'libvpx/vp9/common/vp9_quant_common.c', -+ 'libvpx/vp9/common/vp9_reconinter.c', -+ 'libvpx/vp9/common/vp9_reconintra.c', -+ 'libvpx/vp9/common/vp9_rtcd.c', -+ 'libvpx/vp9/common/vp9_scale.c', -+ 'libvpx/vp9/common/vp9_scan.c', -+ 'libvpx/vp9/common/vp9_seg_common.c', -+ 'libvpx/vp9/common/vp9_thread_common.c', -+ 'libvpx/vp9/common/vp9_tile_common.c', -+ 'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c', -+ 'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm', -+ 'libvpx/vp9/decoder/vp9_decodeframe.c', -+ 'libvpx/vp9/decoder/vp9_decodemv.c', -+ 'libvpx/vp9/decoder/vp9_decoder.c', -+ 'libvpx/vp9/decoder/vp9_detokenize.c', -+ 'libvpx/vp9/decoder/vp9_dsubexp.c', -+ 'libvpx/vp9/decoder/vp9_job_queue.c', -+ 'libvpx/vp9/encoder/vp9_alt_ref_aq.c', -+ 'libvpx/vp9/encoder/vp9_aq_360.c', -+ 'libvpx/vp9/encoder/vp9_aq_complexity.c', -+ 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', -+ 'libvpx/vp9/encoder/vp9_aq_variance.c', -+ 'libvpx/vp9/encoder/vp9_bitstream.c', -+ 'libvpx/vp9/encoder/vp9_context_tree.c', -+ 'libvpx/vp9/encoder/vp9_cost.c', -+ 'libvpx/vp9/encoder/vp9_dct.c', -+ 'libvpx/vp9/encoder/vp9_encodeframe.c', -+ 'libvpx/vp9/encoder/vp9_encodemb.c', -+ 'libvpx/vp9/encoder/vp9_encodemv.c', -+ 'libvpx/vp9/encoder/vp9_encoder.c', -+ 'libvpx/vp9/encoder/vp9_ethread.c', -+ 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_extend.c', -+ 'libvpx/vp9/encoder/vp9_firstpass.c', -+ 'libvpx/vp9/encoder/vp9_frame_scale.c', -+ 'libvpx/vp9/encoder/vp9_lookahead.c', -+ 'libvpx/vp9/encoder/vp9_mbgraph.c', -+ 'libvpx/vp9/encoder/vp9_mcomp.c', -+ 'libvpx/vp9/encoder/vp9_multi_thread.c', -+ 'libvpx/vp9/encoder/vp9_noise_estimate.c', -+ 'libvpx/vp9/encoder/vp9_picklpf.c', -+ 'libvpx/vp9/encoder/vp9_pickmode.c', -+ 'libvpx/vp9/encoder/vp9_quantize.c', -+ 'libvpx/vp9/encoder/vp9_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_rd.c', -+ 'libvpx/vp9/encoder/vp9_rdopt.c', -+ 'libvpx/vp9/encoder/vp9_resize.c', -+ 'libvpx/vp9/encoder/vp9_segmentation.c', -+ 'libvpx/vp9/encoder/vp9_skin_detection.c', -+ 'libvpx/vp9/encoder/vp9_speed_features.c', -+ 'libvpx/vp9/encoder/vp9_subexp.c', -+ 'libvpx/vp9/encoder/vp9_svc_layercontext.c', -+ 'libvpx/vp9/encoder/vp9_temporal_filter.c', -+ 'libvpx/vp9/encoder/vp9_tokenize.c', -+ 'libvpx/vp9/encoder/vp9_tpl_model.c', -+ 'libvpx/vp9/encoder/vp9_treewriter.c', -+ 'libvpx/vp9/encoder/x86/temporal_filter_sse4.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_error_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_error_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c', -+ 'libvpx/vp9/vp9_cx_iface.c', -+ 'libvpx/vp9/vp9_dx_iface.c', -+ 'libvpx/vp9/vp9_iface_common.c', -+ 'libvpx/vpx/src/vpx_codec.c', -+ 'libvpx/vpx/src/vpx_decoder.c', -+ 'libvpx/vpx/src/vpx_encoder.c', -+ 'libvpx/vpx/src/vpx_image.c', -+ 'libvpx/vpx/src/vpx_tpl.c', -+ 'libvpx/vpx_dsp/add_noise.c', -+ 'libvpx/vpx_dsp/avg.c', -+ 'libvpx/vpx_dsp/bitreader.c', -+ 'libvpx/vpx_dsp/bitreader_buffer.c', -+ 'libvpx/vpx_dsp/bitwriter.c', -+ 'libvpx/vpx_dsp/bitwriter_buffer.c', -+ 'libvpx/vpx_dsp/deblock.c', -+ 'libvpx/vpx_dsp/fwd_txfm.c', -+ 'libvpx/vpx_dsp/intrapred.c', -+ 'libvpx/vpx_dsp/inv_txfm.c', -+ 'libvpx/vpx_dsp/loopfilter.c', -+ 'libvpx/vpx_dsp/prob.c', -+ 'libvpx/vpx_dsp/psnr.c', -+ 'libvpx/vpx_dsp/quantize.c', -+ 'libvpx/vpx_dsp/sad.c', -+ 'libvpx/vpx_dsp/skin_detection.c', -+ 'libvpx/vpx_dsp/sse.c', -+ 'libvpx/vpx_dsp/subtract.c', -+ 'libvpx/vpx_dsp/sum_squares.c', -+ 'libvpx/vpx_dsp/variance.c', -+ 'libvpx/vpx_dsp/vpx_convolve.c', -+ 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', -+ 'libvpx/vpx_dsp/x86/add_noise_sse2.asm', -+ 'libvpx/vpx_dsp/x86/avg_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_ssse3_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/deblock_sse2.asm', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_sse2.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/inv_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c', -+ 'libvpx/vpx_dsp/x86/inv_wht_sse2.asm', -+ 'libvpx/vpx_dsp/x86/loopfilter_avx2.c', -+ 'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/post_proc_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx2.c', -+ 'libvpx/vpx_dsp/x86/quantize_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_ssse3.c', -+ 'libvpx/vpx_dsp/x86/sad4d_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad4d_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sad_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sse_avx2.c', -+ 'libvpx/vpx_dsp/x86/sse_sse4.c', -+ 'libvpx/vpx_dsp/x86/ssim_opt_x86_64.asm', -+ 'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm', -+ 'libvpx/vpx_dsp/x86/subtract_avx2.c', -+ 'libvpx/vpx_dsp/x86/subtract_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sum_squares_sse2.c', -+ 'libvpx/vpx_dsp/x86/variance_avx2.c', -+ 'libvpx/vpx_dsp/x86/variance_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm', -+ 'libvpx/vpx_mem/vpx_mem.c', -+ 'libvpx/vpx_ports/emms_mmx.asm', -+ 'libvpx/vpx_ports/float_control_word.asm', -+ 'libvpx/vpx_scale/generic/gen_scalers.c', -+ 'libvpx/vpx_scale/generic/vpx_scale.c', -+ 'libvpx/vpx_scale/generic/yv12config.c', -+ 'libvpx/vpx_scale/generic/yv12extend.c', -+ 'libvpx/vpx_scale/vpx_scale_rtcd.c', -+ 'libvpx/vpx_util/vpx_thread.c', -+ 'libvpx/vpx_util/vpx_write_yuv_frame.c', -+], -+ 'WIN_X64_EXPORTS': [ -+ 'libvpx/vpx/vp8.h', -+ 'libvpx/vpx/vp8cx.h', -+ 'libvpx/vpx/vp8dx.h', -+ 'libvpx/vpx/vpx_codec.h', -+ 'libvpx/vpx/vpx_decoder.h', -+ 'libvpx/vpx/vpx_encoder.h', -+ 'libvpx/vpx/vpx_ext_ratectrl.h', -+ 'libvpx/vpx/vpx_frame_buffer.h', -+ 'libvpx/vpx/vpx_image.h', -+ 'libvpx/vpx/vpx_integer.h', -+ 'libvpx/vpx/vpx_tpl.h', -+ 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', -+ 'libvpx/vpx_mem/vpx_mem.h', -+ 'libvpx/vpx_ports/bitops.h', -+ 'libvpx/vpx_ports/compiler_attributes.h', -+ 'libvpx/vpx_ports/mem.h', -+ 'libvpx/vpx_ports/static_assert.h', -+ 'libvpx/vpx_ports/system_state.h', -+ 'libvpx/vpx_ports/vpx_timer.h', -+ 'libvpx/vpx_ports/x86.h', -+ 'libvpx/vpx_scale/vpx_scale.h', -+ 'libvpx/vpx_scale/yv12config.h', -+], -+ 'WIN_X64_SOURCES': [ -+ 'libvpx/../config/win/x64/vpx_config.c', - 'libvpx/vp8/common/alloccommon.c', - 'libvpx/vp8/common/blockd.c', - 'libvpx/vp8/common/dequantize.c', - 'libvpx/vp8/common/entropy.c', - 'libvpx/vp8/common/entropymode.c', - 'libvpx/vp8/common/entropymv.c', - 'libvpx/vp8/common/extend.c', - 'libvpx/vp8/common/filter.c', -@@ -273,17 +830,17 @@ files = { - 'libvpx/vpx_scale/generic/gen_scalers.c', - 'libvpx/vpx_scale/generic/vpx_scale.c', - 'libvpx/vpx_scale/generic/yv12config.c', - 'libvpx/vpx_scale/generic/yv12extend.c', - 'libvpx/vpx_scale/vpx_scale_rtcd.c', - 'libvpx/vpx_util/vpx_thread.c', - 'libvpx/vpx_util/vpx_write_yuv_frame.c', - ], -- 'IA32_EXPORTS': [ -+ 'LINUX_IA32_EXPORTS': [ - 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', - 'libvpx/vpx/vp8dx.h', - 'libvpx/vpx/vpx_codec.h', - 'libvpx/vpx/vpx_decoder.h', - 'libvpx/vpx/vpx_encoder.h', - 'libvpx/vpx/vpx_ext_ratectrl.h', - 'libvpx/vpx/vpx_frame_buffer.h', -@@ -297,17 +854,564 @@ files = { - 'libvpx/vpx_ports/mem.h', - 'libvpx/vpx_ports/static_assert.h', - 'libvpx/vpx_ports/system_state.h', - 'libvpx/vpx_ports/vpx_timer.h', - 'libvpx/vpx_ports/x86.h', - 'libvpx/vpx_scale/vpx_scale.h', - 'libvpx/vpx_scale/yv12config.h', - ], -- 'IA32_SOURCES': [ -+ 'LINUX_IA32_SOURCES': [ -+ 'libvpx/../config/linux/ia32/vpx_config.c', -+ 'libvpx/vp8/common/alloccommon.c', -+ 'libvpx/vp8/common/blockd.c', -+ 'libvpx/vp8/common/dequantize.c', -+ 'libvpx/vp8/common/entropy.c', -+ 'libvpx/vp8/common/entropymode.c', -+ 'libvpx/vp8/common/entropymv.c', -+ 'libvpx/vp8/common/extend.c', -+ 'libvpx/vp8/common/filter.c', -+ 'libvpx/vp8/common/findnearmv.c', -+ 'libvpx/vp8/common/generic/systemdependent.c', -+ 'libvpx/vp8/common/idct_blk.c', -+ 'libvpx/vp8/common/idctllm.c', -+ 'libvpx/vp8/common/loopfilter_filters.c', -+ 'libvpx/vp8/common/mbpitch.c', -+ 'libvpx/vp8/common/mfqe.c', -+ 'libvpx/vp8/common/modecont.c', -+ 'libvpx/vp8/common/postproc.c', -+ 'libvpx/vp8/common/quant_common.c', -+ 'libvpx/vp8/common/reconinter.c', -+ 'libvpx/vp8/common/reconintra.c', -+ 'libvpx/vp8/common/reconintra4x4.c', -+ 'libvpx/vp8/common/rtcd.c', -+ 'libvpx/vp8/common/setupintrarecon.c', -+ 'libvpx/vp8/common/swapyv12buffer.c', -+ 'libvpx/vp8/common/treecoder.c', -+ 'libvpx/vp8/common/vp8_loopfilter.c', -+ 'libvpx/vp8/common/vp8_skin_detection.c', -+ 'libvpx/vp8/common/x86/bilinear_filter_sse2.c', -+ 'libvpx/vp8/common/x86/dequantize_mmx.asm', -+ 'libvpx/vp8/common/x86/idct_blk_mmx.c', -+ 'libvpx/vp8/common/x86/idct_blk_sse2.c', -+ 'libvpx/vp8/common/x86/idctllm_mmx.asm', -+ 'libvpx/vp8/common/x86/idctllm_sse2.asm', -+ 'libvpx/vp8/common/x86/iwalsh_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_x86.c', -+ 'libvpx/vp8/common/x86/mfqe_sse2.asm', -+ 'libvpx/vp8/common/x86/recon_mmx.asm', -+ 'libvpx/vp8/common/x86/recon_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_mmx.asm', -+ 'libvpx/vp8/common/x86/subpixel_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_ssse3.asm', -+ 'libvpx/vp8/common/x86/vp8_asm_stubs.c', -+ 'libvpx/vp8/decoder/dboolhuff.c', -+ 'libvpx/vp8/decoder/decodeframe.c', -+ 'libvpx/vp8/decoder/decodemv.c', -+ 'libvpx/vp8/decoder/detokenize.c', -+ 'libvpx/vp8/decoder/onyxd_if.c', -+ 'libvpx/vp8/decoder/threading.c', -+ 'libvpx/vp8/encoder/bitstream.c', -+ 'libvpx/vp8/encoder/boolhuff.c', -+ 'libvpx/vp8/encoder/copy_c.c', -+ 'libvpx/vp8/encoder/dct.c', -+ 'libvpx/vp8/encoder/denoising.c', -+ 'libvpx/vp8/encoder/encodeframe.c', -+ 'libvpx/vp8/encoder/encodeintra.c', -+ 'libvpx/vp8/encoder/encodemb.c', -+ 'libvpx/vp8/encoder/encodemv.c', -+ 'libvpx/vp8/encoder/ethreading.c', -+ 'libvpx/vp8/encoder/firstpass.c', -+ 'libvpx/vp8/encoder/lookahead.c', -+ 'libvpx/vp8/encoder/mcomp.c', -+ 'libvpx/vp8/encoder/modecosts.c', -+ 'libvpx/vp8/encoder/mr_dissim.c', -+ 'libvpx/vp8/encoder/onyx_if.c', -+ 'libvpx/vp8/encoder/pickinter.c', -+ 'libvpx/vp8/encoder/picklpf.c', -+ 'libvpx/vp8/encoder/ratectrl.c', -+ 'libvpx/vp8/encoder/rdopt.c', -+ 'libvpx/vp8/encoder/segmentation.c', -+ 'libvpx/vp8/encoder/temporal_filter.c', -+ 'libvpx/vp8/encoder/tokenize.c', -+ 'libvpx/vp8/encoder/treewriter.c', -+ 'libvpx/vp8/encoder/vp8_quantize.c', -+ 'libvpx/vp8/encoder/x86/block_error_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse3.asm', -+ 'libvpx/vp8/encoder/x86/dct_sse2.asm', -+ 'libvpx/vp8/encoder/x86/denoising_sse2.c', -+ 'libvpx/vp8/encoder/x86/fwalsh_sse2.asm', -+ 'libvpx/vp8/encoder/x86/quantize_sse4.c', -+ 'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm', -+ 'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c', -+ 'libvpx/vp8/vp8_cx_iface.c', -+ 'libvpx/vp8/vp8_dx_iface.c', -+ 'libvpx/vp9/common/vp9_alloccommon.c', -+ 'libvpx/vp9/common/vp9_blockd.c', -+ 'libvpx/vp9/common/vp9_common_data.c', -+ 'libvpx/vp9/common/vp9_entropy.c', -+ 'libvpx/vp9/common/vp9_entropymode.c', -+ 'libvpx/vp9/common/vp9_entropymv.c', -+ 'libvpx/vp9/common/vp9_filter.c', -+ 'libvpx/vp9/common/vp9_frame_buffers.c', -+ 'libvpx/vp9/common/vp9_idct.c', -+ 'libvpx/vp9/common/vp9_loopfilter.c', -+ 'libvpx/vp9/common/vp9_mfqe.c', -+ 'libvpx/vp9/common/vp9_mvref_common.c', -+ 'libvpx/vp9/common/vp9_postproc.c', -+ 'libvpx/vp9/common/vp9_pred_common.c', -+ 'libvpx/vp9/common/vp9_quant_common.c', -+ 'libvpx/vp9/common/vp9_reconinter.c', -+ 'libvpx/vp9/common/vp9_reconintra.c', -+ 'libvpx/vp9/common/vp9_rtcd.c', -+ 'libvpx/vp9/common/vp9_scale.c', -+ 'libvpx/vp9/common/vp9_scan.c', -+ 'libvpx/vp9/common/vp9_seg_common.c', -+ 'libvpx/vp9/common/vp9_thread_common.c', -+ 'libvpx/vp9/common/vp9_tile_common.c', -+ 'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c', -+ 'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm', -+ 'libvpx/vp9/decoder/vp9_decodeframe.c', -+ 'libvpx/vp9/decoder/vp9_decodemv.c', -+ 'libvpx/vp9/decoder/vp9_decoder.c', -+ 'libvpx/vp9/decoder/vp9_detokenize.c', -+ 'libvpx/vp9/decoder/vp9_dsubexp.c', -+ 'libvpx/vp9/decoder/vp9_job_queue.c', -+ 'libvpx/vp9/encoder/vp9_alt_ref_aq.c', -+ 'libvpx/vp9/encoder/vp9_aq_360.c', -+ 'libvpx/vp9/encoder/vp9_aq_complexity.c', -+ 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', -+ 'libvpx/vp9/encoder/vp9_aq_variance.c', -+ 'libvpx/vp9/encoder/vp9_bitstream.c', -+ 'libvpx/vp9/encoder/vp9_context_tree.c', -+ 'libvpx/vp9/encoder/vp9_cost.c', -+ 'libvpx/vp9/encoder/vp9_dct.c', -+ 'libvpx/vp9/encoder/vp9_encodeframe.c', -+ 'libvpx/vp9/encoder/vp9_encodemb.c', -+ 'libvpx/vp9/encoder/vp9_encodemv.c', -+ 'libvpx/vp9/encoder/vp9_encoder.c', -+ 'libvpx/vp9/encoder/vp9_ethread.c', -+ 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_extend.c', -+ 'libvpx/vp9/encoder/vp9_firstpass.c', -+ 'libvpx/vp9/encoder/vp9_frame_scale.c', -+ 'libvpx/vp9/encoder/vp9_lookahead.c', -+ 'libvpx/vp9/encoder/vp9_mbgraph.c', -+ 'libvpx/vp9/encoder/vp9_mcomp.c', -+ 'libvpx/vp9/encoder/vp9_multi_thread.c', -+ 'libvpx/vp9/encoder/vp9_noise_estimate.c', -+ 'libvpx/vp9/encoder/vp9_picklpf.c', -+ 'libvpx/vp9/encoder/vp9_pickmode.c', -+ 'libvpx/vp9/encoder/vp9_quantize.c', -+ 'libvpx/vp9/encoder/vp9_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_rd.c', -+ 'libvpx/vp9/encoder/vp9_rdopt.c', -+ 'libvpx/vp9/encoder/vp9_resize.c', -+ 'libvpx/vp9/encoder/vp9_segmentation.c', -+ 'libvpx/vp9/encoder/vp9_skin_detection.c', -+ 'libvpx/vp9/encoder/vp9_speed_features.c', -+ 'libvpx/vp9/encoder/vp9_subexp.c', -+ 'libvpx/vp9/encoder/vp9_svc_layercontext.c', -+ 'libvpx/vp9/encoder/vp9_temporal_filter.c', -+ 'libvpx/vp9/encoder/vp9_tokenize.c', -+ 'libvpx/vp9/encoder/vp9_tpl_model.c', -+ 'libvpx/vp9/encoder/vp9_treewriter.c', -+ 'libvpx/vp9/encoder/x86/temporal_filter_sse4.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_error_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_error_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c', -+ 'libvpx/vp9/vp9_cx_iface.c', -+ 'libvpx/vp9/vp9_dx_iface.c', -+ 'libvpx/vp9/vp9_iface_common.c', -+ 'libvpx/vpx/src/vpx_codec.c', -+ 'libvpx/vpx/src/vpx_decoder.c', -+ 'libvpx/vpx/src/vpx_encoder.c', -+ 'libvpx/vpx/src/vpx_image.c', -+ 'libvpx/vpx/src/vpx_tpl.c', -+ 'libvpx/vpx_dsp/add_noise.c', -+ 'libvpx/vpx_dsp/avg.c', -+ 'libvpx/vpx_dsp/bitreader.c', -+ 'libvpx/vpx_dsp/bitreader_buffer.c', -+ 'libvpx/vpx_dsp/bitwriter.c', -+ 'libvpx/vpx_dsp/bitwriter_buffer.c', -+ 'libvpx/vpx_dsp/deblock.c', -+ 'libvpx/vpx_dsp/fwd_txfm.c', -+ 'libvpx/vpx_dsp/intrapred.c', -+ 'libvpx/vpx_dsp/inv_txfm.c', -+ 'libvpx/vpx_dsp/loopfilter.c', -+ 'libvpx/vpx_dsp/prob.c', -+ 'libvpx/vpx_dsp/psnr.c', -+ 'libvpx/vpx_dsp/quantize.c', -+ 'libvpx/vpx_dsp/sad.c', -+ 'libvpx/vpx_dsp/skin_detection.c', -+ 'libvpx/vpx_dsp/sse.c', -+ 'libvpx/vpx_dsp/subtract.c', -+ 'libvpx/vpx_dsp/sum_squares.c', -+ 'libvpx/vpx_dsp/variance.c', -+ 'libvpx/vpx_dsp/vpx_convolve.c', -+ 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', -+ 'libvpx/vpx_dsp/x86/add_noise_sse2.asm', -+ 'libvpx/vpx_dsp/x86/avg_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_sse2.c', -+ 'libvpx/vpx_dsp/x86/deblock_sse2.asm', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/intrapred_sse2.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/inv_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c', -+ 'libvpx/vpx_dsp/x86/inv_wht_sse2.asm', -+ 'libvpx/vpx_dsp/x86/loopfilter_avx2.c', -+ 'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/post_proc_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx2.c', -+ 'libvpx/vpx_dsp/x86/quantize_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_ssse3.c', -+ 'libvpx/vpx_dsp/x86/sad4d_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad4d_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sad_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sse_avx2.c', -+ 'libvpx/vpx_dsp/x86/sse_sse4.c', -+ 'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm', -+ 'libvpx/vpx_dsp/x86/subtract_avx2.c', -+ 'libvpx/vpx_dsp/x86/subtract_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sum_squares_sse2.c', -+ 'libvpx/vpx_dsp/x86/variance_avx2.c', -+ 'libvpx/vpx_dsp/x86/variance_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm', -+ 'libvpx/vpx_mem/vpx_mem.c', -+ 'libvpx/vpx_ports/emms_mmx.c', -+ 'libvpx/vpx_scale/generic/gen_scalers.c', -+ 'libvpx/vpx_scale/generic/vpx_scale.c', -+ 'libvpx/vpx_scale/generic/yv12config.c', -+ 'libvpx/vpx_scale/generic/yv12extend.c', -+ 'libvpx/vpx_scale/vpx_scale_rtcd.c', -+ 'libvpx/vpx_util/vpx_thread.c', -+ 'libvpx/vpx_util/vpx_write_yuv_frame.c', -+], -+ 'MAC_IA32_EXPORTS': [ -+ 'libvpx/vpx/vp8.h', -+ 'libvpx/vpx/vp8cx.h', -+ 'libvpx/vpx/vp8dx.h', -+ 'libvpx/vpx/vpx_codec.h', -+ 'libvpx/vpx/vpx_decoder.h', -+ 'libvpx/vpx/vpx_encoder.h', -+ 'libvpx/vpx/vpx_ext_ratectrl.h', -+ 'libvpx/vpx/vpx_frame_buffer.h', -+ 'libvpx/vpx/vpx_image.h', -+ 'libvpx/vpx/vpx_integer.h', -+ 'libvpx/vpx/vpx_tpl.h', -+ 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', -+ 'libvpx/vpx_mem/vpx_mem.h', -+ 'libvpx/vpx_ports/bitops.h', -+ 'libvpx/vpx_ports/compiler_attributes.h', -+ 'libvpx/vpx_ports/mem.h', -+ 'libvpx/vpx_ports/static_assert.h', -+ 'libvpx/vpx_ports/system_state.h', -+ 'libvpx/vpx_ports/vpx_timer.h', -+ 'libvpx/vpx_ports/x86.h', -+ 'libvpx/vpx_scale/vpx_scale.h', -+ 'libvpx/vpx_scale/yv12config.h', -+], -+ 'MAC_IA32_SOURCES': [ -+ 'libvpx/../config/mac/ia32/vpx_config.c', -+ 'libvpx/vp8/common/alloccommon.c', -+ 'libvpx/vp8/common/blockd.c', -+ 'libvpx/vp8/common/dequantize.c', -+ 'libvpx/vp8/common/entropy.c', -+ 'libvpx/vp8/common/entropymode.c', -+ 'libvpx/vp8/common/entropymv.c', -+ 'libvpx/vp8/common/extend.c', -+ 'libvpx/vp8/common/filter.c', -+ 'libvpx/vp8/common/findnearmv.c', -+ 'libvpx/vp8/common/generic/systemdependent.c', -+ 'libvpx/vp8/common/idct_blk.c', -+ 'libvpx/vp8/common/idctllm.c', -+ 'libvpx/vp8/common/loopfilter_filters.c', -+ 'libvpx/vp8/common/mbpitch.c', -+ 'libvpx/vp8/common/mfqe.c', -+ 'libvpx/vp8/common/modecont.c', -+ 'libvpx/vp8/common/postproc.c', -+ 'libvpx/vp8/common/quant_common.c', -+ 'libvpx/vp8/common/reconinter.c', -+ 'libvpx/vp8/common/reconintra.c', -+ 'libvpx/vp8/common/reconintra4x4.c', -+ 'libvpx/vp8/common/rtcd.c', -+ 'libvpx/vp8/common/setupintrarecon.c', -+ 'libvpx/vp8/common/swapyv12buffer.c', -+ 'libvpx/vp8/common/treecoder.c', -+ 'libvpx/vp8/common/vp8_loopfilter.c', -+ 'libvpx/vp8/common/vp8_skin_detection.c', -+ 'libvpx/vp8/common/x86/bilinear_filter_sse2.c', -+ 'libvpx/vp8/common/x86/dequantize_mmx.asm', -+ 'libvpx/vp8/common/x86/idct_blk_mmx.c', -+ 'libvpx/vp8/common/x86/idct_blk_sse2.c', -+ 'libvpx/vp8/common/x86/idctllm_mmx.asm', -+ 'libvpx/vp8/common/x86/idctllm_sse2.asm', -+ 'libvpx/vp8/common/x86/iwalsh_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_sse2.asm', -+ 'libvpx/vp8/common/x86/loopfilter_x86.c', -+ 'libvpx/vp8/common/x86/mfqe_sse2.asm', -+ 'libvpx/vp8/common/x86/recon_mmx.asm', -+ 'libvpx/vp8/common/x86/recon_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_mmx.asm', -+ 'libvpx/vp8/common/x86/subpixel_sse2.asm', -+ 'libvpx/vp8/common/x86/subpixel_ssse3.asm', -+ 'libvpx/vp8/common/x86/vp8_asm_stubs.c', -+ 'libvpx/vp8/decoder/dboolhuff.c', -+ 'libvpx/vp8/decoder/decodeframe.c', -+ 'libvpx/vp8/decoder/decodemv.c', -+ 'libvpx/vp8/decoder/detokenize.c', -+ 'libvpx/vp8/decoder/onyxd_if.c', -+ 'libvpx/vp8/decoder/threading.c', -+ 'libvpx/vp8/encoder/bitstream.c', -+ 'libvpx/vp8/encoder/boolhuff.c', -+ 'libvpx/vp8/encoder/copy_c.c', -+ 'libvpx/vp8/encoder/dct.c', -+ 'libvpx/vp8/encoder/denoising.c', -+ 'libvpx/vp8/encoder/encodeframe.c', -+ 'libvpx/vp8/encoder/encodeintra.c', -+ 'libvpx/vp8/encoder/encodemb.c', -+ 'libvpx/vp8/encoder/encodemv.c', -+ 'libvpx/vp8/encoder/ethreading.c', -+ 'libvpx/vp8/encoder/firstpass.c', -+ 'libvpx/vp8/encoder/lookahead.c', -+ 'libvpx/vp8/encoder/mcomp.c', -+ 'libvpx/vp8/encoder/modecosts.c', -+ 'libvpx/vp8/encoder/mr_dissim.c', -+ 'libvpx/vp8/encoder/onyx_if.c', -+ 'libvpx/vp8/encoder/pickinter.c', -+ 'libvpx/vp8/encoder/picklpf.c', -+ 'libvpx/vp8/encoder/ratectrl.c', -+ 'libvpx/vp8/encoder/rdopt.c', -+ 'libvpx/vp8/encoder/segmentation.c', -+ 'libvpx/vp8/encoder/temporal_filter.c', -+ 'libvpx/vp8/encoder/tokenize.c', -+ 'libvpx/vp8/encoder/treewriter.c', -+ 'libvpx/vp8/encoder/vp8_quantize.c', -+ 'libvpx/vp8/encoder/x86/block_error_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse2.asm', -+ 'libvpx/vp8/encoder/x86/copy_sse3.asm', -+ 'libvpx/vp8/encoder/x86/dct_sse2.asm', -+ 'libvpx/vp8/encoder/x86/denoising_sse2.c', -+ 'libvpx/vp8/encoder/x86/fwalsh_sse2.asm', -+ 'libvpx/vp8/encoder/x86/quantize_sse4.c', -+ 'libvpx/vp8/encoder/x86/temporal_filter_apply_sse2.asm', -+ 'libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_sse2.c', -+ 'libvpx/vp8/encoder/x86/vp8_quantize_ssse3.c', -+ 'libvpx/vp8/vp8_cx_iface.c', -+ 'libvpx/vp8/vp8_dx_iface.c', -+ 'libvpx/vp9/common/vp9_alloccommon.c', -+ 'libvpx/vp9/common/vp9_blockd.c', -+ 'libvpx/vp9/common/vp9_common_data.c', -+ 'libvpx/vp9/common/vp9_entropy.c', -+ 'libvpx/vp9/common/vp9_entropymode.c', -+ 'libvpx/vp9/common/vp9_entropymv.c', -+ 'libvpx/vp9/common/vp9_filter.c', -+ 'libvpx/vp9/common/vp9_frame_buffers.c', -+ 'libvpx/vp9/common/vp9_idct.c', -+ 'libvpx/vp9/common/vp9_loopfilter.c', -+ 'libvpx/vp9/common/vp9_mfqe.c', -+ 'libvpx/vp9/common/vp9_mvref_common.c', -+ 'libvpx/vp9/common/vp9_postproc.c', -+ 'libvpx/vp9/common/vp9_pred_common.c', -+ 'libvpx/vp9/common/vp9_quant_common.c', -+ 'libvpx/vp9/common/vp9_reconinter.c', -+ 'libvpx/vp9/common/vp9_reconintra.c', -+ 'libvpx/vp9/common/vp9_rtcd.c', -+ 'libvpx/vp9/common/vp9_scale.c', -+ 'libvpx/vp9/common/vp9_scan.c', -+ 'libvpx/vp9/common/vp9_seg_common.c', -+ 'libvpx/vp9/common/vp9_thread_common.c', -+ 'libvpx/vp9/common/vp9_tile_common.c', -+ 'libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c', -+ 'libvpx/vp9/common/x86/vp9_mfqe_sse2.asm', -+ 'libvpx/vp9/decoder/vp9_decodeframe.c', -+ 'libvpx/vp9/decoder/vp9_decodemv.c', -+ 'libvpx/vp9/decoder/vp9_decoder.c', -+ 'libvpx/vp9/decoder/vp9_detokenize.c', -+ 'libvpx/vp9/decoder/vp9_dsubexp.c', -+ 'libvpx/vp9/decoder/vp9_job_queue.c', -+ 'libvpx/vp9/encoder/vp9_alt_ref_aq.c', -+ 'libvpx/vp9/encoder/vp9_aq_360.c', -+ 'libvpx/vp9/encoder/vp9_aq_complexity.c', -+ 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', -+ 'libvpx/vp9/encoder/vp9_aq_variance.c', -+ 'libvpx/vp9/encoder/vp9_bitstream.c', -+ 'libvpx/vp9/encoder/vp9_context_tree.c', -+ 'libvpx/vp9/encoder/vp9_cost.c', -+ 'libvpx/vp9/encoder/vp9_dct.c', -+ 'libvpx/vp9/encoder/vp9_encodeframe.c', -+ 'libvpx/vp9/encoder/vp9_encodemb.c', -+ 'libvpx/vp9/encoder/vp9_encodemv.c', -+ 'libvpx/vp9/encoder/vp9_encoder.c', -+ 'libvpx/vp9/encoder/vp9_ethread.c', -+ 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_extend.c', -+ 'libvpx/vp9/encoder/vp9_firstpass.c', -+ 'libvpx/vp9/encoder/vp9_frame_scale.c', -+ 'libvpx/vp9/encoder/vp9_lookahead.c', -+ 'libvpx/vp9/encoder/vp9_mbgraph.c', -+ 'libvpx/vp9/encoder/vp9_mcomp.c', -+ 'libvpx/vp9/encoder/vp9_multi_thread.c', -+ 'libvpx/vp9/encoder/vp9_noise_estimate.c', -+ 'libvpx/vp9/encoder/vp9_picklpf.c', -+ 'libvpx/vp9/encoder/vp9_pickmode.c', -+ 'libvpx/vp9/encoder/vp9_quantize.c', -+ 'libvpx/vp9/encoder/vp9_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_rd.c', -+ 'libvpx/vp9/encoder/vp9_rdopt.c', -+ 'libvpx/vp9/encoder/vp9_resize.c', -+ 'libvpx/vp9/encoder/vp9_segmentation.c', -+ 'libvpx/vp9/encoder/vp9_skin_detection.c', -+ 'libvpx/vp9/encoder/vp9_speed_features.c', -+ 'libvpx/vp9/encoder/vp9_subexp.c', -+ 'libvpx/vp9/encoder/vp9_svc_layercontext.c', -+ 'libvpx/vp9/encoder/vp9_temporal_filter.c', -+ 'libvpx/vp9/encoder/vp9_tokenize.c', -+ 'libvpx/vp9/encoder/vp9_tpl_model.c', -+ 'libvpx/vp9/encoder/vp9_treewriter.c', -+ 'libvpx/vp9/encoder/x86/temporal_filter_sse4.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_dct_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_error_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_error_sse2.asm', -+ 'libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_avx2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_sse2.c', -+ 'libvpx/vp9/encoder/x86/vp9_quantize_ssse3.c', -+ 'libvpx/vp9/vp9_cx_iface.c', -+ 'libvpx/vp9/vp9_dx_iface.c', -+ 'libvpx/vp9/vp9_iface_common.c', -+ 'libvpx/vpx/src/vpx_codec.c', -+ 'libvpx/vpx/src/vpx_decoder.c', -+ 'libvpx/vpx/src/vpx_encoder.c', -+ 'libvpx/vpx/src/vpx_image.c', -+ 'libvpx/vpx/src/vpx_tpl.c', -+ 'libvpx/vpx_dsp/add_noise.c', -+ 'libvpx/vpx_dsp/avg.c', -+ 'libvpx/vpx_dsp/bitreader.c', -+ 'libvpx/vpx_dsp/bitreader_buffer.c', -+ 'libvpx/vpx_dsp/bitwriter.c', -+ 'libvpx/vpx_dsp/bitwriter_buffer.c', -+ 'libvpx/vpx_dsp/deblock.c', -+ 'libvpx/vpx_dsp/fwd_txfm.c', -+ 'libvpx/vpx_dsp/intrapred.c', -+ 'libvpx/vpx_dsp/inv_txfm.c', -+ 'libvpx/vpx_dsp/loopfilter.c', -+ 'libvpx/vpx_dsp/prob.c', -+ 'libvpx/vpx_dsp/psnr.c', -+ 'libvpx/vpx_dsp/quantize.c', -+ 'libvpx/vpx_dsp/sad.c', -+ 'libvpx/vpx_dsp/skin_detection.c', -+ 'libvpx/vpx_dsp/sse.c', -+ 'libvpx/vpx_dsp/subtract.c', -+ 'libvpx/vpx_dsp/sum_squares.c', -+ 'libvpx/vpx_dsp/variance.c', -+ 'libvpx/vpx_dsp/vpx_convolve.c', -+ 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', -+ 'libvpx/vpx_dsp/x86/add_noise_sse2.asm', -+ 'libvpx/vpx_dsp/x86/avg_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_avx2.c', -+ 'libvpx/vpx_dsp/x86/avg_pred_sse2.c', -+ 'libvpx/vpx_dsp/x86/deblock_sse2.asm', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/fwd_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/intrapred_sse2.asm', -+ 'libvpx/vpx_dsp/x86/intrapred_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/inv_txfm_avx2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_sse2.c', -+ 'libvpx/vpx_dsp/x86/inv_txfm_ssse3.c', -+ 'libvpx/vpx_dsp/x86/inv_wht_sse2.asm', -+ 'libvpx/vpx_dsp/x86/loopfilter_avx2.c', -+ 'libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/post_proc_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx.c', -+ 'libvpx/vpx_dsp/x86/quantize_avx2.c', -+ 'libvpx/vpx_dsp/x86/quantize_sse2.c', -+ 'libvpx/vpx_dsp/x86/quantize_ssse3.c', -+ 'libvpx/vpx_dsp/x86/sad4d_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad4d_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sad_avx2.c', -+ 'libvpx/vpx_dsp/x86/sad_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sse_avx2.c', -+ 'libvpx/vpx_dsp/x86/sse_sse4.c', -+ 'libvpx/vpx_dsp/x86/subpel_variance_sse2.asm', -+ 'libvpx/vpx_dsp/x86/subtract_avx2.c', -+ 'libvpx/vpx_dsp/x86/subtract_sse2.asm', -+ 'libvpx/vpx_dsp/x86/sum_squares_sse2.c', -+ 'libvpx/vpx_dsp/x86/variance_avx2.c', -+ 'libvpx/vpx_dsp/x86/variance_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_4t_intrin_sse2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm', -+ 'libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm', -+ 'libvpx/vpx_mem/vpx_mem.c', -+ 'libvpx/vpx_ports/emms_mmx.c', -+ 'libvpx/vpx_scale/generic/gen_scalers.c', -+ 'libvpx/vpx_scale/generic/vpx_scale.c', -+ 'libvpx/vpx_scale/generic/yv12config.c', -+ 'libvpx/vpx_scale/generic/yv12extend.c', -+ 'libvpx/vpx_scale/vpx_scale_rtcd.c', -+ 'libvpx/vpx_util/vpx_thread.c', -+ 'libvpx/vpx_util/vpx_write_yuv_frame.c', -+], -+ 'WIN_IA32_EXPORTS': [ -+ 'libvpx/vpx/vp8.h', -+ 'libvpx/vpx/vp8cx.h', -+ 'libvpx/vpx/vp8dx.h', -+ 'libvpx/vpx/vpx_codec.h', -+ 'libvpx/vpx/vpx_decoder.h', -+ 'libvpx/vpx/vpx_encoder.h', -+ 'libvpx/vpx/vpx_ext_ratectrl.h', -+ 'libvpx/vpx/vpx_frame_buffer.h', -+ 'libvpx/vpx/vpx_image.h', -+ 'libvpx/vpx/vpx_integer.h', -+ 'libvpx/vpx/vpx_tpl.h', -+ 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', -+ 'libvpx/vpx_mem/vpx_mem.h', -+ 'libvpx/vpx_ports/bitops.h', -+ 'libvpx/vpx_ports/compiler_attributes.h', -+ 'libvpx/vpx_ports/mem.h', -+ 'libvpx/vpx_ports/static_assert.h', -+ 'libvpx/vpx_ports/system_state.h', -+ 'libvpx/vpx_ports/vpx_timer.h', -+ 'libvpx/vpx_ports/x86.h', -+ 'libvpx/vpx_scale/vpx_scale.h', -+ 'libvpx/vpx_scale/yv12config.h', -+], -+ 'WIN_IA32_SOURCES': [ -+ 'libvpx/../config/win/ia32/vpx_config.c', - 'libvpx/vp8/common/alloccommon.c', - 'libvpx/vp8/common/blockd.c', - 'libvpx/vp8/common/dequantize.c', - 'libvpx/vp8/common/entropy.c', - 'libvpx/vp8/common/entropymode.c', - 'libvpx/vp8/common/entropymv.c', - 'libvpx/vp8/common/extend.c', - 'libvpx/vp8/common/filter.c', -@@ -545,17 +1649,17 @@ files = { - 'libvpx/vpx_scale/generic/gen_scalers.c', - 'libvpx/vpx_scale/generic/vpx_scale.c', - 'libvpx/vpx_scale/generic/yv12config.c', - 'libvpx/vpx_scale/generic/yv12extend.c', - 'libvpx/vpx_scale/vpx_scale_rtcd.c', - 'libvpx/vpx_util/vpx_thread.c', - 'libvpx/vpx_util/vpx_write_yuv_frame.c', - ], -- 'ARM_EXPORTS': [ -+ 'LINUX_ARM_EXPORTS': [ - 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', - 'libvpx/vpx/vp8dx.h', - 'libvpx/vpx/vpx_codec.h', - 'libvpx/vpx/vpx_decoder.h', - 'libvpx/vpx/vpx_encoder.h', - 'libvpx/vpx/vpx_ext_ratectrl.h', - 'libvpx/vpx/vpx_frame_buffer.h', -@@ -570,17 +1674,18 @@ files = { - 'libvpx/vpx_ports/compiler_attributes.h', - 'libvpx/vpx_ports/mem.h', - 'libvpx/vpx_ports/static_assert.h', - 'libvpx/vpx_ports/system_state.h', - 'libvpx/vpx_ports/vpx_timer.h', - 'libvpx/vpx_scale/vpx_scale.h', - 'libvpx/vpx_scale/yv12config.h', - ], -- 'ARM_SOURCES': [ -+ 'LINUX_ARM_SOURCES': [ -+ 'libvpx/../config/linux/arm/vpx_config.c', - 'libvpx/vp8/common/alloccommon.c', - 'libvpx/vp8/common/arm/loopfilter_arm.c', - 'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c', - 'libvpx/vp8/common/arm/neon/copymem_neon.c', - 'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c', - 'libvpx/vp8/common/arm/neon/dequant_idct_neon.c', - 'libvpx/vp8/common/arm/neon/dequantizeb_neon.c', - 'libvpx/vp8/common/arm/neon/idct_blk_neon.c', -@@ -796,17 +1901,17 @@ files = { - 'libvpx/vpx_scale/generic/gen_scalers.c', - 'libvpx/vpx_scale/generic/vpx_scale.c', - 'libvpx/vpx_scale/generic/yv12config.c', - 'libvpx/vpx_scale/generic/yv12extend.c', - 'libvpx/vpx_scale/vpx_scale_rtcd.c', - 'libvpx/vpx_util/vpx_thread.c', - 'libvpx/vpx_util/vpx_write_yuv_frame.c', - ], -- 'ARM64_EXPORTS': [ -+ 'LINUX_ARM64_EXPORTS': [ - 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', - 'libvpx/vpx/vp8dx.h', - 'libvpx/vpx/vpx_codec.h', - 'libvpx/vpx/vpx_decoder.h', - 'libvpx/vpx/vpx_encoder.h', - 'libvpx/vpx/vpx_ext_ratectrl.h', - 'libvpx/vpx/vpx_frame_buffer.h', -@@ -821,17 +1926,18 @@ files = { - 'libvpx/vpx_ports/compiler_attributes.h', - 'libvpx/vpx_ports/mem.h', - 'libvpx/vpx_ports/static_assert.h', - 'libvpx/vpx_ports/system_state.h', - 'libvpx/vpx_ports/vpx_timer.h', - 'libvpx/vpx_scale/vpx_scale.h', - 'libvpx/vpx_scale/yv12config.h', - ], -- 'ARM64_SOURCES': [ -+ 'LINUX_ARM64_SOURCES': [ -+ 'libvpx/../config/linux/arm64/vpx_config.c', - 'libvpx/vp8/common/alloccommon.c', - 'libvpx/vp8/common/arm/loopfilter_arm.c', - 'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c', - 'libvpx/vp8/common/arm/neon/copymem_neon.c', - 'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c', - 'libvpx/vp8/common/arm/neon/dequant_idct_neon.c', - 'libvpx/vp8/common/arm/neon/dequantizeb_neon.c', - 'libvpx/vp8/common/arm/neon/idct_blk_neon.c', -@@ -929,17 +2035,16 @@ files = { - 'libvpx/vp9/decoder/vp9_decodemv.c', - 'libvpx/vp9/decoder/vp9_decoder.c', - 'libvpx/vp9/decoder/vp9_detokenize.c', - 'libvpx/vp9/decoder/vp9_dsubexp.c', - 'libvpx/vp9/decoder/vp9_job_queue.c', - 'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c', -- 'libvpx/vp9/encoder/arm/neon/vp9_error_sve.c', - 'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c', - 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', - 'libvpx/vp9/encoder/vp9_bitstream.c', - 'libvpx/vp9/encoder/vp9_context_tree.c', - 'libvpx/vp9/encoder/vp9_cost.c', - 'libvpx/vp9/encoder/vp9_dct.c', - 'libvpx/vp9/encoder/vp9_encodeframe.c', -@@ -1002,17 +2107,261 @@ files = { - 'libvpx/vpx_dsp/arm/sad4d_neon_dotprod.c', - 'libvpx/vpx_dsp/arm/sad_neon.c', - 'libvpx/vpx_dsp/arm/sad_neon_dotprod.c', - 'libvpx/vpx_dsp/arm/sse_neon.c', - 'libvpx/vpx_dsp/arm/sse_neon_dotprod.c', - 'libvpx/vpx_dsp/arm/subpel_variance_neon.c', - 'libvpx/vpx_dsp/arm/subtract_neon.c', - 'libvpx/vpx_dsp/arm/sum_squares_neon.c', -- 'libvpx/vpx_dsp/arm/sum_squares_sve.c', -+ 'libvpx/vpx_dsp/arm/variance_neon.c', -+ 'libvpx/vpx_dsp/arm/variance_neon_dotprod.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve8_neon.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c', -+ 'libvpx/vpx_dsp/arm/vpx_convolve_neon.c', -+ 'libvpx/vpx_dsp/arm/vpx_scaled_convolve8_neon.c', -+ 'libvpx/vpx_dsp/avg.c', -+ 'libvpx/vpx_dsp/bitreader.c', -+ 'libvpx/vpx_dsp/bitreader_buffer.c', -+ 'libvpx/vpx_dsp/bitwriter.c', -+ 'libvpx/vpx_dsp/bitwriter_buffer.c', -+ 'libvpx/vpx_dsp/fwd_txfm.c', -+ 'libvpx/vpx_dsp/intrapred.c', -+ 'libvpx/vpx_dsp/inv_txfm.c', -+ 'libvpx/vpx_dsp/loopfilter.c', -+ 'libvpx/vpx_dsp/prob.c', -+ 'libvpx/vpx_dsp/psnr.c', -+ 'libvpx/vpx_dsp/quantize.c', -+ 'libvpx/vpx_dsp/sad.c', -+ 'libvpx/vpx_dsp/skin_detection.c', -+ 'libvpx/vpx_dsp/sse.c', -+ 'libvpx/vpx_dsp/subtract.c', -+ 'libvpx/vpx_dsp/sum_squares.c', -+ 'libvpx/vpx_dsp/variance.c', -+ 'libvpx/vpx_dsp/vpx_convolve.c', -+ 'libvpx/vpx_dsp/vpx_dsp_rtcd.c', -+ 'libvpx/vpx_mem/vpx_mem.c', -+ 'libvpx/vpx_ports/aarch64_cpudetect.c', -+ 'libvpx/vpx_scale/generic/gen_scalers.c', -+ 'libvpx/vpx_scale/generic/vpx_scale.c', -+ 'libvpx/vpx_scale/generic/yv12config.c', -+ 'libvpx/vpx_scale/generic/yv12extend.c', -+ 'libvpx/vpx_scale/vpx_scale_rtcd.c', -+ 'libvpx/vpx_util/vpx_thread.c', -+ 'libvpx/vpx_util/vpx_write_yuv_frame.c', -+], -+ 'WIN_AARCH64_EXPORTS': [ -+ 'libvpx/vpx/vp8.h', -+ 'libvpx/vpx/vp8cx.h', -+ 'libvpx/vpx/vp8dx.h', -+ 'libvpx/vpx/vpx_codec.h', -+ 'libvpx/vpx/vpx_decoder.h', -+ 'libvpx/vpx/vpx_encoder.h', -+ 'libvpx/vpx/vpx_ext_ratectrl.h', -+ 'libvpx/vpx/vpx_frame_buffer.h', -+ 'libvpx/vpx/vpx_image.h', -+ 'libvpx/vpx/vpx_integer.h', -+ 'libvpx/vpx/vpx_tpl.h', -+ 'libvpx/vpx_mem/include/vpx_mem_intrnl.h', -+ 'libvpx/vpx_mem/vpx_mem.h', -+ 'libvpx/vpx_ports/arm.h', -+ 'libvpx/vpx_ports/arm_cpudetect.h', -+ 'libvpx/vpx_ports/bitops.h', -+ 'libvpx/vpx_ports/compiler_attributes.h', -+ 'libvpx/vpx_ports/mem.h', -+ 'libvpx/vpx_ports/static_assert.h', -+ 'libvpx/vpx_ports/system_state.h', -+ 'libvpx/vpx_ports/vpx_timer.h', -+ 'libvpx/vpx_scale/vpx_scale.h', -+ 'libvpx/vpx_scale/yv12config.h', -+], -+ 'WIN_AARCH64_SOURCES': [ -+ 'libvpx/../config/win/aarch64/vpx_config.c', -+ 'libvpx/vp8/common/alloccommon.c', -+ 'libvpx/vp8/common/arm/loopfilter_arm.c', -+ 'libvpx/vp8/common/arm/neon/bilinearpredict_neon.c', -+ 'libvpx/vp8/common/arm/neon/copymem_neon.c', -+ 'libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c', -+ 'libvpx/vp8/common/arm/neon/dequant_idct_neon.c', -+ 'libvpx/vp8/common/arm/neon/dequantizeb_neon.c', -+ 'libvpx/vp8/common/arm/neon/idct_blk_neon.c', -+ 'libvpx/vp8/common/arm/neon/iwalsh_neon.c', -+ 'libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c', -+ 'libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c', -+ 'libvpx/vp8/common/arm/neon/mbloopfilter_neon.c', -+ 'libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c', -+ 'libvpx/vp8/common/arm/neon/sixtappredict_neon.c', -+ 'libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c', -+ 'libvpx/vp8/common/blockd.c', -+ 'libvpx/vp8/common/dequantize.c', -+ 'libvpx/vp8/common/entropy.c', -+ 'libvpx/vp8/common/entropymode.c', -+ 'libvpx/vp8/common/entropymv.c', -+ 'libvpx/vp8/common/extend.c', -+ 'libvpx/vp8/common/filter.c', -+ 'libvpx/vp8/common/findnearmv.c', -+ 'libvpx/vp8/common/generic/systemdependent.c', -+ 'libvpx/vp8/common/idct_blk.c', -+ 'libvpx/vp8/common/idctllm.c', -+ 'libvpx/vp8/common/loopfilter_filters.c', -+ 'libvpx/vp8/common/mbpitch.c', -+ 'libvpx/vp8/common/modecont.c', -+ 'libvpx/vp8/common/quant_common.c', -+ 'libvpx/vp8/common/reconinter.c', -+ 'libvpx/vp8/common/reconintra.c', -+ 'libvpx/vp8/common/reconintra4x4.c', -+ 'libvpx/vp8/common/rtcd.c', -+ 'libvpx/vp8/common/setupintrarecon.c', -+ 'libvpx/vp8/common/swapyv12buffer.c', -+ 'libvpx/vp8/common/treecoder.c', -+ 'libvpx/vp8/common/vp8_loopfilter.c', -+ 'libvpx/vp8/common/vp8_skin_detection.c', -+ 'libvpx/vp8/decoder/dboolhuff.c', -+ 'libvpx/vp8/decoder/decodeframe.c', -+ 'libvpx/vp8/decoder/decodemv.c', -+ 'libvpx/vp8/decoder/detokenize.c', -+ 'libvpx/vp8/decoder/onyxd_if.c', -+ 'libvpx/vp8/decoder/threading.c', -+ 'libvpx/vp8/encoder/arm/neon/denoising_neon.c', -+ 'libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c', -+ 'libvpx/vp8/encoder/arm/neon/shortfdct_neon.c', -+ 'libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c', -+ 'libvpx/vp8/encoder/bitstream.c', -+ 'libvpx/vp8/encoder/boolhuff.c', -+ 'libvpx/vp8/encoder/copy_c.c', -+ 'libvpx/vp8/encoder/dct.c', -+ 'libvpx/vp8/encoder/denoising.c', -+ 'libvpx/vp8/encoder/encodeframe.c', -+ 'libvpx/vp8/encoder/encodeintra.c', -+ 'libvpx/vp8/encoder/encodemb.c', -+ 'libvpx/vp8/encoder/encodemv.c', -+ 'libvpx/vp8/encoder/ethreading.c', -+ 'libvpx/vp8/encoder/lookahead.c', -+ 'libvpx/vp8/encoder/mcomp.c', -+ 'libvpx/vp8/encoder/modecosts.c', -+ 'libvpx/vp8/encoder/mr_dissim.c', -+ 'libvpx/vp8/encoder/onyx_if.c', -+ 'libvpx/vp8/encoder/pickinter.c', -+ 'libvpx/vp8/encoder/picklpf.c', -+ 'libvpx/vp8/encoder/ratectrl.c', -+ 'libvpx/vp8/encoder/rdopt.c', -+ 'libvpx/vp8/encoder/segmentation.c', -+ 'libvpx/vp8/encoder/tokenize.c', -+ 'libvpx/vp8/encoder/treewriter.c', -+ 'libvpx/vp8/encoder/vp8_quantize.c', -+ 'libvpx/vp8/vp8_cx_iface.c', -+ 'libvpx/vp8/vp8_dx_iface.c', -+ 'libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c', -+ 'libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c', -+ 'libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c', -+ 'libvpx/vp9/common/vp9_alloccommon.c', -+ 'libvpx/vp9/common/vp9_blockd.c', -+ 'libvpx/vp9/common/vp9_common_data.c', -+ 'libvpx/vp9/common/vp9_entropy.c', -+ 'libvpx/vp9/common/vp9_entropymode.c', -+ 'libvpx/vp9/common/vp9_entropymv.c', -+ 'libvpx/vp9/common/vp9_filter.c', -+ 'libvpx/vp9/common/vp9_frame_buffers.c', -+ 'libvpx/vp9/common/vp9_idct.c', -+ 'libvpx/vp9/common/vp9_loopfilter.c', -+ 'libvpx/vp9/common/vp9_mvref_common.c', -+ 'libvpx/vp9/common/vp9_pred_common.c', -+ 'libvpx/vp9/common/vp9_quant_common.c', -+ 'libvpx/vp9/common/vp9_reconinter.c', -+ 'libvpx/vp9/common/vp9_reconintra.c', -+ 'libvpx/vp9/common/vp9_rtcd.c', -+ 'libvpx/vp9/common/vp9_scale.c', -+ 'libvpx/vp9/common/vp9_scan.c', -+ 'libvpx/vp9/common/vp9_seg_common.c', -+ 'libvpx/vp9/common/vp9_thread_common.c', -+ 'libvpx/vp9/common/vp9_tile_common.c', -+ 'libvpx/vp9/decoder/vp9_decodeframe.c', -+ 'libvpx/vp9/decoder/vp9_decodemv.c', -+ 'libvpx/vp9/decoder/vp9_decoder.c', -+ 'libvpx/vp9/decoder/vp9_detokenize.c', -+ 'libvpx/vp9/decoder/vp9_dsubexp.c', -+ 'libvpx/vp9/decoder/vp9_job_queue.c', -+ 'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c', -+ 'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c', -+ 'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c', -+ 'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c', -+ 'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c', -+ 'libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c', -+ 'libvpx/vp9/encoder/vp9_bitstream.c', -+ 'libvpx/vp9/encoder/vp9_context_tree.c', -+ 'libvpx/vp9/encoder/vp9_cost.c', -+ 'libvpx/vp9/encoder/vp9_dct.c', -+ 'libvpx/vp9/encoder/vp9_encodeframe.c', -+ 'libvpx/vp9/encoder/vp9_encodemb.c', -+ 'libvpx/vp9/encoder/vp9_encodemv.c', -+ 'libvpx/vp9/encoder/vp9_encoder.c', -+ 'libvpx/vp9/encoder/vp9_ethread.c', -+ 'libvpx/vp9/encoder/vp9_ext_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_extend.c', -+ 'libvpx/vp9/encoder/vp9_frame_scale.c', -+ 'libvpx/vp9/encoder/vp9_lookahead.c', -+ 'libvpx/vp9/encoder/vp9_mcomp.c', -+ 'libvpx/vp9/encoder/vp9_multi_thread.c', -+ 'libvpx/vp9/encoder/vp9_noise_estimate.c', -+ 'libvpx/vp9/encoder/vp9_picklpf.c', -+ 'libvpx/vp9/encoder/vp9_pickmode.c', -+ 'libvpx/vp9/encoder/vp9_quantize.c', -+ 'libvpx/vp9/encoder/vp9_ratectrl.c', -+ 'libvpx/vp9/encoder/vp9_rd.c', -+ 'libvpx/vp9/encoder/vp9_rdopt.c', -+ 'libvpx/vp9/encoder/vp9_resize.c', -+ 'libvpx/vp9/encoder/vp9_segmentation.c', -+ 'libvpx/vp9/encoder/vp9_skin_detection.c', -+ 'libvpx/vp9/encoder/vp9_speed_features.c', -+ 'libvpx/vp9/encoder/vp9_subexp.c', -+ 'libvpx/vp9/encoder/vp9_svc_layercontext.c', -+ 'libvpx/vp9/encoder/vp9_tokenize.c', -+ 'libvpx/vp9/encoder/vp9_tpl_model.c', -+ 'libvpx/vp9/encoder/vp9_treewriter.c', -+ 'libvpx/vp9/vp9_cx_iface.c', -+ 'libvpx/vp9/vp9_dx_iface.c', -+ 'libvpx/vp9/vp9_iface_common.c', -+ 'libvpx/vpx/src/vpx_codec.c', -+ 'libvpx/vpx/src/vpx_decoder.c', -+ 'libvpx/vpx/src/vpx_encoder.c', -+ 'libvpx/vpx/src/vpx_image.c', -+ 'libvpx/vpx/src/vpx_tpl.c', -+ 'libvpx/vpx_dsp/arm/avg_neon.c', -+ 'libvpx/vpx_dsp/arm/avg_pred_neon.c', -+ 'libvpx/vpx_dsp/arm/fdct16x16_neon.c', -+ 'libvpx/vpx_dsp/arm/fdct32x32_neon.c', -+ 'libvpx/vpx_dsp/arm/fdct4x4_neon.c', -+ 'libvpx/vpx_dsp/arm/fdct8x8_neon.c', -+ 'libvpx/vpx_dsp/arm/fdct_partial_neon.c', -+ 'libvpx/vpx_dsp/arm/hadamard_neon.c', -+ 'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct16x16_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct32x32_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct4x4_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c', -+ 'libvpx/vpx_dsp/arm/idct8x8_add_neon.c', -+ 'libvpx/vpx_dsp/arm/intrapred_neon.c', -+ 'libvpx/vpx_dsp/arm/loopfilter_neon.c', -+ 'libvpx/vpx_dsp/arm/quantize_neon.c', -+ 'libvpx/vpx_dsp/arm/sad4d_neon.c', -+ 'libvpx/vpx_dsp/arm/sad4d_neon_dotprod.c', -+ 'libvpx/vpx_dsp/arm/sad_neon.c', -+ 'libvpx/vpx_dsp/arm/sad_neon_dotprod.c', -+ 'libvpx/vpx_dsp/arm/sse_neon.c', -+ 'libvpx/vpx_dsp/arm/sse_neon_dotprod.c', -+ 'libvpx/vpx_dsp/arm/subpel_variance_neon.c', -+ 'libvpx/vpx_dsp/arm/subtract_neon.c', -+ 'libvpx/vpx_dsp/arm/sum_squares_neon.c', - 'libvpx/vpx_dsp/arm/variance_neon.c', - 'libvpx/vpx_dsp/arm/variance_neon_dotprod.c', - 'libvpx/vpx_dsp/arm/vpx_convolve8_neon.c', - 'libvpx/vpx_dsp/arm/vpx_convolve8_neon_dotprod.c', - 'libvpx/vpx_dsp/arm/vpx_convolve8_neon_i8mm.c', - 'libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c', - 'libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c', - 'libvpx/vpx_dsp/arm/vpx_convolve_neon.c', -@@ -1066,16 +2415,17 @@ files = { - 'libvpx/vpx_ports/mem.h', - 'libvpx/vpx_ports/static_assert.h', - 'libvpx/vpx_ports/system_state.h', - 'libvpx/vpx_ports/vpx_timer.h', - 'libvpx/vpx_scale/vpx_scale.h', - 'libvpx/vpx_scale/yv12config.h', - ], - 'GENERIC_SOURCES': [ -+ 'libvpx/../config/generic/vpx_config.c', - 'libvpx/vp8/common/alloccommon.c', - 'libvpx/vp8/common/blockd.c', - 'libvpx/vp8/common/dequantize.c', - 'libvpx/vp8/common/entropy.c', - 'libvpx/vp8/common/entropymode.c', - 'libvpx/vp8/common/entropymv.c', - 'libvpx/vp8/common/extend.c', - 'libvpx/vp8/common/filter.c', - diff --git a/mozilla-libavcodec58_91.patch b/mozilla-libavcodec58_91.patch index 06bce77..3c17140 100644 --- a/mozilla-libavcodec58_91.patch +++ b/mozilla-libavcodec58_91.patch @@ -1,16 +1,16 @@ # HG changeset patch -# Parent 60fc1933af9d4f1769025a6f1d9a60db6b899315 +# Parent fdc16b43f28c2e974929ca702563aaac52799654 diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp --- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp -@@ -36,16 +36,18 @@ static const char* sLibs[] = { - "libavcodec.54.dylib", +@@ -44,16 +44,18 @@ static const char* sLibs[] = { "libavcodec.53.dylib", #elif defined(XP_OPENBSD) "libavcodec.so", // OpenBSD hardly controls the major/minor library version // of ffmpeg and update it regulary on ABI/API changes #else + "libavcodec.so.61", "libavcodec.so.60", "libavcodec.so.59", + "libavcodec.so.58.134", diff --git a/mozilla-rust-disable-future-incompat.patch b/mozilla-rust-disable-future-incompat.patch index 75a1200..272d96c 100644 --- a/mozilla-rust-disable-future-incompat.patch +++ b/mozilla-rust-disable-future-incompat.patch @@ -1,18 +1,18 @@ # HG changeset patch -# Parent 83a5e219b271976ee9dfa46b74ecc1c1c6d49f94 +# Parent 8c5b7b10f09b8cd6a8a6e0e29b92ec88cec6d4ce diff --git a/Cargo.toml b/Cargo.toml --- a/Cargo.toml +++ b/Cargo.toml -@@ -234,8 +234,14 @@ mio_0_8 = { package = "mio", git = "http - path = "third_party/rust/mio-0.6.23" +@@ -238,8 +238,14 @@ mio_0_8 = { package = "mio", git = "http + # Patch `gpu-descriptor` 0.3.0 to remove unnecessary `allocator-api2` dep.: + # Still waiting for the now-merged to be released. + gpu-descriptor = { git = "https://github.com/zakarumych/gpu-descriptor", rev = "7b71a4e47c81903ad75e2c53deb5ab1310f6ff4d" } - [patch."https://github.com/mozilla/uniffi-rs.git"] - uniffi = "0.27.1" - uniffi_bindgen = "0.27.1" - uniffi_build = "0.27.1" - uniffi_macros = "0.27.1" - weedle2 = "=5.0.0" + # Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2. + # There is not going to be new version of mio 0.6, mio now being >= 0.7.11. + [patch.crates-io.mio] + path = "third_party/rust/mio-0.6.23" + +# Package code v0.1.4 uses code "that will be rejected by a future version of Rust" +# Shut up such messages for now to make the build succeed diff --git a/mozilla-silence-no-return-type.patch b/mozilla-silence-no-return-type.patch index d443671..1bb97ff 100644 --- a/mozilla-silence-no-return-type.patch +++ b/mozilla-silence-no-return-type.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent af0655f894a27ef60aa8438af7939a5ebc498df0 +# Parent 45b7287e677b0d0a47091f763c19d75955c291a1 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h @@ -462,7 +462,7 @@ diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libw diff --git a/third_party/libwebrtc/api/rtp_parameters.cc b/third_party/libwebrtc/api/rtp_parameters.cc --- a/third_party/libwebrtc/api/rtp_parameters.cc +++ b/third_party/libwebrtc/api/rtp_parameters.cc -@@ -27,16 +27,17 @@ const char* DegradationPreferenceToStrin +@@ -28,16 +28,17 @@ const char* DegradationPreferenceToStrin case DegradationPreference::MAINTAIN_FRAMERATE: return "maintain-framerate"; case DegradationPreference::MAINTAIN_RESOLUTION: @@ -505,7 +505,7 @@ diff --git a/third_party/libwebrtc/api/video/video_frame_buffer.cc b/third_party diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party/libwebrtc/api/video_codecs/video_codec.cc --- a/third_party/libwebrtc/api/video_codecs/video_codec.cc +++ b/third_party/libwebrtc/api/video_codecs/video_codec.cc -@@ -126,16 +126,17 @@ const char* CodecTypeToPayloadString(Vid +@@ -156,16 +156,17 @@ const char* CodecTypeToPayloadString(Vid case kVideoCodecMultiplex: return kPayloadNameMultiplex; case kVideoCodecGeneric: @@ -526,7 +526,7 @@ diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc --- a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc +++ b/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc -@@ -183,16 +183,17 @@ class VideoEncoderSoftwareFallbackWrappe +@@ -184,16 +184,17 @@ class VideoEncoderSoftwareFallbackWrappe [[fallthrough]]; case EncoderState::kMainEncoderUsed: return encoder_.get(); @@ -544,7 +544,7 @@ diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallb // Settings used in the last InitEncode call and used if a dynamic fallback to // software is required. -@@ -363,16 +364,17 @@ int32_t VideoEncoderSoftwareFallbackWrap +@@ -377,16 +378,17 @@ int32_t VideoEncoderSoftwareFallbackWrap case EncoderState::kMainEncoderUsed: { return EncodeWithMainEncoder(frame, frame_types); } @@ -684,7 +684,7 @@ diff --git a/third_party/libwebrtc/call/video_send_stream.cc b/third_party/libwe diff --git a/third_party/libwebrtc/media/base/codec.cc b/third_party/libwebrtc/media/base/codec.cc --- a/third_party/libwebrtc/media/base/codec.cc +++ b/third_party/libwebrtc/media/base/codec.cc -@@ -200,16 +200,17 @@ bool Codec::Matches(const Codec& codec) +@@ -228,16 +228,17 @@ bool Codec::Matches(const Codec& codec) (codec.bitrate == 0 || bitrate <= 0 || bitrate == codec.bitrate) && ((codec.channels < 2 && channels < 2) || @@ -765,7 +765,7 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc. diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc --- a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc +++ b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc -@@ -94,16 +94,17 @@ GainControl::Mode Agc1ConfigModeToInterf +@@ -96,16 +96,17 @@ GainControl::Mode Agc1ConfigModeToInterf case Agc1Config::kAdaptiveAnalog: return GainControl::kAdaptiveAnalog; case Agc1Config::kAdaptiveDigital: @@ -783,7 +783,7 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_imp // Maximum lengths that frame of samples being passed from the render side to // the capture side can have (does not apply to AEC3). -@@ -161,17 +162,17 @@ int AudioFormatValidityToErrorCode(Audio +@@ -163,17 +164,17 @@ int AudioFormatValidityToErrorCode(Audio case AudioFormatValidity::kValidAndSupported: return AudioProcessing::kNoError; case AudioFormatValidity::kValidButUnsupportedSampleRate: // fall-through @@ -802,7 +802,7 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_imp const StreamConfig& input_config, const StreamConfig& output_config) { AudioFormatValidity input_validity = ValidateAudioFormat(input_config); -@@ -2416,16 +2417,17 @@ void AudioProcessingImpl::InitializeNois +@@ -2420,16 +2421,17 @@ void AudioProcessingImpl::InitializeNois case NoiseSuppresionConfig::kModerate: return NsConfig::SuppressionLevel::k12dB; case NoiseSuppresionConfig::kHigh: @@ -921,12 +921,12 @@ diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screenc diff --git a/third_party/libwebrtc/modules/pacing/bitrate_prober.cc b/third_party/libwebrtc/modules/pacing/bitrate_prober.cc --- a/third_party/libwebrtc/modules/pacing/bitrate_prober.cc +++ b/third_party/libwebrtc/modules/pacing/bitrate_prober.cc -@@ -64,16 +64,17 @@ bool BitrateProber::ReadyToSetActiveStat - return false; - case ProbingState::kInactive: - // If config_.min_packet_size > 0, a "large enough" packet must be sent - // first, before a probe can be generated and sent. Otherwise, send the - // probe asap. +@@ -79,16 +79,17 @@ bool BitrateProber::ReadyToSetActiveStat + return true; + } + // If config_.min_packet_size > 0, a "large enough" packet must be + // sent first, before a probe can be generated and sent. Otherwise, + // send the probe asap. return packet_size >= std::min(RecommendedMinProbeSize(), config_.min_packet_size.Get()); } @@ -934,18 +934,18 @@ diff --git a/third_party/libwebrtc/modules/pacing/bitrate_prober.cc b/third_part } void BitrateProber::OnIncomingPacket(DataSize packet_size) { - if (ReadyToSetActiveState(packet_size)) { - next_probe_time_ = Timestamp::MinusInfinity(); - probing_state_ = ProbingState::kActive; - } + MaybeSetActiveState(packet_size); } + + void BitrateProber::CreateProbeCluster( + const ProbeClusterConfig& cluster_config) { diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc --- a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc -@@ -36,11 +36,12 @@ std::unique_ptr Cr - case kVideoCodecH265: - // TODO(bugs.webrtc.org/13485): Implement VideoRtpDepacketizerH265. +@@ -42,11 +42,12 @@ std::unique_ptr Cr + #else return nullptr; + #endif case kVideoCodecGeneric: case kVideoCodecMultiplex: return std::make_unique(); diff --git a/tar_stamps b/tar_stamps index f63ac9a..bfeddfe 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,10 +1,10 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="126.0.1" +VERSION="127.0" VERSION_SUFFIX="" -PREV_VERSION="126.0" +PREV_VERSION="126.0.1" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="6c033deedc28e5dadb0b99de7336cb6ebb336631" -RELEASE_TIMESTAMP="20240526221752" +RELEASE_TAG="cfd3e02d8411b3a938cda7242dcf044cf03c03d1" +RELEASE_TIMESTAMP="20240606181944"