git: bbd80f09ea32 - 2026Q4 - multimedia/ringrtc: Update to 2.72.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Tue, 06 Oct 2026 12:50:53 UTC
The branch 2026Q4 has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bbd80f09ea325e52cd19e8a9c9077581e4ea53e9

commit bbd80f09ea325e52cd19e8a9c9077581e4ea53e9
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2026-10-06 12:29:44 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2026-10-06 12:48:37 +0000

    multimedia/ringrtc: Update to 2.72.0
    
    (cherry picked from commit 4ed11244959c6f02bc9d7e6b2c29d0b8f5536b6f)
---
 multimedia/ringrtc/Makefile                        | 19 +++++++++++--------
 multimedia/ringrtc/Makefile.crates                 |  6 +++---
 multimedia/ringrtc/distinfo                        | 22 +++++++++++-----------
 .../files/patch-build_toolchain_gcc__toolchain.gni | 10 +++++-----
 .../files/patch-cargo-crates_cubeb-sys_build.rs    |  8 +++++---
 ...rgo-crates_cubeb-sys_libcubeb_src_cubeb__alsa.c | 10 ++++++++++
 multimedia/ringrtc/update.txt                      |  4 +++-
 multimedia/ringrtc/webrtc_fetch.sh                 |  2 +-
 8 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile
index f8e2b1bb1422..47432d31f392 100644
--- a/multimedia/ringrtc/Makefile
+++ b/multimedia/ringrtc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ringrtc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.71.0
+DISTVERSION=	2.72.0
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/mikael/ringrtc/:boringssl \
 		LOCAL/mikael/ringrtc/:build \
@@ -53,7 +53,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libharfbuzz.so:print/harfbuzz \
 		libpulse.so:audio/pulseaudio
 
-USES=		cargo gnome jpeg localbase:ldflags ninja pkgconfig python:build \
+USES=		cargo gnome jpeg llvm:min=21,build localbase:ldflags ninja pkgconfig python:build \
 		tar:xz
 USE_GNOME=	glib20
 USE_GITHUB=	yes
@@ -62,7 +62,7 @@ GH_TUPLE=	signalapp:ringrtc:${DISTVERSIONPREFIX}${DISTVERSION} \
 		signalapp:webrtc:${WEBRTC_REV}:webrtc
 
 # sh net-im/signal-desktop/get_deps.sh
-WEBRTC_REV=	7871f
+WEBRTC_REV=	7871k
 
 # modify webrtc_fetch.sh, then sh webrtc_fetch.sh
 BORINGSSL_REV=		f91f1447397c6719f9774dfb8e67329378e1f3d3
@@ -70,7 +70,7 @@ BUILD_REV=		d296a9fec6186f2c109758c7d3f93cbef936dfc3
 BUILDTOOLS_REV=		17495e454aae81b581e8b3caccbb53054509b280
 CATAPULT_REV=		2852bb7e91e4995502ffb72b7ed21412ee157914
 ICU_REV=		3859e64eed5d34544b27fbcab0ac1685ce83df3c
-LIBCUBEB_VER=		0.37.0
+LIBCUBEB_VER=		0.38.0
 LIBJPEG_TURBO_REV=	640f254ad0fa03f6b1f29f89b7dd9366f2f6e533
 LIBSRTP_REV=		cd5d177bf1fde755ddb4c7f0d9ff7693f8b49e5e
 LIBVPX_REV=		31af37b1bd2774d11a932c1cd9a3849328375f64
@@ -85,7 +85,10 @@ THIRD_PARTY_REV=	7c92732938de0ef7e28f5da231994723f938f407
 TOOLS_REV=		8e4d26ef387bfa4c07e66dd1c7399c3d53ef1451
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} \
-		vpython3=${PYTHON_CMD}
+		vpython3=${PYTHON_CMD} \
+		c++=${CXX} \
+		cxx=${CXX} \
+		cc=${CC}
 
 # Keep in sync with https://github.com/signalapp/ringrtc/blob/v2.53.0/bin/build-desktop#L130
 # Run "gn args out/release --list" for all variables.
@@ -114,6 +117,7 @@ GN_ARGS+=	rtc_build_examples=false \
 		use_system_harfbuzz=true \
 		use_system_libjpeg=true \
 		use_udev=false \
+		extra_cflags="${CFLAGS}" \
 		extra_cxxflags="${CXXFLAGS}" \
 		extra_ldflags="${LDFLAGS}" \
 		use_thin_lto=true \
@@ -162,9 +166,8 @@ post-extract:
 	${MV} ${WRKDIR}/tools ${WEBRTCDIR}
 
 post-patch:
