From 291fed98ca46a7137565621a150ae9f42825b753 Mon Sep 17 00:00:00 2001
From: dimitry <dimitry@google.com>
Date: Thu, 17 Oct 2024 12:45:47 +0000
Subject: [PATCH 1/3] Backup original CMakeList.txt

---
 CMakeLists.txt => CMakeLists.original.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename CMakeLists.txt => CMakeLists.original.txt (100%)

diff --git a/CMakeLists.txt b/CMakeLists.original.txt
similarity index 100%
rename from CMakeLists.txt
rename to CMakeLists.original.txt

From 33db88510436c10842e21b2a0c4489419aeea142 Mon Sep 17 00:00:00 2001
From: dimitry <dimitry@google.com>
Date: Thu, 17 Oct 2024 12:47:11 +0000
Subject: [PATCH 2/3] Add rudimentary but working CMakeList.txt for wasm64

---
 CMakeLists.txt | 165 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..0a4f1c079
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,165 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+add_compile_options(-O3)
+add_link_options(-Wl,--strip-debug)
+
+add_library(libopus SHARED
+        # CELT_SOURCES
+        celt/bands.c
+        celt/celt.c
+        celt/celt_encoder.c
+        celt/celt_decoder.c
+        celt/cwrs.c
+        celt/entcode.c
+        celt/entdec.c
+        celt/entenc.c
+        celt/kiss_fft.c
+        celt/laplace.c
+        celt/mathops.c
+        celt/mdct.c
+        celt/modes.c
+        celt/pitch.c
+        celt/celt_lpc.c
+        celt/quant_bands.c
+        celt/rate.c
+        celt/vq.c
+
+        # SILK_SOURCES
+        silk/CNG.c
+        silk/code_signs.c
+        silk/init_decoder.c
+        silk/decode_core.c
+        silk/decode_frame.c
+        silk/decode_parameters.c
+        silk/decode_indices.c
+        silk/decode_pulses.c
+        silk/decoder_set_fs.c
+        silk/dec_API.c
+        silk/enc_API.c
+        silk/encode_indices.c
+        silk/encode_pulses.c
+        silk/gain_quant.c
+        silk/interpolate.c
+        silk/LP_variable_cutoff.c
+        silk/NLSF_decode.c
+        silk/NSQ.c
+        silk/NSQ_del_dec.c
+        silk/PLC.c
+        silk/shell_coder.c
+        silk/tables_gain.c
+        silk/tables_LTP.c
+        silk/tables_NLSF_CB_NB_MB.c
+        silk/tables_NLSF_CB_WB.c
+        silk/tables_other.c
+        silk/tables_pitch_lag.c
+        silk/tables_pulses_per_block.c
+        silk/VAD.c
+        silk/control_audio_bandwidth.c
+        silk/quant_LTP_gains.c
+        silk/VQ_WMat_EC.c
+        silk/HP_variable_cutoff.c
+        silk/NLSF_encode.c
+        silk/NLSF_VQ.c
+        silk/NLSF_unpack.c
+        silk/NLSF_del_dec_quant.c
+        silk/process_NLSFs.c
+        silk/stereo_LR_to_MS.c
+        silk/stereo_MS_to_LR.c
+        silk/check_control_input.c
+        silk/control_SNR.c
+        silk/init_encoder.c
+        silk/control_codec.c
+        silk/A2NLSF.c
+        silk/ana_filt_bank_1.c
+        silk/biquad_alt.c
+        silk/bwexpander_32.c
+        silk/bwexpander.c
+        silk/debug.c
+        silk/decode_pitch.c
+        silk/inner_prod_aligned.c
+        silk/lin2log.c
+        silk/log2lin.c
+        silk/LPC_analysis_filter.c
+        silk/LPC_fit.c
+        silk/LPC_inv_pred_gain.c
+        silk/table_LSF_cos.c
+        silk/NLSF2A.c
+        silk/NLSF_stabilize.c
+        silk/NLSF_VQ_weights_laroia.c
+        silk/pitch_est_tables.c
+        silk/resampler.c
+        silk/resampler_down2_3.c
+        silk/resampler_down2.c
+        silk/resampler_private_AR2.c
+        silk/resampler_private_down_FIR.c
+        silk/resampler_private_IIR_FIR.c
+        silk/resampler_private_up2_HQ.c
+        silk/resampler_rom.c
+        silk/sigm_Q15.c
+        silk/sort.c
+        silk/sum_sqr_shift.c
+        silk/stereo_decode_pred.c
+        silk/stereo_encode_pred.c
+        silk/stereo_find_predictor.c
+        silk/stereo_quant_pred.c
+
+        # SILK_SOURCES_FIXED
+        silk/fixed/LTP_analysis_filter_FIX.c
+        silk/fixed/LTP_scale_ctrl_FIX.c
+        silk/fixed/corrMatrix_FIX.c
+        silk/fixed/encode_frame_FIX.c
+        silk/fixed/find_LPC_FIX.c
+        silk/fixed/find_LTP_FIX.c
+        silk/fixed/find_pitch_lags_FIX.c
+        silk/fixed/find_pred_coefs_FIX.c
+        silk/fixed/noise_shape_analysis_FIX.c
+        silk/fixed/process_gains_FIX.c
+        silk/fixed/regularize_correlations_FIX.c
+        silk/fixed/residual_energy16_FIX.c
+        silk/fixed/residual_energy_FIX.c
+        silk/fixed/warped_autocorrelation_FIX.c
+        silk/fixed/apply_sine_window_FIX.c
+        silk/fixed/autocorr_FIX.c
+        silk/fixed/burg_modified_FIX.c
+        silk/fixed/k2a_FIX.c
+        silk/fixed/k2a_Q16_FIX.c
+        silk/fixed/pitch_analysis_core_FIX.c
+        silk/fixed/vector_ops_FIX.c
+        silk/fixed/schur64_FIX.c
+        silk/fixed/schur_FIX.c
+
+        # OPUS_SOURCES
+        src/mapping_matrix.c
+        src/opus.c
+        src/opus_decoder.c
+        src/opus_encoder.c
+        src/opus_multistream.c
+        src/opus_multistream_encoder.c
+        src/opus_multistream_decoder.c
+        src/opus_projection_encoder.c
+        src/opus_projection_decoder.c
+        src/repacketizer.c
+        src/extensions.c
+        # OPUS_SOURCES_FLOAT
+        src/analysis.c
+        src/mlp.c
+        src/mlp_data.c
+)
+
+target_include_directories(libopus PUBLIC
+        include
+)
+
+target_include_directories(libopus PRIVATE
+        src
+        celt
+        silk
+        silk/fixed
+)
+
+target_compile_options(libopus PRIVATE
+        -DNULL=0
+        -DFIXED_POINT
+        -DOPUS_BUILD
+        -DUSE_ALLOCA
+)

