multimedia/ringrtc: Update to 2.33.0

multimedia/ringrtc/files/patch-abseil

@@ -0,0 +1,111 @@
+From b9707b7d7845f9710ae6d5906827b833fdcc2754 Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Wed, 6 Sep 2023 13:30:04 -0700
+Subject: [PATCH] Use native methods to implement absl::base_internal::GetPID()
+ on FreeBSD, NetBSD, and OpenBSD
+
+https://man.freebsd.org/cgi/man.cgi?query=pthread_getthreadid_np
+https://man.netbsd.org/_lwp_self.2
+https://man.openbsd.org/getthrid.2
+
+This fixes a build break caused by
+https://github.com/abseil/abseil-cpp/commit/88cc63ef739d83277b492e881be72e9069fcb1fe
+
+Fixes #1518
+
+PiperOrigin-RevId: 563200172
+Change-Id: Ifd1b65c84e3631075248bc2e01b8f047dc72d201
+---
+ absl/base/internal/sysinfo.cc | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc
+index 8bcc4fafaf9..5b427fa5e98 100644
+--- ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
++++ ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
+@@ -34,6 +34,14 @@
+ #include <sys/sysctl.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <pthread_np.h>
++#endif
++
++#ifdef __NetBSD__
++#include <lwp.h>
++#endif
++
+ #if defined(__myriad2__)
+ #include <rtems.h>
+ #endif
+@@ -421,7 +429,7 @@ pid_t GetTID() {
+   return tid;
+ }
+
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+
+ pid_t GetTID() {
+   uint64_t tid;
+@@ -432,6 +440,14 @@ pid_t GetTID() {
+   return static_cast<pid_t>(tid);
+ }
+
++#elif defined(__OpenBSD__)
++
++pid_t GetTID() { return getthrid(); }
++
++#elif defined(__NetBSD__)
++
++pid_t GetTID() { return static_cast<pid_t>(_lwp_self()); }
++
+ #elif defined(__native_client__)
+
+ pid_t GetTID() {
+
+
+
+
+From b020fe646186aa624e607a23baca445ba8cd199e Mon Sep 17 00:00:00 2001
+From: Derek Mauro <dmauro@google.com>
+Date: Thu, 7 Sep 2023 08:02:09 -0700
+Subject: [PATCH] Fix GetTID() on FreeBSD
+
+https://github.com/abseil/abseil-cpp/issues/1518#issuecomment-1709098904
+pointed out that the previous untested fix doesn't work because
+pthread_getthreadid_np() has a different signature on Darwin.
+
+Follow up to https://github.com/abseil/abseil-cpp/commit/b9707b7d7845f9710ae6d5906827b833fdcc2754
+
+Fixes #1518
+
+PiperOrigin-RevId: 563432451
+Change-Id: Id0a9212e9c4413fa520a42934efaed2a06ca5dbc
+---
+ absl/base/internal/sysinfo.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc
+index 5b427fa5e98..79eaba3e51c 100644
+--- ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
++++ ../../src/webrtc/src/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
+@@ -429,7 +429,7 @@ pid_t GetTID() {
+   return tid;
+ }
+
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
++#elif defined(__APPLE__)
+
+ pid_t GetTID() {
+   uint64_t tid;
+@@ -440,6 +440,10 @@ pid_t GetTID() {
+   return static_cast<pid_t>(tid);
+ }
+
++#elif defined(__FreeBSD__)
++
++pid_t GetTID() { return static_cast<pid_t>(pthread_getthreadid_np()); }
++
+ #elif defined(__OpenBSD__)
+
+ pid_t GetTID() { return getthrid(); }

multimedia/ringrtc/files/patch-src_webrtc_src_build_config_BUILD.gn

@@ -1,9 +1,9 @@
 --- ../../src/webrtc/src/build/config/BUILD.gn.orig	2021-05-26 12:26:11 UTC
 +++ ../../src/webrtc/src/build/config/BUILD.gn
-@@ -218,13 +218,17 @@ config("default_libs") {
-       "CoreText.framework",
-       "Foundation.framework",
-     ]
+@@ -214,13 +214,17 @@ config("default_libs") {
+     # Targets should choose to explicitly link frameworks they require. Since
+     # linking can have run-time side effects, nothing should be listed here.
+     libs = []
 -  } else if (is_linux || is_chromeos) {
 +  } else if ((is_linux && !is_bsd) || is_chromeos) {
      libs = [

multimedia/ringrtc/files/patch-src_webrtc_src_build_config_sysroot.gni

@@ -1,14 +1,15 @@
 --- ../../src/webrtc/src/build/config/sysroot.gni.orig	2020-05-13 18:39:36 UTC
 +++ ../../src/webrtc/src/build/config/sysroot.gni
-@@ -21,9 +21,9 @@ declare_args() {
+@@ -19,10 +19,10 @@ declare_args() {
 
    # Controls default is_linux sysroot. If set to true, and sysroot
    # is empty, default sysroot is calculated.
--  use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-+  use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" ||
-                 current_cpu == "arm" || current_cpu == "arm64" ||
--                current_cpu == "mipsel" || current_cpu == "mips64el"
-+                current_cpu == "mipsel" || current_cpu == "mips64el")
+-  use_sysroot =
++  use_sysroot = !is_bsd && (
+       current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
+       current_cpu == "arm64" || current_cpu == "mipsel" ||
+-      current_cpu == "mips64el" || current_cpu == "riscv64"
++      current_cpu == "mips64el" || current_cpu == "riscv64")
  }
 
  if (sysroot == "") {

multimedia/ringrtc/files/patch-src_webrtc_src_rtc__base_physical__socket__server.h

@@ -1,11 +1,11 @@
 --- ../../src/webrtc/src/rtc_base/physical_socket_server.h.orig	2021-01-28 23:16:17 UTC
 +++ ../../src/webrtc/src/rtc_base/physical_socket_server.h
-@@ -12,7 +12,7 @@
- #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
-
+@@ -14,7 +14,7 @@
  #include "api/units/time_delta.h"
--#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+
+ #if defined(WEBRTC_POSIX)
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ // On Linux, use epoll.
  #include <sys/epoll.h>
  #define WEBRTC_USE_EPOLL 1
- #endif

multimedia/ringrtc/files/patch-src_webrtc_src_third__party_libevent_BUILD.gn

@@ -1,9 +1,9 @@
 --- ../../src/webrtc/src/third_party/libevent/BUILD.gn.orig	2021-03-15 17:07:00 UTC
 +++ ../../src/webrtc/src/third_party/libevent/BUILD.gn
-@@ -43,6 +43,13 @@ static_library("libevent") {
+@@ -48,6 +48,13 @@ static_library("libevent") {
        "mac/event-config.h",
      ]
-     include_dirs = [ "mac" ]
+     include_dirs += [ "mac" ]
 +  } else if (is_bsd) {
 +    sources += [
 +      "kqueue.c",

multimedia/ringrtc/webrtc_fetch.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-WEBRTC_REV=5359d
+WEBRTC_REV=5845h
 
 base_url="https://chromium.googlesource.com/chromium/src/base.git/+archive/"
 boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/"
@@ -70,6 +70,8 @@ third_party_hash=$(grep 'third_party@' /tmp/DEPS | awk -F '@' '{print $2}' | sed
 printf "THIRD_PARTY_REV=\t${third_party_hash}\n"
 printf "THIRD_PARTY_REV=\t${third_party_hash}\n" | portedit merge -i Makefile
 
+#exit
+
 mkdir dist_tmp
 echo "fetch -o dist_tmp/base-${base_hash}.tar.gz ${base_url}${base_hash}.tar.gz"
 echo "fetch -o dist_tmp/boringssl-${boringssl_hash}.tar.gz ${boringssl_url}${boringssl_hash}.tar.gz"