Bug 1487049 - Update libopus non-unified build files; r=jmspeex

Tags: #secure-revision

Bug #: 1487049

Differential Revision: https://phabricator.services.mozilla.com/D4723

--HG--
extra : rebase_source : c5f7f27fcfd0eddde40bcb4ad0630e0ecd03f045

media/libopus/nonunified2.patch

@@ -0,0 +1,36 @@
+diff --git a/media/libopus/nonunified2.patch b/media/libopus/nonunified2.patch
+new file mode 100644
+diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
+--- a/media/libopus/sources.mozbuild
++++ b/media/libopus/sources.mozbuild
+@@ -1,12 +1,11 @@
+ # THIS FILE WAS AUTOMATICALLY GENERATED BY gen-sources.py. DO NOT EDIT.
+ celt_sources = [
+     'celt/bands.c',
+-    'celt/celt.c',
+     'celt/celt_lpc.c',
+     'celt/cwrs.c',
+     'celt/entcode.c',
+     'celt/entdec.c',
+     'celt/entenc.c',
+     'celt/kiss_fft.c',
+     'celt/laplace.c',
+     'celt/mathops.c',
+@@ -14,16 +13,18 @@ celt_sources = [
+     'celt/modes.c',
+     'celt/pitch.c',
+     'celt/quant_bands.c',
+     'celt/rate.c',
+     'celt/vq.c',
+ ]
+ 
+ opus_nonunified_sources = [
++    # Disabled because of undefined reference to celt_fatal at link time
++    'celt/celt.c',
+     # Disabled because of name clash of opus_custom_encoder_get_size.
+     'celt/celt_decoder.c',
+     'celt/celt_encoder.c',
+     # Disabled for (safe) warning about QA redefinition.
+     'silk/LPC_inv_pred_gain.c',
+     'silk/NLSF2A.c',
+ ]

media/libopus/sources.mozbuild

@@ -1,7 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED BY gen-sources.py. DO NOT EDIT.
 celt_sources = [
     'celt/bands.c',
-    'celt/celt.c',
     'celt/celt_lpc.c',
     'celt/cwrs.c',
     'celt/entcode.c',
@@ -19,6 +18,8 @@ celt_sources = [
 ]
 
 opus_nonunified_sources = [
+    # Disabled because of undefined reference to celt_fatal at link time
+    'celt/celt.c',
     # Disabled because of name clash of opus_custom_encoder_get_size.
     'celt/celt_decoder.c',
     'celt/celt_encoder.c',

media/libopus/update.sh

@@ -75,3 +75,4 @@ python gen-sources.py $1
 
 # apply outstanding local patches
 patch -p3 < nonunified.patch
+patch -p3 < nonunified2.patch