Bug 1487049 - Update libopus non-unified build files; r=jmspeex
authorDan Minor <dminor@mozilla.com>
Thu, 30 Aug 2018 10:31:19 -0400
changeset 436002 87c44124c772e288a4a556627be73d6005ac6382
parent 436001 5f2915028e3f785513efd3e211aa4efa0a5896be
child 436003 309d6b502c71a21751333c699d47639545fc53cd
push id107770
push userdminor@mozilla.com
push dateWed, 12 Sep 2018 20:27:45 +0000
treeherdermozilla-inbound@309d6b502c71 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmspeex
bugs1487049
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1487049 - Update libopus non-unified build files; r=jmspeex Tags: #secure-revision Bug #: 1487049 Differential Revision: https://phabricator.services.mozilla.com/D4723
media/libopus/nonunified2.patch
media/libopus/sources.mozbuild
media/libopus/update.sh
new file mode 100644
--- /dev/null
+++ b/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',
+ ]
--- 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',
 ]
 
--- a/media/libopus/update.sh
+++ b/media/libopus/update.sh
@@ -70,8 +70,9 @@ sed -e "s/^The git tag\/revision used wa
 sed -e "s/DEFINES\['OPUS_VERSION'\][ \t]*=[ \t]*'\".*\"'/DEFINES['OPUS_VERSION'] = '\"${version}-mozilla\"'/" \
     ${TARGET}/moz.build > ${TARGET}/moz.build+ && \
     mv ${TARGET}/moz.build+ ${TARGET}/moz.build
 
 python gen-sources.py $1
 
 # apply outstanding local patches
 patch -p3 < nonunified.patch
+patch -p3 < nonunified2.patch