media/libopus/nonunified.patch

   1 diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
   2 index 8a39b9f..dfc2c62 100644
   3 --- a/media/libopus/sources.mozbuild
   4 +++ b/media/libopus/sources.mozbuild
   5 @@ -2,8 +2,5 @@
   6  celt_sources = [
   7      'celt/bands.c',
   8 -    'celt/celt.c',
   9 -    'celt/celt_decoder.c',
  10 -    'celt/celt_encoder.c',
  11      'celt/celt_lpc.c',
  12      'celt/cwrs.c',
  13      'celt/entcode.c',
  14 @@ -20,6 +18,17 @@ celt_sources = [
  15      'celt/vq.c',
  16  ]
  17
  18 +opus_nonunified_sources = [
  19 +    # Disabled because of undefined reference to celt_fatal at link time
  20 +    'celt/celt.c',
  21 +    # Disabled because of name clash of opus_custom_encoder_get_size.
  22 +    'celt/celt_decoder.c',
  23 +    'celt/celt_encoder.c',
  24 +    # Disabled for (safe) warning about QA redefinition.
  25 +    'silk/LPC_inv_pred_gain.c',
  26 +    'silk/NLSF2A.c',
  27 +]
  28 +
  29  celt_sources_sse = [
  30      'celt/x86/pitch_sse.c',
  31      'celt/x86/x86_celt_map.c',
  32 @@ -114,8 +114,6 @@ silk_sources = [
  33      'silk/LP_variable_cutoff.c',
  34      'silk/LPC_analysis_filter.c',
  35      'silk/LPC_fit.c',
  36 -    'silk/LPC_inv_pred_gain.c',
  37 -    'silk/NLSF2A.c',
  38      'silk/NLSF_decode.c',
  39      'silk/NLSF_del_dec_quant.c',
  40      'silk/NLSF_encode.c',