make this reflect what really landed

rel-257/libdav1d/patches/9999999-omit-x86-abi-support.patch

@@ -1,68 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1598375293 14400
-#      Tue Aug 25 13:08:13 2020 -0400
-Don't include x86_abi_support.asm in libaom build.
-
-diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
---- a/media/libaom/generate_sources_mozbuild.sh
-+++ b/media/libaom/generate_sources_mozbuild.sh
-@@ -76,16 +76,19 @@ function convert_srcs_to_project_files {
-   # 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)
- 
-   # Remove aom_config.c.
-   source_list=$(echo "$source_list" | grep -v 'aom_config\.c')
- 
-+  # Remove include-only asm files (no object code emitted)
-+  source_list=$(echo "$source_list" | grep -v 'x86_abi_support\.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/)
- 
-   # Exports - everything in aom, aom_mem, aom_ports, aom_scale
-   local exports_list=$(echo "$source_list" | \
-     egrep '^(aom|aom_mem|aom_ports|aom_scale)/.*h$')
-   # but not anything in one level down, like 'internal'
-   exports_list=$(echo "$exports_list" | egrep -v '/(internal|src)/')
-diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
---- a/media/libaom/sources.mozbuild
-+++ b/media/libaom/sources.mozbuild
-@@ -120,17 +120,16 @@ files = {
-     '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
-     '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
-     '../../third_party/aom/aom_dsp/x86/sum_squares_sse2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_avx2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_impl_avx2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_sse2.c',
-     '../../third_party/aom/aom_mem/aom_mem.c',
-     '../../third_party/aom/aom_ports/emms.asm',
--    '../../third_party/aom/aom_ports/x86_abi_support.asm',
-     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-     '../../third_party/aom/aom_scale/generic/aom_scale.c',
-     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-     '../../third_party/aom/aom_scale/generic/yv12config.c',
-     '../../third_party/aom/aom_scale/generic/yv12extend.c',
-     '../../third_party/aom/aom_util/aom_thread.c',
-     '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-     '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',
-@@ -365,17 +364,16 @@ files = {
-     '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
-     '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
-     '../../third_party/aom/aom_dsp/x86/sum_squares_sse2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_avx2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_impl_avx2.c',
-     '../../third_party/aom/aom_dsp/x86/variance_sse2.c',
-     '../../third_party/aom/aom_mem/aom_mem.c',
-     '../../third_party/aom/aom_ports/emms.asm',
--    '../../third_party/aom/aom_ports/x86_abi_support.asm',
-     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-     '../../third_party/aom/aom_scale/generic/aom_scale.c',
-     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-     '../../third_party/aom/aom_scale/generic/yv12config.c',
-     '../../third_party/aom/aom_scale/generic/yv12extend.c',
-     '../../third_party/aom/aom_util/aom_thread.c',
-     '../../third_party/aom/av1/../third_party/fastfeat/fast.c',
-     '../../third_party/aom/av1/../third_party/fastfeat/fast_9.c',

rel-257/libdav1d/patches/TOP-9999999-aom-fix-win32-bustage.patch

@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1598375293 14400
+#      Tue Aug 25 13:08:13 2020 -0400
+Don't include x86_abi_support.asm in libaom build.
+
+diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
+--- a/media/libaom/sources.mozbuild
++++ b/media/libaom/sources.mozbuild
+@@ -431,17 +431,16 @@ files = {
+     '../../third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm',
+     '../../third_party/aom/aom_dsp/x86/subtract_sse2.asm',
+     '../../third_party/aom/aom_dsp/x86/sum_squares_sse2.c',
+     '../../third_party/aom/aom_dsp/x86/variance_avx2.c',
+     '../../third_party/aom/aom_dsp/x86/variance_impl_avx2.c',
+     '../../third_party/aom/aom_dsp/x86/variance_sse2.c',
+     '../../third_party/aom/aom_mem/aom_mem.c',
+     '../../third_party/aom/aom_ports/emms.asm',
+-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
+     '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
+     '../../third_party/aom/aom_scale/generic/aom_scale.c',
+     '../../third_party/aom/aom_scale/generic/gen_scalers.c',
+     '../../third_party/aom/aom_scale/generic/yv12config.c',
+     '../../third_party/aom/aom_scale/generic/yv12extend.c',
+     '../../third_party/aom/aom_util/aom_thread.c',
+     '../../third_party/aom/aom_util/debug_util.c',
+     '../../third_party/aom/av1/av1_cx_iface.c',

rel-257/libdav1d/patches/WIP-9999999-add-missing-code.patch

@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1598385359 14400
-#      Tue Aug 25 15:55:59 2020 -0400
-Add Missing code.
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -665,16 +665,32 @@ pref("media.cubeb.logging_level", "");
- 
- // Cubeb sandbox (remoting) control
- #ifdef XP_LINUX
- pref("media.cubeb.sandbox", true);
- #else
- pref("media.cubeb.sandbox", false);
- #endif
- 
-+#ifdef MOZ_AV1
-+#if defined(XP_WIN) && !defined(_ARM64_)
-+pref("media.av1.enabled", true);
-+pref("media.av1.use-dav1d", true);
-+#elif defined(XP_MACOSX)
-+pref("media.av1.enabled", true);
-+pref("media.av1.use-dav1d", true);
-+#elif defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)
-+pref("media.av1.enabled", true);
-+pref("media.av1.use-dav1d", true);
-+#else
-+pref("media.av1.enabled", false);
-+pref("media.av1.use-dav1d", false);
-+#endif
-+#endif
-+
- // Set to true to force demux/decode warnings to be treated as errors.
- pref("media.playback.warnings-as-errors", false);
- 
- // Weather we allow AMD switchable graphics
- pref("layers.amd-switchable-gfx.enabled", true);
- 
- // Whether to use async panning and zooming
- pref("layers.async-pan-zoom.enabled", true);

rel-257/libdav1d/patches/series

@@ -1910,7 +1910,6 @@ NOBUG-BACKOUT-1480092-libvpx-60.patch
 1533092-libdav1d-67a1.patch
 1519636-PARTIAL-libdav1d-67a1.patch
 1526435-libdav1d-67a1.patch
-TOP-9999999-dav1d-avoid-mColorDepth.patch
 1533559-libdav1d-68a1.patch
 1536538-1-libdav1d-68a1.patch
 1536538-2-libdav1d-68a1.patch
@@ -1926,4 +1925,5 @@ TOP-9999999-dav1d-avoid-mColorDepth.patch
 1540124-libdav1d-68a1.patch
 1549915-libdav1d-68a1.patch
 1540231-libdav1d-68a1.patch
-9999999-omit-x86-abi-support.patch
+TOP-9999999-dav1d-avoid-mColorDepth.patch
+TOP-9999999-aom-fix-win32-bustage.patch