-	${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" \
-		${WEBRTCDIR}/build/toolchain/gcc_toolchain.gni \
-		${WEBRTCDIR}/buildtools/third_party/libc++/BUILD.gn
+	${REINPLACE_CMD} "s|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g" \
+		${WEBRTCDIR}/build/toolchain/gcc_toolchain.gni
 	${RM} -r ${CARGO_VENDOR_DIR}/cubeb-sys-${LIBCUBEB_VER}/libcubeb/src/cubeb-pulse-rs
 
 	${ECHO_CMD} "# Generated from 'DEPS'" > ${WEBRTCDIR}/build/config/gclient_args.gni
diff --git a/multimedia/ringrtc/Makefile.crates b/multimedia/ringrtc/Makefile.crates
index 64f22bd192c2..cdc4247dde6f 100644
--- a/multimedia/ringrtc/Makefile.crates
+++ b/multimedia/ringrtc/Makefile.crates
@@ -78,9 +78,9 @@ CARGO_CRATES=	adler2-2.0.1 \
 		ctr-0.9.2 \
 		ctr-0.10.1 \
 		ctutils-0.4.2 \
-		cubeb-0.37.0 \
-		cubeb-core-0.37.0 \
-		cubeb-sys-0.37.0 \
+		cubeb-0.38.0 \
+		cubeb-core-0.38.0 \
+		cubeb-sys-0.38.0 \
 		curve25519-dalek-5.0.0 \
 		curve25519-dalek-derive-0.1.1 \
 		darling-0.23.0 \
diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo
index 6c292173203a..0b25df7dadf9 100644
--- a/multimedia/ringrtc/distinfo
+++ b/multimedia/ringrtc/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1788510152
+TIMESTAMP = 1790926830
 SHA256 (boringssl-f91f1447397c6719f9774dfb8e67329378e1f3d3.tar.gz) = 49a7b8f67c42b8a20ed4378a9dba6318ab059b86d086ff031cd8ca8965bebf5a
 SIZE (boringssl-f91f1447397c6719f9774dfb8e67329378e1f3d3.tar.gz) = 70823284
 SHA256 (build-d296a9fec6186f2c109758c7d3f93cbef936dfc3.tar.gz) = 62a311492526842cf50e1927fbcc72e0276003131268e2f6c34bc72493941a50
@@ -193,12 +193,12 @@ SHA256 (rust/crates/ctr-0.10.1.crate) = baaca1c4b237092596f64d571e9db6ce4109c4ef
 SIZE (rust/crates/ctr-0.10.1.crate) = 20379
 SHA256 (rust/crates/ctutils-0.4.2.crate) = 7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e
 SIZE (rust/crates/ctutils-0.4.2.crate) = 32739
-SHA256 (rust/crates/cubeb-0.37.0.crate) = 7a5fcf6be07b31e2e78a603a7448581e8dac55ff95b7d5f4e8a561ee65cd7448
-SIZE (rust/crates/cubeb-0.37.0.crate) = 8231
-SHA256 (rust/crates/cubeb-core-0.37.0.crate) = e36b51ce1d7edef2ad249e38a33d64c14869b00101320b1262b1a3848bab7bf2
-SIZE (rust/crates/cubeb-core-0.37.0.crate) = 13123
-SHA256 (rust/crates/cubeb-sys-0.37.0.crate) = 81dd03c4fc8d6e96b0b06f84c558df13aa23b75695adde2ac87ee4e301ba1e7f
-SIZE (rust/crates/cubeb-sys-0.37.0.crate) = 448472
+SHA256 (rust/crates/cubeb-0.38.0.crate) = d6d91c16b292c8c5fec14285a32c07fe471cc0d87b582d066dcccfdff2b61dd5
+SIZE (rust/crates/cubeb-0.38.0.crate) = 8230
+SHA256 (rust/crates/cubeb-core-0.38.0.crate) = 7d1ae61351fb92da246f75ce1501e32a54d5e3f713a315f18e683b04c90b4dde
+SIZE (rust/crates/cubeb-core-0.38.0.crate) = 13118
+SHA256 (rust/crates/cubeb-sys-0.38.0.crate) = 820cb70dc4e0fb2646c3bfcf254c3f46ff450db6bc29ddab59f048cf511c9c9f
+SIZE (rust/crates/cubeb-sys-0.38.0.crate) = 449031
 SHA256 (rust/crates/curve25519-dalek-5.0.0.crate) = b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23
 SIZE (rust/crates/curve25519-dalek-5.0.0.crate) = 350408
 SHA256 (rust/crates/curve25519-dalek-derive-0.1.1.crate) = f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3
@@ -997,7 +997,7 @@ SHA256 (rust/crates/zmij-1.0.23.crate) = 29666d0abbfad1e3dc4dcf6144730dd3a3ab225
 SIZE (rust/crates/zmij-1.0.23.crate) = 28612
 SHA256 (signalapp-libsignal-v0.99.1_GH0.tar.gz) = c6d92f2bc37902b7269fb9aac451e1047a87a812a9b7c37ba8a489ab6c6cd206
 SIZE (signalapp-libsignal-v0.99.1_GH0.tar.gz) = 2814574
-SHA256 (signalapp-ringrtc-v2.71.0_GH0.tar.gz) = 7466f13edfe63e9bea65d9612ba20c812269260c60758f1ad89527fbe44fa2a2
-SIZE (signalapp-ringrtc-v2.71.0_GH0.tar.gz) = 970196
-SHA256 (signalapp-webrtc-7871f_GH0.tar.gz) = a5e7eb36c8403cf027abdc6c14dfa6f89235dcb73e4a258cc9a39888684767e4
-SIZE (signalapp-webrtc-7871f_GH0.tar.gz) = 40354526
+SHA256 (signalapp-ringrtc-v2.72.0_GH0.tar.gz) = 8f4ecefc2e6c2794b7e18b9f5139bb0987edd9b8dfc7b447c22821c2c31de73a
+SIZE (signalapp-ringrtc-v2.72.0_GH0.tar.gz) = 977379
+SHA256 (signalapp-webrtc-7871k_GH0.tar.gz) = fd2d189c22272a037d235548436f64072c41a34602fc703007ee16830edb8549
+SIZE (signalapp-webrtc-7871k_GH0.tar.gz) = 40352217
diff --git a/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni b/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni
index fb9054a7dcd3..6c1147cf7261 100644
--- a/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/multimedia/ringrtc/files/patch-build_toolchain_gcc__toolchain.gni
@@ -109,15 +109,15 @@
 -
 -    cc = "${prefix}/clang"
 -    cxx = "${prefix}/clang++"
-+    cc = "cc"
-+    cxx = "c++"
++    cc = "%%LLVM_PREFIX%%/bin/clang"
++    cxx = "%%LLVM_PREFIX%%/bin/clang++"
      ld = cxx
 -    readelf = "${prefix}/llvm-readelf"
 -    ar = "${prefix}/llvm-ar"
 -    nm = "${prefix}/llvm-nm"
-+    readelf = "readelf"
-+    ar = "llvm-ar"
-+    nm = "llvm-nm"
++    readelf = "%%LLVM_PREFIX%%/bin/llvm-readelf"
++    ar = "%%LLVM_PREFIX%%/bin/llvm-ar"
++    nm = "%%LLVM_PREFIX%%/bin/llvm-nm"
  
      forward_variables_from(invoker, "*", [ "toolchain_args" ])
  
diff --git a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs
index 0a836f28a578..be78d373c546 100644
--- a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs
+++ b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs
@@ -1,6 +1,6 @@
---- cargo-crates/cubeb-sys-0.37.0/build.rs.orig	2025-02-01 09:46:43 UTC
-+++ cargo-crates/cubeb-sys-0.37.0/build.rs
-@@ -203,19 +203,6 @@ fn main() {
+--- cargo-crates/cubeb-sys-0.38.0/build.rs.orig	2025-02-01 09:46:43 UTC
++++ cargo-crates/cubeb-sys-0.38.0/build.rs
+@@ -203,21 +203,6 @@ fn main() {
          // Ignore the result of find_library. We don't care if the
          // libraries are missing.
          let _ = pkg_config::find_library("alsa");
@@ -16,6 +16,8 @@
 -                    println!("cargo:rustc-link-search=native={rust_target_dir}/{target}/{profile}");
 -                }
 -            }
+-        } else if env::var("LIBCUBEB_SYS_REQUIRE_PULSE").is_ok() {
+-            println!("cargo::error=Build is configured to require libpulse but it was not found");
 -        }
          let _ = pkg_config::find_library("jack");
          let _ = pkg_config::find_library("speexdsp");