From 77ccece0456954a7762282e94e4fce561a25f9fa Mon Sep 17 00:00:00 2001
From: dimitry <dimitry@google.com>
Date: Thu, 17 Oct 2024 12:47:48 +0000
Subject: [PATCH 3/3] Fix warning for static vs non-static
 declaration/definitions

In include/opus_custom.h these are declared as OPUS_CUSTOM_EXPORT_STATIC
---
 celt/celt_decoder.c | 4 ++--
 celt/celt_encoder.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 743c2031b..97f033780 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -166,7 +166,7 @@ int celt_decoder_get_size(int channels)
    return opus_custom_decoder_get_size(mode, channels);
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_get_size(const CELTMode *mode, int channels)
+int opus_custom_decoder_get_size(const CELTMode *mode, int channels)
 {
    int size = sizeof(struct CELTDecoder)
             + (channels*(DECODE_BUFFER_SIZE+mode->overlap)-1)*sizeof(celt_sig)
@@ -205,7 +205,7 @@ int celt_decoder_init(CELTDecoder *st, opus_int32 sampling_rate, int channels)
       return OPUS_OK;
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels)
+int opus_custom_decoder_init(CELTDecoder *st, const CELTMode *mode, int channels)
 {
    if (channels < 0 || channels > 2)
       return OPUS_BAD_ARG;
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 7f32a801c..0463fade0 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -133,7 +133,7 @@ int celt_encoder_get_size(int channels)
    return opus_custom_encoder_get_size(mode, channels);
 }
 
-OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_get_size(const CELTMode *mode, int channels)
+int opus_custom_encoder_get_size(const CELTMode *mode, int channels)
 {
    int size = sizeof(struct CELTEncoder)
          + (channels*mode->overlap-1)*sizeof(celt_sig)    /* celt_sig in_mem[channels*mode->overlap]; */