Browse Source

Revert "de-fuzzing"

This reverts commit 0e72dfc2dcdc55fe346e7cc24a028cc4a23e6fb1.
Bill Gianopoulos 4 years ago
parent
commit
ec3df18851

+ 2 - 2
rel-257/libdav1d/patches/1534321-libdav1d-67a1.patch

@@ -33,8 +33,8 @@ diff --git a/media/libdav1d/moz.build b/media/libdav1d/moz.build
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -380,17 +380,18 @@ def av1(value, target, c_compiler):
-             enabled = True
+@@ -376,17 +376,18 @@ def av1(value, target, milestone):
+         enabled = target.os != 'Android'
      if enabled:
      if enabled:
          return True
          return True
  
  

+ 4 - 3
rel-257/libdav1d/patches/1535038-libdav1d-67a1.patch

@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D23334
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -673,17 +673,17 @@ pref("media.cubeb.sandbox", false);
+@@ -656,17 +656,17 @@ pref("media.cubeb.sandbox", false);
  #endif
  #endif
  
  
  #ifdef MOZ_AV1
  #ifdef MOZ_AV1
@@ -27,5 +27,6 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
  #endif
  #endif
  #endif
  #endif
  
  
- // Set to true to force demux/decode warnings to be treated as errors.
- pref("media.playback.warnings-as-errors", false);
+ pref("media.webaudio.audiocontextoptions-samplerate.enabled", true);
+ 
+

+ 7 - 6
rel-257/libdav1d/patches/1536070-libdav1d-68a1.patch

@@ -128,7 +128,7 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -364,35 +364,24 @@ set_config('MOZ_FFMPEG', ffmpeg)
+@@ -364,35 +364,27 @@ set_config('MOZ_FFMPEG', ffmpeg)
  set_define('MOZ_FFMPEG', ffmpeg)
  set_define('MOZ_FFMPEG', ffmpeg)
  imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
  imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
  
  
@@ -139,17 +139,18 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
  
  
 -@depends('--enable-av1', target, c_compiler)
 -@depends('--enable-av1', target, c_compiler)
 -def av1(value, target, c_compiler):
 -def av1(value, target, c_compiler):
--    enabled = bool(value)
++@depends('--enable-av1', target, milestone)
++def av1(value, target, milestone):
+     enabled = bool(value)
 -    if value.origin == 'default':
 -    if value.origin == 'default':
 -        if target.os == 'WINNT' and target.cpu == 'x86' and \
 -        if target.os == 'WINNT' and target.cpu == 'x86' and \
 -                c_compiler and c_compiler.type == 'msvc':
 -                c_compiler and c_compiler.type == 'msvc':
 -            enabled = False
 -            enabled = False
 -        else:
 -        else:
 -            enabled = True
 -            enabled = True
--    if enabled:
-+@depends('--enable-av1')
-+def av1(value):
-+    if value:
++    if value.origin == 'default' and milestone.is_nightly:
++        enabled = target.os != 'Android'
+     if enabled:
          return True
          return True
  
  
  @depends(target, nasm_version, when=av1 & compile_environment)
  @depends(target, nasm_version, when=av1 & compile_environment)

+ 5 - 5
rel-257/libdav1d/patches/1540124-libdav1d-68a1.patch

@@ -152,11 +152,11 @@ diff --git a/media/libdav1d/moz.build b/media/libdav1d/moz.build
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
 --- a/toolkit/moz.configure
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 +++ b/toolkit/moz.configure
-@@ -371,21 +371,24 @@ option('--disable-av1',
- 
- @depends('--enable-av1')
- def av1(value):
-     if value:
+@@ -374,21 +374,24 @@ def av1(value, target, milestone):
+     enabled = bool(value)
+     if value.origin == 'default' and milestone.is_nightly:
+         enabled = target.os != 'Android'
+     if enabled:
          return True
          return True
  
  
  @depends(target, nasm_version, when=av1 & compile_environment)
  @depends(target, nasm_version, when=av1 & compile_environment)

File diff suppressed because it is too large
+ 1854 - 0
rel-257/libdav1d/patches/series


Some files were not shown because too many files changed in this diff