Update WebRTC on Ubuntu to r6818

BearWare · Nov 5, 2024 · edd6621 · edd6621
1 parent 1defa24
commit edd6621
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt
@@ -205,7 +205,7 @@ else()
 
     ExternalProject_Add(depot-tools
       GIT_REPOSITORY    https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      GIT_TAG           3b39cefc
+      GIT_TAG           39b2e4ef
       UPDATE_COMMAND    ""
       INSTALL_DIR       ""
       CONFIGURE_COMMAND ""
@@ -234,7 +234,7 @@ else()
     if (NOT EXISTS ${WEBRTC_SOURCE_ROOT})
       message (WARNING "WebRTC is not present in ${WEBRTC_SOURCE_ROOT}. Downloading... This takes a loooong time")
       set (WEBRTC_FETCH_CMD1 ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_FETCH_PATH} && fetch --nohooks ${WEBRTC_REPO_NAME} && gclient sync --with_branch_heads --with_tags)
-      set (WEBRTC_FETCH_CMD2 ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_SOURCE_ROOT} && git checkout branch-heads/4332)
+      set (WEBRTC_FETCH_CMD2 ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_SOURCE_ROOT} && git checkout branch-heads/6818)
       set (WEBRTC_FETCH_CMD3 ${DEPOTTOOLS_EXPORT} && cd ${WEBRTC_FETCH_PATH} && gclient sync -D)
       set (WEBRTC_PATCH_CMD1 cd ${WEBRTC_SOURCE_ROOT} && git apply ${CMAKE_CURRENT_LIST_DIR}/libteamtalk-r4332.patch)
     else()

diff --git a/Library/TeamTalkLib/build/webrtc/args.gn_deb b/Library/TeamTalkLib/build/webrtc/args.gn_deb
@@ -2,6 +2,8 @@ gtest_enable_absl_printers=false
 is_clang=false
 is_component_build=false
 is_debug=false
+libsrtp_build_boringssl=false
+libsrtp_ssl_root="/dev/null"
 rtc_build_examples=false
 rtc_build_libvpx=false
 rtc_build_opus=false
@@ -15,12 +17,12 @@ rtc_include_opus=false
 rtc_include_tests=false
 rtc_libvpx_build_vp9=false
 rtc_ssl_root="/dev/null"
-rtc_use_gtk=false
 rtc_use_x11=false
 rtc_use_x11_extensions=false
 treat_warnings_as_errors=false
 use_aura=false
+use_bundled_fontconfig=true
 use_custom_libcxx=false
 use_ozone=false
 use_rtti=true
-use_udev=false
+use_udev=false
diff --git a/Library/TeamTalkLib/build/webrtc/libteamtalk-r6818.patch b/Library/TeamTalkLib/build/webrtc/libteamtalk-r6818.patch
@@ -0,0 +1,18 @@
+diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
+index 03a63bb6c0..636d21f7c7 100644
+--- a/modules/audio_processing/BUILD.gn
++++ b/modules/audio_processing/BUILD.gn
+@@ -209,6 +209,13 @@ rtc_library("audio_processing") {
+   }
+ }
+
++static_library("teamtalk") {
++  complete_static_lib = true
++  deps = [
++    ":audio_processing",
++  ]
++}
++
+ rtc_library("residual_echo_detector") {
+   poisonous = [ "default_echo_detector" ]
+   configs += [ ":apm_debug_dump" ]