From a4fdc46a80d7da23ba02fa08c3361503b5cdc33c Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Tue, 10 Aug 2021 00:48:42 +0200 Subject: [PATCH] BUILD(opus): Fetch submodule from upstream repository Upon switching to CMake, we kept using our own fork for the repository because a few fixes for the build were needed. Now that the upstream repository works correctly as submodule, we can fetch from it directly. Please note that tests provided in the Opus repository are not built anymore. Fixes #5223. --- .gitmodules | 2 +- 3rdparty/opus | 2 +- src/mumble/CMakeLists.txt | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 035044ac3..082155e71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/mumble-voip/celt-0.7.0.git [submodule "opus"] path = 3rdparty/opus - url = https://github.com/mumble-voip/opus.git + url = https://gitlab.xiph.org/xiph/opus.git [submodule "3rdparty/minhook"] path = 3rdparty/minhook url = https://github.com/mumble-voip/minhook.git diff --git a/3rdparty/opus b/3rdparty/opus index 296d213da..6b6035ae4 160000 --- a/3rdparty/opus +++ b/3rdparty/opus @@ -1 +1 @@ -Subproject commit 296d213da679eea977a869583b59f1e5a51b9ff5 +Subproject commit 6b6035ae4a29abbd237463d84a45fbeb0d92bc18 diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index 55757f982..57de9ffe0 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -639,10 +639,6 @@ if(bundled-opus) target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/opus/include") - if(tests) - set_target_properties(test_opus_decode test_opus_padding PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests") - endif() - if(WIN32) # Shared library on Windows (e.g. ".dll") set_target_properties(opus PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})