summaryrefslogtreecommitdiffstats
path: root/media/libopus/nonunified.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 19:33:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 19:33:14 +0000
commit36d22d82aa202bb199967e9512281e9a53db42c9 (patch)
tree105e8c98ddea1c1e4784a60a5a6410fa416be2de /media/libopus/nonunified.patch
parentInitial commit. (diff)
downloadfirefox-esr-36d22d82aa202bb199967e9512281e9a53db42c9.tar.xz
firefox-esr-36d22d82aa202bb199967e9512281e9a53db42c9.zip
Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'media/libopus/nonunified.patch')
-rw-r--r--media/libopus/nonunified.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/media/libopus/nonunified.patch b/media/libopus/nonunified.patch
new file mode 100644
index 0000000000..693881b3cf
--- /dev/null
+++ b/media/libopus/nonunified.patch
@@ -0,0 +1,40 @@
+diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild
+index 8a39b9f..dfc2c62 100644
+--- a/media/libopus/sources.mozbuild
++++ b/media/libopus/sources.mozbuild
+@@ -2,8 +2,5 @@
+ 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,17 @@ celt_sources = [
+ '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',
++]
++
+ celt_sources_sse = [
+ 'celt/x86/pitch_sse.c',
+ 'celt/x86/x86_celt_map.c',
+@@ -114,8 +114,6 @@ silk_sources = [
+ 'silk/LP_variable_cutoff.c',
+ 'silk/LPC_analysis_filter.c',
+ 'silk/LPC_fit.c',
+- 'silk/LPC_inv_pred_gain.c',
+- 'silk/NLSF2A.c',
+ 'silk/NLSF_decode.c',
+ 'silk/NLSF_del_dec_quant.c',
+ 'silk/NLSF_encode.c',