Merge PR #5879: MAINT: Downgrade Opus submodule

mumble-voip · Dec 26, 2022 · 8dc4655 · 8dc4655
2 parents 4f3c289 + 60d0a86
commit 8dc4655
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "opus"]
+[submodule "3rdparty/opus"]
 	path = 3rdparty/opus
-	url = https://gitlab.xiph.org/xiph/opus.git
+	url = https://github.com/mumble-voip/opus.git
 [submodule "3rdparty/minhook"]
 	path = 3rdparty/minhook
 	url = https://github.com/mumble-voip/minhook.git
@@ -25,3 +25,5 @@
 [submodule "3rdparty/gsl"]
 	path = 3rdparty/gsl
 	url = https://github.com/microsoft/GSL.git
+[submodule "opus"]
+	url = https://github.com/mumble-voip/opus.git
diff --git a/3rdparty/opus b/3rdparty/opus
diff --git a/docs/dev/build-instructions/cmake_options.md b/docs/dev/build-instructions/cmake_options.md
@@ -139,6 +139,11 @@ Build a heavily optimized version, specific to the machine it's being compiled o
 (No description available)
 (Default: ON)
 
+### OPUS_BUILD_TESTS
+
+(No description available)
+(Default: OFF)
+
 ### OPUS_STACK_PROTECTOR
 
 (No description available)

diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
@@ -696,6 +696,7 @@ endif()
 
 if(bundled-opus)
 	option(OPUS_BUILD_SHARED_LIBRARY "" ON)
+	option(OPUS_BUILD_TESTS "" OFF)
 	if(MINGW)
 		option(OPUS_STACK_PROTECTOR "" OFF)
 	endif()
+0 −1		.gitignore
+0 −61		.gitlab-ci.yml
+183 −467		CMakeLists.txt
+6 −27		Makefile.am
+1 −2		OpusConfig.cmake.in
+2 −2		README
+2 −2		README.draft
+0 −3		celt/arch.h
+0 −2		celt/arm/armcpu.c
+4 −3		celt/bands.c
+1 −7		celt/celt_decoder.c
+1 −1		celt/celt_encoder.c
+7 −55		celt/celt_lpc.c
+0 −4		celt/ecintrin.h
+0 −45		celt/fixed_debug.h
+2 −12		celt/fixed_generic.h
+26 −32		celt/float_cast.h
+2 −2		celt/mathops.h
+0 −63		celt/meson.build
+1 −0		celt/os_support.h
+2 −2		celt/stack_alloc.h
+0 −19		celt/tests/meson.build
+3 −3		celt/tests/test_unit_mathops.c
+1 −1		celt/x86/pitch_sse.h
+0 −39		cmake/CFeatureCheck.cmake
+0 −104		cmake/OpusConfig.cmake
+0 −70		cmake/OpusPackageVersion.cmake
+0 −61		cmake/RunTest.cmake
+0 −7		cmake/vla.c
+0 −0		config.h.cmake.in
+0 −13		configure.ac
+6 −11		doc/Doxyfile.in
+1 −10		doc/build_draft.sh
+2 −6		doc/footer.html
+5 −12		doc/header.html
+0 −33		doc/meson.build
+2 −2		doc/release.txt
+4 −15		doc/trivial_example.c
+0 −13		include/meson.build
+2 −2		include/opus_custom.h
+1 −1		include/opus_defines.h
+0 −675		meson.build
+0 −86		meson/get-version.py
+0 −28		meson/read-sources-list.py
+0 −22		meson_options.txt
+0 −4		opus_buildtype.cmake
+43 −0		opus_config.cmake
+83 −36		opus_functions.cmake
+1 −9		opus_sources.cmake
+0 −1		releases.sha2
+0 −4		silk/CNG.c
+1 −2		silk/LPC_fit.c
+1 −1		silk/MacroCount.h
+6 −6		silk/NSQ_del_dec.c
+4 −2		silk/PLC.c
+7 −15		silk/arm/LPC_inv_pred_gain_neon_intr.c
+1 −2		silk/bwexpander_32.c
+4 −6		silk/debug.c
+12 −13		silk/debug.h
+1 −0		silk/decode_frame.c
+0 −1		silk/define.h
+2 −7		silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c
+0 −53		silk/meson.build
+0 −8		silk/tests/meson.build
+0 −3		silk/typedef.h
+0 −2		src/analysis.c
+0 −45		src/meson.build
+50 −40		src/opus_encoder.c
+2 −5		src/opus_multistream_decoder.c
+7 −37		src/repacketizer_demo.c
+0 −34		tests/meson.build
+19 −17		tests/opus_decode_fuzzer.c
+0 −3		tests/test_opus_common.h
+1 −1		tests/test_opus_decode.c
+1 −1		win32/VS2015/common.props