Date: Fri, 22 Nov 2024 14:59:59 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 010fe9e3c1db - main - multimedia/ringrtc: Update to 2.48.7 Message-ID: <202411221459.4AMExxNd059359@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=010fe9e3c1db5e09fb6a873e6f4b697a3db186e8 commit 010fe9e3c1db5e09fb6a873e6f4b697a3db186e8 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-11-22 10:14:34 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-11-22 14:59:09 +0000 multimedia/ringrtc: Update to 2.48.7 --- multimedia/ringrtc/Makefile | 38 +++++---- multimedia/ringrtc/Makefile.crates | 15 ++-- multimedia/ringrtc/distinfo | 96 +++++++++++----------- multimedia/ringrtc/files/patch-aarch64 | 28 ------- .../files/patch-build_config_compiler_BUILD.gn | 60 +++++++++----- .../files/patch-build_toolchain_toolchain.gni | 4 +- .../files/patch-cargo-crates_cubeb-sys_build.rs | 19 +++++ ...rust_src_webrtc_audio__device__module__utils.rs | 38 +++++++++ ...rd__party_perfetto_include_perfetto_base_time.h | 6 +- .../patch-third__party_perfetto_src_base_utils.cc | 26 ++++++ ...ch-third__party_webrtc_rtc__base_ip__address.cc | 8 +- multimedia/ringrtc/update.txt | 2 +- multimedia/ringrtc/webrtc_fetch.sh | 2 +- 13 files changed, 210 insertions(+), 132 deletions(-) diff --git a/multimedia/ringrtc/Makefile b/multimedia/ringrtc/Makefile index 6fffbded41bc..c1bb7b3c4e55 100644 --- a/multimedia/ringrtc/Makefile +++ b/multimedia/ringrtc/Makefile @@ -1,7 +1,6 @@ PORTNAME= ringrtc DISTVERSIONPREFIX= v -DISTVERSION= 2.48.3 -PORTREVISION= 1 +DISTVERSION= 2.48.7 CATEGORIES= multimedia MASTER_SITES= LOCAL/mikael/ringrtc/:base \ LOCAL/mikael/ringrtc/:boringssl \ @@ -10,6 +9,7 @@ MASTER_SITES= LOCAL/mikael/ringrtc/:base \ LOCAL/mikael/ringrtc/:catapult \ LOCAL/mikael/ringrtc/:icu \ LOCAL/mikael/ringrtc/:nasm \ + LOCAL/mikael/ringrtc/:libcubeb \ LOCAL/mikael/ringrtc/:libjpeg_turbo \ LOCAL/mikael/ringrtc/:libsrtp \ LOCAL/mikael/ringrtc/:libvpx \ @@ -27,6 +27,7 @@ DISTFILES= base-${BASE_REV}.tar.gz:base \ catapult-${CATAPULT_REV}.tar.gz:catapult \ icu-${ICU_REV}.tar.gz:icu \ nasm-${NASM_REV}.tar.gz:nasm \ + libcubeb-${LIBCUBEB_VER}.tar.gz:libcubeb \ libjpeg_turbo-${LIBJPEG_TURBO_REV}.tar.gz:libjpeg_turbo \ libsrtp-${LIBSRTP_REV}.tar.gz:libsrtp \ libvpx-${LIBVPX_REV}.tar.gz:libvpx \ @@ -63,26 +64,27 @@ GH_TUPLE= signalapp:ringrtc:${DISTVERSIONPREFIX}${DISTVERSION} \ signalapp:webrtc:${WEBRTC_REV}:webrtc # sh net-im/signal-desktop/get_deps.sh -WEBRTC_REV= 6613c +WEBRTC_REV= 6723a # modify webrtc_fetch.sh, then sh webrtc_fetch.sh -BASE_REV= aa6dbe6d6a68e6503360a7e0e18b8464c56fc159 -BORINGSSL_REV= f01108e4761e1d4189cb134322c3cb01dc71ef87 -BUILD_REV= 5bce81deee6d30ac58c45f6cd53e859c62780687 -BUILDTOOLS_REV= 94d7b86a83537f8a7db7dccb0bf885739f7a81aa -CATAPULT_REV= 022cd349fe146c3dd0ba31f2789c630fc40e76a0 -ICU_REV= 163e29159ecb39d4c165c48272e565614a1e024a -LIBJPEG_TURBO_REV= ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf -LIBSRTP_REV= 7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a -LIBVPX_REV= 253d6365e3f134f4aca6f5fc312336cb501a1c6f -LIBYUV_REV= a6a2ec654b1be1166b376476a7555c89eca0c275 +BASE_REV= 7f2a56694b330c2cb2954eee78469ffc69952448 +BORINGSSL_REV= e724ef02089bf2bb494203231fc5cb62acc2fad6 +BUILD_REV= 8e0612cd2c4e4d7c15a456384760815bdbd64ef1 +BUILDTOOLS_REV= e4f992c0660e6cee637c7b97aabf04d0a58d5555 +CATAPULT_REV= 296226a4a0067c8cffeb8831fb87526a8035f3cc +ICU_REV= 9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb +LIBCUBEB_VER= 0.17.1 +LIBJPEG_TURBO_REV= 927aabfcd26897abb9776ecf2a6c38ea5bb52ab6 +LIBSRTP_REV= 000edd791434c8738455f10e0dd6b268a4852c0b +LIBVPX_REV= fbf63dff1f528d44f24bd662abb89fd01a4a1c25 +LIBYUV_REV= 874f391dbf13dcc84e13a494daed57539ffe2935 NASM_REV= f477acb1049f5e043904b87b825c5915084a9a29 OPUS_REV= 0e30966b198ad28943799eaf5b3b08100b6f70c3 -PERFETTO_REV= f9098afffa2c70acecfec66ba520f59b3864be83 +PERFETTO_REV= 97a5d7ed4d7ddb3844a5cbd184e241b99fe6ebcc PROTOBUFJS_REV= e34549db516f8712f678fcd4bc411613b5cc5295 -TESTING_REV= a1b47952f3737c536f14a74ff70bc12ed2c1ac7d -THIRD_PARTY_REV= 91945cadc24feea7b44e1682d17844b6ab508d6d -TOOLS_REV= a8fe86b922a84de686c3b15c87e2a9ac84d06db3 +TESTING_REV= 3f4138fcb15362469527d9310e21600dfdfab691 +THIRD_PARTY_REV= 27c9b4efc25d7ae5479b884a7d818058c6066d92 +TOOLS_REV= 453f7ad001cd0d341ecb437eb164fd6c4b5cc08d BINARY_ALIAS= vpython3=${PYTHON_CMD} @@ -156,6 +158,8 @@ post-patch: ${REINPLACE_CMD} "s|LOCALBASE|${LOCALBASE}|" \ ${WEBRTCDIR}/build/toolchain/gcc_toolchain.gni \ ${WEBRTCDIR}/buildtools/third_party/libc++/BUILD.gn + ${REINPLACE_CMD} "s|WRKDIR|${WRKDIR}|" \ + ${WRKSRC}/cargo-crates/cubeb-sys-0.17.0/build.rs ${ECHO_CMD} "# Generated from 'DEPS'" > ${WEBRTCDIR}/build/config/gclient_args.gni ${ECHO_CMD} 1591703586 > ${WEBRTCDIR}/build/util/LASTCHANGE.committime diff --git a/multimedia/ringrtc/Makefile.crates b/multimedia/ringrtc/Makefile.crates index c4de2fc8737f..51d1e133c203 100644 --- a/multimedia/ringrtc/Makefile.crates +++ b/multimedia/ringrtc/Makefile.crates @@ -1,4 +1,3 @@ -# fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v2.45.0/Cargo.lock | awk -f /usr/ports/Mk/Scripts/cargo-crates.awk | portedit merge -i Makefile.crates CARGO_CRATES= addr2line-0.22.0 \ adler-1.0.2 \ aead-0.5.2 \ @@ -45,7 +44,7 @@ CARGO_CRATES= addr2line-0.22.0 \ bzip2-0.4.4 \ bzip2-sys-0.1.11+1.0.8 \ cbc-0.1.2 \ - cc-1.1.5 \ + cc-1.1.31 \ cesu8-1.1.0 \ cexpr-0.6.0 \ cfg-if-1.0.0 \ @@ -70,9 +69,9 @@ CARGO_CRATES= addr2line-0.22.0 \ crossbeam-utils-0.8.20 \ crypto-common-0.1.6 \ ctr-0.9.2 \ - cubeb-0.14.0 \ - cubeb-core-0.14.0 \ - cubeb-sys-0.14.0 \ + cubeb-0.17.0 \ + cubeb-core-0.17.0 \ + cubeb-sys-0.17.0 \ darling-0.20.10 \ darling_core-0.20.10 \ darling_macro-0.20.10 \ @@ -219,9 +218,9 @@ CARGO_CRATES= addr2line-0.22.0 \ rayon-1.10.0 \ rayon-core-1.12.1 \ redox_users-0.4.5 \ - regex-1.10.5 \ - regex-automata-0.4.7 \ - regex-syntax-0.8.4 \ + regex-1.11.1 \ + regex-automata-0.4.8 \ + regex-syntax-0.8.5 \ relative-path-1.9.3 \ ring-0.17.8 \ rustc-demangle-0.1.24 \ diff --git a/multimedia/ringrtc/distinfo b/multimedia/ringrtc/distinfo index 7db513fa8631..2fe9e05b24d7 100644 --- a/multimedia/ringrtc/distinfo +++ b/multimedia/ringrtc/distinfo @@ -1,38 +1,40 @@ -TIMESTAMP = 1729712080 -SHA256 (base-aa6dbe6d6a68e6503360a7e0e18b8464c56fc159.tar.gz) = 0541c2b99320ef4cac99a74dc64247d227c5dbce1dd4be921dda483a4c9616dd -SIZE (base-aa6dbe6d6a68e6503360a7e0e18b8464c56fc159.tar.gz) = 6139990 -SHA256 (boringssl-f01108e4761e1d4189cb134322c3cb01dc71ef87.tar.gz) = d3fd4f9d4f5a2d9d37841f8db97bf427f6ad922876ca972b6517be3051933b23 -SIZE (boringssl-f01108e4761e1d4189cb134322c3cb01dc71ef87.tar.gz) = 39102851 -SHA256 (build-5bce81deee6d30ac58c45f6cd53e859c62780687.tar.gz) = 9fbad98073d6cb255b75daca91ef528ee8d8f7c66f20ab299073b84928bb0f33 -SIZE (build-5bce81deee6d30ac58c45f6cd53e859c62780687.tar.gz) = 1599116 -SHA256 (buildtools-94d7b86a83537f8a7db7dccb0bf885739f7a81aa.tar.gz) = 4d688274920ca3d188fcff9cf6ec2e9be84010cc567a5f5a744ee6cecd6a2032 -SIZE (buildtools-94d7b86a83537f8a7db7dccb0bf885739f7a81aa.tar.gz) = 95642 -SHA256 (catapult-022cd349fe146c3dd0ba31f2789c630fc40e76a0.tar.gz) = b0b2f1229a84b536a2e3f950ce4a0315d70f3f3faaea6e90aba26953caa29457 -SIZE (catapult-022cd349fe146c3dd0ba31f2789c630fc40e76a0.tar.gz) = 165112327 -SHA256 (icu-163e29159ecb39d4c165c48272e565614a1e024a.tar.gz) = 48fc5069875d4ed125082f0a6f15d01351139155099ebfefb70b9c53da4b6b89 -SIZE (icu-163e29159ecb39d4c165c48272e565614a1e024a.tar.gz) = 51858467 +TIMESTAMP = 1732267892 +SHA256 (base-7f2a56694b330c2cb2954eee78469ffc69952448.tar.gz) = 8259ec40728b1f04df739c5741ffb440f2f4c868038b3da60beed95e82c6b006 +SIZE (base-7f2a56694b330c2cb2954eee78469ffc69952448.tar.gz) = 6116747 +SHA256 (boringssl-e724ef02089bf2bb494203231fc5cb62acc2fad6.tar.gz) = d2df95f88095e5c4691498a21f8aeeb92d8d89e6bfb6b6353ff3bd9184016944 +SIZE (boringssl-e724ef02089bf2bb494203231fc5cb62acc2fad6.tar.gz) = 45574239 +SHA256 (build-8e0612cd2c4e4d7c15a456384760815bdbd64ef1.tar.gz) = d3dd4007c9457816b856014d06773faf315e53ffa63a20447f34862c563ab136 +SIZE (build-8e0612cd2c4e4d7c15a456384760815bdbd64ef1.tar.gz) = 1614231 +SHA256 (buildtools-e4f992c0660e6cee637c7b97aabf04d0a58d5555.tar.gz) = bc765a8c79cd72b77cd51712063ab6535bfe10f32c3ef7fabc889ddbcb8e568b +SIZE (buildtools-e4f992c0660e6cee637c7b97aabf04d0a58d5555.tar.gz) = 93600 +SHA256 (catapult-296226a4a0067c8cffeb8831fb87526a8035f3cc.tar.gz) = ff8b9dd4dd11c306364aa3dfa9c2f2b74e790821cf7a383ca7dbd76a3bcf9700 +SIZE (catapult-296226a4a0067c8cffeb8831fb87526a8035f3cc.tar.gz) = 155801670 +SHA256 (icu-9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb.tar.gz) = 711382626bbd7c0c7a38901c7e31ffc7d401999e57faa53d3b3c39b91825e5d7 +SIZE (icu-9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb.tar.gz) = 51854974 SHA256 (nasm-f477acb1049f5e043904b87b825c5915084a9a29.tar.gz) = fa0c68caca289e2e9dac4fee0142150faf7c8bf2f15ff156e738e619a9c76bbd SIZE (nasm-f477acb1049f5e043904b87b825c5915084a9a29.tar.gz) = 1546897 -SHA256 (libjpeg_turbo-ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf.tar.gz) = 456bff434d59e85aaeb7b699e95adf158447d5be3d674d9ac5b91bcfbfbec554 -SIZE (libjpeg_turbo-ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf.tar.gz) = 2375707 -SHA256 (libsrtp-7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a.tar.gz) = b2953ab2975243cac13ee00a87f8c47f0a11602bf6fb2f4d978476b9ecd3cb78 -SIZE (libsrtp-7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a.tar.gz) = 140100 -SHA256 (libvpx-253d6365e3f134f4aca6f5fc312336cb501a1c6f.tar.gz) = ad4782e443c58e6fa1c93bc2cc990208940d5ef83f1ab7575ebe7eb1f2c211d6 -SIZE (libvpx-253d6365e3f134f4aca6f5fc312336cb501a1c6f.tar.gz) = 5713064 -SHA256 (libyuv-a6a2ec654b1be1166b376476a7555c89eca0c275.tar.gz) = 5b92e85c0cf3abde57f828a237c7ae478f5a6291382833fc42cc623aa64e6af2 -SIZE (libyuv-a6a2ec654b1be1166b376476a7555c89eca0c275.tar.gz) = 574596 +SHA256 (libcubeb-0.17.1.tar.gz) = 11943f4dad7089d33066e2c3200087cd6e42af3d225cfa269fce13f0526719e2 +SIZE (libcubeb-0.17.1.tar.gz) = 358109 +SHA256 (libjpeg_turbo-927aabfcd26897abb9776ecf2a6c38ea5bb52ab6.tar.gz) = 5ea5de65f1e437778dcd9c02e7c263d524171fa36fd621fab455c6dbeee2db3a +SIZE (libjpeg_turbo-927aabfcd26897abb9776ecf2a6c38ea5bb52ab6.tar.gz) = 2388896 +SHA256 (libsrtp-000edd791434c8738455f10e0dd6b268a4852c0b.tar.gz) = 8d7446da3fb7a451e155dd3b260fe0585778ab124d83d68446f968edf4ff7777 +SIZE (libsrtp-000edd791434c8738455f10e0dd6b268a4852c0b.tar.gz) = 139178 +SHA256 (libvpx-fbf63dff1f528d44f24bd662abb89fd01a4a1c25.tar.gz) = ba8075be39985067de1c87574be521bc7d9ff660e761911aa17ae051c485ac20 +SIZE (libvpx-fbf63dff1f528d44f24bd662abb89fd01a4a1c25.tar.gz) = 5715546 +SHA256 (libyuv-874f391dbf13dcc84e13a494daed57539ffe2935.tar.gz) = 5ce23948957562ec891f5888c61127a20aafb7abf77511f2c68c3120649a311f +SIZE (libyuv-874f391dbf13dcc84e13a494daed57539ffe2935.tar.gz) = 597718 SHA256 (opus-0e30966b198ad28943799eaf5b3b08100b6f70c3.tar.gz) = 60867154cda4ae4f3d4ba37328b0dac1649b07462945b19c4b7c51a22aa1fae6 SIZE (opus-0e30966b198ad28943799eaf5b3b08100b6f70c3.tar.gz) = 4205884 -SHA256 (perfetto-f9098afffa2c70acecfec66ba520f59b3864be83.tar.gz) = f966c9138aaab5fee9ecfdf473b525741eea348bca43a21c362bbe19e0592f01 -SIZE (perfetto-f9098afffa2c70acecfec66ba520f59b3864be83.tar.gz) = 20407974 +SHA256 (perfetto-97a5d7ed4d7ddb3844a5cbd184e241b99fe6ebcc.tar.gz) = 06d02c04de0eec431c14a04d8bd2bf74990009eb1e37d82f081af888d0307431 +SIZE (perfetto-97a5d7ed4d7ddb3844a5cbd184e241b99fe6ebcc.tar.gz) = 27543190 SHA256 (protobuf_javascript-e34549db516f8712f678fcd4bc411613b5cc5295.tar.gz) = 2b4822c56f654945c0e71ba309b716899f93f7b1a4db1a23959f47f11096396f SIZE (protobuf_javascript-e34549db516f8712f678fcd4bc411613b5cc5295.tar.gz) = 414088 -SHA256 (testing-a1b47952f3737c536f14a74ff70bc12ed2c1ac7d.tar.gz) = eb4cc7613b3afd5577af0e63d50d7daad58e1a4ab54865099e9e4f9923b4fc22 -SIZE (testing-a1b47952f3737c536f14a74ff70bc12ed2c1ac7d.tar.gz) = 2459349 -SHA256 (third_party-91945cadc24feea7b44e1682d17844b6ab508d6d.tar.gz) = eb2373d2100ed036d06ae1a21862e4f513972a309b5355680da37140022da160 -SIZE (third_party-91945cadc24feea7b44e1682d17844b6ab508d6d.tar.gz) = 815979116 -SHA256 (tools-a8fe86b922a84de686c3b15c87e2a9ac84d06db3.tar.gz) = 35d1c5c09ffed3e4c6bf79b44317d2fa6dec05ef5de043be45edc2bba6e34074 -SIZE (tools-a8fe86b922a84de686c3b15c87e2a9ac84d06db3.tar.gz) = 15046185 +SHA256 (testing-3f4138fcb15362469527d9310e21600dfdfab691.tar.gz) = 2590e3a3a7fa602a3da19f131956ce6e9ee295924b32fc78297017f1757b0461 +SIZE (testing-3f4138fcb15362469527d9310e21600dfdfab691.tar.gz) = 2432198 +SHA256 (third_party-27c9b4efc25d7ae5479b884a7d818058c6066d92.tar.gz) = 2725d6c5839f625ea2f8fe55d99907567634cdf461c889030ad115c478161d92 +SIZE (third_party-27c9b4efc25d7ae5479b884a7d818058c6066d92.tar.gz) = 833791541 +SHA256 (tools-453f7ad001cd0d341ecb437eb164fd6c4b5cc08d.tar.gz) = 05ed91c0ad2f40b9fe473f5202592edea3b6cb0c3e5d1aa019cb9f38229b014f +SIZE (tools-453f7ad001cd0d341ecb437eb164fd6c4b5cc08d.tar.gz) = 15275460 SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678 SIZE (rust/crates/addr2line-0.22.0.crate) = 39156 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -125,8 +127,8 @@ SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8ca SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444 SHA256 (rust/crates/cbc-0.1.2.crate) = 26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6 SIZE (rust/crates/cbc-0.1.2.crate) = 23501 -SHA256 (rust/crates/cc-1.1.5.crate) = 324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052 -SIZE (rust/crates/cc-1.1.5.crate) = 81493 +SHA256 (rust/crates/cc-1.1.31.crate) = c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f +SIZE (rust/crates/cc-1.1.31.crate) = 84637 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c SIZE (rust/crates/cesu8-1.1.0.crate) = 10555 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766 @@ -175,12 +177,12 @@ SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760 SHA256 (rust/crates/ctr-0.9.2.crate) = 0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835 SIZE (rust/crates/ctr-0.9.2.crate) = 18344 -SHA256 (rust/crates/cubeb-0.14.0.crate) = 46141374032595c0fa92563b6ff21c2fef695c4e932ab1a35d8726d78b35255d -SIZE (rust/crates/cubeb-0.14.0.crate) = 8096 -SHA256 (rust/crates/cubeb-core-0.14.0.crate) = 2e9d9d5a70e005de5a7ca350d973822702244af08c0e0720112641a799d8be4c -SIZE (rust/crates/cubeb-core-0.14.0.crate) = 11287 -SHA256 (rust/crates/cubeb-sys-0.14.0.crate) = 192cd49cc8485ceb2b9d82ba7ca583af01b9b0a9251f4128550d154b06702c6e -SIZE (rust/crates/cubeb-sys-0.14.0.crate) = 245492 +SHA256 (rust/crates/cubeb-0.17.0.crate) = 4a342fa08004b09f8301c328cd714004c33fe718d311aaf215c372ff52f5ad37 +SIZE (rust/crates/cubeb-0.17.0.crate) = 8102 +SHA256 (rust/crates/cubeb-core-0.17.0.crate) = 23b5dfbff806ffe83a09663e65dc9d00edae4da7977ced9dc6b44c2b036e33d3 +SIZE (rust/crates/cubeb-core-0.17.0.crate) = 12038 +SHA256 (rust/crates/cubeb-sys-0.17.0.crate) = d3a1b58889aa85e1df0292cf8eb579b3f669893f4d18967e8f74be3ec4e597da +SIZE (rust/crates/cubeb-sys-0.17.0.crate) = 8222 SHA256 (rust/crates/darling-0.20.10.crate) = 6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989 SIZE (rust/crates/darling-0.20.10.crate) = 32031 SHA256 (rust/crates/darling_core-0.20.10.crate) = 95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5 @@ -473,12 +475,12 @@ SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caa SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701 SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891 SIZE (rust/crates/redox_users-0.4.5.crate) = 15514 -SHA256 (rust/crates/regex-1.10.5.crate) = b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f -SIZE (rust/crates/regex-1.10.5.crate) = 253805 -SHA256 (rust/crates/regex-automata-0.4.7.crate) = 38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df -SIZE (rust/crates/regex-automata-0.4.7.crate) = 617582 -SHA256 (rust/crates/regex-syntax-0.8.4.crate) = 7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b -SIZE (rust/crates/regex-syntax-0.8.4.crate) = 347577 +SHA256 (rust/crates/regex-1.11.1.crate) = b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191 +SIZE (rust/crates/regex-1.11.1.crate) = 254170 +SHA256 (rust/crates/regex-automata-0.4.8.crate) = 368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3 +SIZE (rust/crates/regex-automata-0.4.8.crate) = 617784 +SHA256 (rust/crates/regex-syntax-0.8.5.crate) = 2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c +SIZE (rust/crates/regex-syntax-0.8.5.crate) = 357541 SHA256 (rust/crates/relative-path-1.9.3.crate) = ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2 SIZE (rust/crates/relative-path-1.9.3.crate) = 22400 SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d @@ -765,7 +767,7 @@ SHA256 (signalapp-libsignal-v0.51.1_GH0.tar.gz) = da01d542f8117cbabeff93c1293d75 SIZE (signalapp-libsignal-v0.51.1_GH0.tar.gz) = 1481541 SHA256 (signalapp-curve25519-dalek-signal-curve25519-4.1.3_GH0.tar.gz) = 8dd338dd7d558b7882310e8dc76ceca41ef448afd0532be208d4ff0f2924f334 SIZE (signalapp-curve25519-dalek-signal-curve25519-4.1.3_GH0.tar.gz) = 808022 -SHA256 (signalapp-ringrtc-v2.48.3_GH0.tar.gz) = d85984ff7d5c2c9760bfaee22634f0da70ccc9d14b78d6474ba3ea552d7de2a1 -SIZE (signalapp-ringrtc-v2.48.3_GH0.tar.gz) = 789735 -SHA256 (signalapp-webrtc-6613c_GH0.tar.gz) = ac3891e96dcd53f1dbdbdc82568c929d7ab681ae06838890ce9d99e23417132f -SIZE (signalapp-webrtc-6613c_GH0.tar.gz) = 39933018 +SHA256 (signalapp-ringrtc-v2.48.7_GH0.tar.gz) = 43d8de3760b0019336f9dd4f2fdb7c4bf7b9eeb43ca3c4fbd2d1e3396b9a6ac0 +SIZE (signalapp-ringrtc-v2.48.7_GH0.tar.gz) = 795271 +SHA256 (signalapp-webrtc-6723a_GH0.tar.gz) = 677af702ee47f5817d2e036366ddacf14e82a5d5c45761cea5600949c818a8ec +SIZE (signalapp-webrtc-6723a_GH0.tar.gz) = 39983178 diff --git a/multimedia/ringrtc/files/patch-aarch64 b/multimedia/ringrtc/files/patch-aarch64 deleted file mode 100644 index a54fdaf2a86e..000000000000 --- a/multimedia/ringrtc/files/patch-aarch64 +++ /dev/null @@ -1,28 +0,0 @@ -From d9be0bfca8f9585c2bfc775083124088fd0370ca Mon Sep 17 00:00:00 2001 -From: Miriam Zimmerman <mutexlox@signal.org> -Date: Wed, 2 Oct 2024 10:48:04 -0400 -Subject: [PATCH] Fix build on arm64 linux. - -On arm64 linux, c_char is u8. CStr::from_ptr is documented to take an -i8, but this is not accurate (see -https://github.com/rust-lang/rust/issues/113735); instead, it takes -c_char, which is sometimes but not always the same. One time it is -different is on aarch64 Linux, so without this commit, cubeb-rs fails to -build there. ---- - cubeb-sys/src/device.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cubeb-sys/src/device.rs b/cubeb-sys/src/device.rs -index 5827bf0..bac4a86 100644 ---- cargo-crates/cubeb-sys-0.14.0/src/device.rs -+++ cargo-crates/cubeb-sys-0.14.0/src/device.rs -@@ -182,7 +182,7 @@ impl Default for cubeb_device_info { - - impl fmt::Debug for cubeb_device_info { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -- fn optional_c_str(c_str: *const i8) -> Option<*const i8> { -+ fn optional_c_str(c_str: *const c_char) -> Option<*const c_char> { - (unsafe { c_str.as_ref() }).map(ptr::from_ref) - } - f.debug_struct("cubeb_device_info") diff --git a/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn b/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn index d41edfe98fa1..5c98c10b5f66 100644 --- a/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn +++ b/multimedia/ringrtc/files/patch-build_config_compiler_BUILD.gn @@ -9,7 +9,7 @@ } declare_args() { -@@ -251,13 +251,16 @@ config("default_include_dirs") { +@@ -256,13 +256,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -499,6 +502,10 @@ config("compiler") { +@@ -508,6 +511,10 @@ config("compiler") { } } @@ -38,16 +38,16 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -545,7 +552,7 @@ config("compiler") { +@@ -561,7 +568,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } -- if (is_clang && !is_nacl && current_os != "zos") { -+ if (is_clang && !is_nacl && current_os != "zos" && !is_bsd) { +- if (is_clang && !is_nacl) { ++ if (is_clang && !is_nacl && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") { +@@ -1217,7 +1224,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") { +@@ -1232,7 +1239,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1523,7 +1530,7 @@ config("compiler_deterministic") { +@@ -1567,7 +1574,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,16 +74,25 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1575,7 +1582,7 @@ config("compiler_deterministic") { +@@ -1625,7 +1632,7 @@ config("compiler_deterministic") { } config("clang_revision") { -- if (is_clang && clang_base_path == default_clang_base_path) { -+ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { +- if (is_clang && clang_base_path == default_clang_base_path && ++ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && + current_os != "zos") { update_args = [ "--print-revision", - "--verify-version=$clang_version", -@@ -1889,9 +1896,6 @@ config("default_warnings") { +@@ -1739,7 +1746,7 @@ config("runtime_library") { + # the C++ symbols. This config ensures the C++ symbols exist and are strong in + # order to cause that replacement to occur by explicitly linking in clang's + # compiler-rt library. +- if (is_clang && !is_nacl && !is_cronet_build) { ++ if (is_clang && !is_bsd && !is_nacl && !is_cronet_build) { + configs += [ "//build/config/clang:compiler_builtins" ] + } + +@@ -1955,9 +1962,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +102,7 @@ ] cflags_cc += [ -@@ -1899,7 +1903,7 @@ config("default_warnings") { +@@ -1965,17 +1969,11 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -102,7 +111,17 @@ cflags_cc += [ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2616,7 +2620,7 @@ config("afdo_optimize_size") { + ] +- +- # TODO(crbug.com/344680447): Fix and re-enable. +- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] +- +- # TODO(crbug.com/356172342): Fix and re-enable. +- cflags_cc += [ "-Wno-dangling-assignment-gsl" ] + } + } + +@@ -2709,7 +2707,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -111,7 +130,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2643,7 +2647,7 @@ config("afdo") { +@@ -2736,7 +2734,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,13 +139,12 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2808,7 +2812,8 @@ config("symbols") { - configs += [ "//build/config:compress_debug_sections" ] +@@ -2913,7 +2911,7 @@ config("symbols") { + cflags += [ "-gomit-unreferenced-methods" ] } -- if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") { -+ if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" && -+ !is_bsd) { +- if (is_clang && (!is_nacl || is_nacl_saigo)) { ++ if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { if (is_apple) { # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. diff --git a/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni b/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni index 7c2ec480c906..f5c9a960dfa6 100644 --- a/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni +++ b/multimedia/ringrtc/files/patch-build_toolchain_toolchain.gni @@ -1,10 +1,10 @@ --- src/webrtc/src/build/toolchain/toolchain.gni.orig 2024-03-22 08:19:40 UTC +++ src/webrtc/src/build/toolchain/toolchain.gni -@@ -68,7 +68,7 @@ if (host_os == "mac") { +@@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux" || host_os == "aix") { +-} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs new file mode 100644 index 000000000000..09e3cf833a8c --- /dev/null +++ b/multimedia/ringrtc/files/patch-cargo-crates_cubeb-sys_build.rs @@ -0,0 +1,19 @@ +--- cargo-crates/cubeb-sys-0.17.0/build.rs.orig 2024-11-18 16:08:09.330015000 +0100 ++++ cargo-crates/cubeb-sys-0.17.0/build.rs 2024-11-18 16:01:50.423150000 +0100 +@@ -33,7 +33,6 @@ fn main() { + return; + } + +- let _ = fs::remove_dir_all(env::var("OUT_DIR").unwrap()); + t!(fs::create_dir_all(env::var("OUT_DIR").unwrap())); + + env::remove_var("DESTDIR"); +@@ -46,7 +45,7 @@ fn main() { + let libcubeb_path = if Path::new("libcubeb").exists() { + "libcubeb".to_owned() + } else { +- env::var("OUT_DIR").unwrap() + "/libcubeb" ++ "WRKDIR/libcubeb".to_owned() + }; + + if !Path::new(&libcubeb_path).exists() { diff --git a/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs b/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs new file mode 100644 index 000000000000..536d4e74daeb --- /dev/null +++ b/multimedia/ringrtc/files/patch-src_rust_src_webrtc_audio__device__module__utils.rs @@ -0,0 +1,38 @@ +--- src/rust/src/webrtc/audio_device_module_utils.rs.orig 2024-11-18 16:04:01.050553000 +0100 ++++ src/rust/src/webrtc/audio_device_module_utils.rs 2024-11-18 16:06:58.737883000 +0100 +@@ -17,7 +17,7 @@ pub struct DeviceCollectionWrapper<'a> { + device_collection: DeviceCollection<'a>, + } + +-#[cfg(target_os = "linux")] ++#[cfg(any(target_os = "freebsd", target_os = "linux"))] + fn device_is_monitor(device: &DeviceInfo) -> bool { + device.device_type() == cubeb::DeviceType::INPUT + && device +@@ -41,7 +41,7 @@ impl DeviceCollectionWrapper<'_> { + } + + // For linux only, a method that will ignore "monitor" devices. +- #[cfg(target_os = "linux")] ++ #[cfg(any(target_os = "freebsd", target_os = "linux"))] + pub fn iter_non_monitor( + &self, + ) -> std::iter::Filter<std::slice::Iter<'_, DeviceInfo>, fn(&&DeviceInfo) -> bool> { +@@ -82,7 +82,7 @@ impl DeviceCollectionWrapper<'_> { + { + self.iter().nth(idx - 1) + } +- #[cfg(target_os = "linux")] ++ #[cfg(any(target_os = "freebsd", target_os = "linux"))] + { + // filter out "monitor" devices. + self.iter_non_monitor().nth(idx - 1) +@@ -112,7 +112,7 @@ impl DeviceCollectionWrapper<'_> { + let count = self.iter().count(); + // Whether a monitor device is default or not, there will be an additional default, + // so no need to do anything different. +- #[cfg(target_os = "linux")] ++ #[cfg(any(target_os = "freebsd", target_os = "linux"))] + let count = self.iter_non_monitor().count(); + if count == 0 { + 0 diff --git a/multimedia/ringrtc/files/patch-third__party_perfetto_include_perfetto_base_time.h b/multimedia/ringrtc/files/patch-third__party_perfetto_include_perfetto_base_time.h index 08837c11078d..38d9c9022aa7 100644 --- a/multimedia/ringrtc/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/multimedia/ringrtc/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ --- src/webrtc/src/third_party/perfetto/include/perfetto/base/time.h.orig 2024-05-21 18:07:39 UTC +++ src/webrtc/src/third_party/perfetto/include/perfetto/base/time.h -@@ -201,6 +201,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -199,6 +199,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -208,6 +211,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -206,6 +209,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -215,7 +219,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -213,7 +217,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_utils.cc b/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_utils.cc new file mode 100644 index 000000000000..24c3e85f50de --- /dev/null +++ b/multimedia/ringrtc/files/patch-third__party_perfetto_src_base_utils.cc @@ -0,0 +1,26 @@ +--- src/webrtc/src/third_party/perfetto/src/base/utils.cc.orig 2024-10-22 08:31:56 UTC ++++ src/webrtc/src/third_party/perfetto/src/base/utils.cc +@@ -38,8 +38,9 @@ + #include <mach/vm_page_size.h> + #endif + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + #include <sys/prctl.h> + + #ifndef PR_GET_TAGGED_ADDR_CTRL +@@ -337,8 +338,9 @@ void AlignedFree(void* ptr) { + } + + bool IsSyncMemoryTaggingEnabled() { +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + // Compute only once per lifetime of the process. + static bool cached_value = [] { + const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); diff --git a/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 74494c8c6eec..d46e20744582 100644 --- a/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_ip__address.cc +++ b/multimedia/ringrtc/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,9 +1,9 @@ --- src/webrtc/src/rtc_base/ip_address.cc.orig 2022-05-19 14:06:27 UTC +++ src/webrtc/src/rtc_base/ip_address.cc -@@ -13,7 +13,8 @@ - #include <sys/socket.h> - - #include "absl/strings/string_view.h" +@@ -14,7 +14,8 @@ + #include <cstring> + #include <string> + #if defined(WEBRTC_POSIX) -#ifdef OPENBSD +#if defined(WEBRTC_BSD) +#include <sys/types.h> diff --git a/multimedia/ringrtc/update.txt b/multimedia/ringrtc/update.txt index cb234915d704..fd103c2b5b51 100644 --- a/multimedia/ringrtc/update.txt +++ b/multimedia/ringrtc/update.txt @@ -2,4 +2,4 @@ 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.48.3/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.48.7/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 38a1cd11a749..e1cfb2fef433 100644 --- a/multimedia/ringrtc/webrtc_fetch.sh +++ b/multimedia/ringrtc/webrtc_fetch.sh @@ -1,6 +1,6 @@ #!/bin/sh -WEBRTC_REV=6613c +WEBRTC_REV=6723a base_url="https://chromium.googlesource.com/chromium/src/base.git/+archive/" boringssl_url="https://boringssl.googlesource.com/boringssl.git/+archive/"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411221459.4AMExxNd059359>