diff --git a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_libcubeb_src_cubeb__alsa.c b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_libcubeb_src_cubeb__alsa.c
new file mode 100644
index 000000000000..6e244d1f1554
--- /dev/null
+++ b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_libcubeb_src_cubeb__alsa.c
@@ -0,0 +1,10 @@
+--- cargo-crates/cubeb-sys-0.38.0/libcubeb/src/cubeb_alsa.c.orig	2026-10-02 18:06:31 UTC
++++ cargo-crates/cubeb-sys-0.38.0/libcubeb/src/cubeb_alsa.c
+@@ -5,6 +5,7 @@
+  * accompanying file LICENSE for details.
+  */
+ #undef NDEBUG
++#include <stdlib.h>
+ #define _DEFAULT_SOURCE
+ #define _BSD_SOURCE
+ #if defined(__NetBSD__)
diff --git a/multimedia/ringrtc/update.txt b/multimedia/ringrtc/update.txt
index 800fdaf0857e..24bba5bdad9e 100644
--- a/multimedia/ringrtc/update.txt
+++ b/multimedia/ringrtc/update.txt
@@ -2,4 +2,6 @@ To update this port:
 Bump DISTVERSION
 eventually bump WEBRTC_REV (sh net-im/signal-desktop/get_deps.sh)
 eventually update *_REV (sh multimedia/ringrtc/webrtc_fetch.sh)
-eventually update CARGO_CRATES (fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.71.0/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile.crates)
+
+eventually update CARGO_CRATES:
+fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.72.0/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile.crates
diff --git a/multimedia/ringrtc/webrtc_fetch.sh b/multimedia/ringrtc/webrtc_fetch.sh
index 96e1d8826796..6e4ea18ca789 100644
--- a/multimedia/ringrtc/webrtc_fetch.sh
+++ b/multimedia/ringrtc/webrtc_fetch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-WEBRTC_REV=7871f
+WEBRTC_REV=7871k
 
 boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/"
 build_url="https://chromium.googlesource.com/chromium/src/build.git/+archive/"