Bug 1229475 - Fix unified build. r=cpearce

This was hacked in without fixing the update script to propagate it.

Put it back manually for now, and add two new conflicting files.

Author: rillian

media/libopus/moz.build

@@ -72,6 +72,7 @@ include('sources.mozbuild')
 UNIFIED_SOURCES += celt_sources
 UNIFIED_SOURCES += silk_sources
 UNIFIED_SOURCES += opus_sources
+SOURCES += opus_nonunified_sources
 
 if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
     LOCAL_INCLUDES += [

media/libopus/nonunified.patch

@@ -0,0 +1,34 @@
+--- sources.mozbuild-	2015-12-31 01:09:35.663118019 -0800
++++ sources.mozbuild	2015-12-31 01:12:04.970093876 -0800
+@@ -2,8 +2,6 @@
+ celt_sources = [
+     'celt/bands.c',
+     'celt/celt.c',
+-    'celt/celt_decoder.c',
+-    'celt/celt_encoder.c',
+     'celt/celt_lpc.c',
+     'celt/cwrs.c',
+     'celt/entcode.c',
+@@ -20,6 +18,13 @@
+     'celt/vq.c',
+ ]
+ 
++opus_nonunified_sources = [
++    'celt/celt_decoder.c',
++    'celt/celt_encoder.c',
++    'silk/LPC_inv_pred_gain.c',
++    'silk/NLSF2A.c',
++]
++
+ celt_sources_sse = [
+     'celt/x86/pitch_sse.c',
+     'celt/x86/x86_celt_map.c',
+@@ -105,8 +110,6 @@
+     'silk/log2lin.c',
+     'silk/LP_variable_cutoff.c',
+     'silk/LPC_analysis_filter.c',
+-    'silk/LPC_inv_pred_gain.c',
+-    'silk/NLSF2A.c',
+     'silk/NLSF_decode.c',
+     'silk/NLSF_del_dec_quant.c',
+     'silk/NLSF_encode.c',

media/libopus/sources.mozbuild

@@ -2,8 +2,6 @@
 celt_sources = [
     'celt/bands.c',
     'celt/celt.c',
-    'celt/celt_decoder.c',
-    'celt/celt_encoder.c',
     'celt/celt_lpc.c',
     'celt/cwrs.c',
     'celt/entcode.c',
@@ -20,6 +18,13 @@ celt_sources = [
     'celt/vq.c',
 ]
 
+opus_nonunified_sources = [
+    'celt/celt_decoder.c',
+    'celt/celt_encoder.c',
+    'silk/LPC_inv_pred_gain.c',
+    'silk/NLSF2A.c',
+]
+
 celt_sources_sse = [
     'celt/x86/pitch_sse.c',
     'celt/x86/x86_celt_map.c',
@@ -105,8 +110,6 @@ silk_sources = [
     'silk/log2lin.c',
     'silk/LP_variable_cutoff.c',
     'silk/LPC_analysis_filter.c',
-    'silk/LPC_inv_pred_gain.c',
-    'silk/NLSF2A.c',
     'silk/NLSF_decode.c',
     'silk/NLSF_del_dec_quant.c',
     'silk/NLSF_encode.c',

media/libopus/update.sh

@@ -76,3 +76,4 @@ python gen-sources.py $1
 # apply outstanding local patches
 patch -p3 < ./gcc-4.8-ICE.patch
 patch -p1 < ./tonality_init.patch
+patch -p0 < nonunified.patch