From nobody Tue Feb 13 18:01:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZ8Jg3gH5z59P6Y; Tue, 13 Feb 2024 18:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ8Jg3DVdz4447; Tue, 13 Feb 2024 18:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707847267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOev6HMoRpLrNMtZzbiE1/wwfnxJ3IqJludIobyxqKY=; b=TCD4BiEXhvPsYbGYQItjBE0doA8yw225N3zFkOjPuEr4le++l9ALMuFh9FSV/JXqH0ijyF QJanh9G0QIONx+8JVHD7XQF/psVWzgtSry/HQPyszJrTesosGyzZLN7JtGRmjqIZ341VCR gq4Yhs0qOQGZ3XQcMcDMRL0lO1NUdT2Th5iLULZRrHWZ1hcipOak3bzKTAwuPcZQdOnuPZ xGL5N6IpUFTCvc1P8u/KZXA/AAlWbPlyNBz0UYCq73pXtma8eXogBxaFJW/1FVveAltKfy jjw/N1oT1uv2UXC8kJqrK5WT563j5f6F7TmSnMohp36nb8a6cIFvWknY0Hf++w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707847267; a=rsa-sha256; cv=none; b=w/EEqqpFB/D7Jmbork0PlQKa57kjlfRQnZoNkFR43tBo4Tmnya0os9dAnqfQTTZ4pS3hxg JzW5XvHHRAXX3o0TNAe1lBeWgfOdKDEUIpdM9ZXhqOlJTbWOIDXc9r43KnjuD4fljueYNz U7KNfgxSPubM2Wloa3S2rQ3K+c7gyNyI3p2Acxe9iux2F2boqMkkeRkwDO8AxzjI4CSV1i GFG3UYybgboD/20S7lG9eD33bDwnV0Pb2Ae0ai3QIjunE+b74BtJgNzzeSyBM7UB15L3nR cMz4tNpHApgCDa/Xt4kX+tdYdnuEqpuFbFSiqyG+xWgNC0At/NvGH+7YIpHuTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707847267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOev6HMoRpLrNMtZzbiE1/wwfnxJ3IqJludIobyxqKY=; b=jDmgQ/MPULwXXbM0DWMGXu2tYXF3csa4mR+IbWAFTmrHpyi0QjtOx4iwO3CBXPot8wke8E W9CKuNZq6OK9ADVvDQDeUwk54C9W95dZf1NpORXgmzREnyp4n3y/IJrD4mNPQmxIa5SHqf Bj7n3xLLVLJAreVQcf8mJedzbJlQZLMPshw6wVFUdMWHiJpmXFAV2N5vLnFzo94G8RhZV+ cAIOZnPh3dBepfDM9XGMahZrx9mQ3jBRDdrmxR6oJrAEyS6vj+v4eHKRmZV6gvx9+uFrG9 tYd5qLpijEJjBg2eRTr89ZERGcVGkSipzoRShRG1V7vkucVNUmX12KTUFdmkhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ8Jg2J0JzPYx; Tue, 13 Feb 2024 18:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DI17ch069075; Tue, 13 Feb 2024 18:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DI17UE069072; Tue, 13 Feb 2024 18:01:07 GMT (envelope-from git) Date: Tue, 13 Feb 2024 18:01:07 GMT Message-Id: <202402131801.41DI17UE069072@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 0707093c0a5d - main - www/qt6-webengine: fix build with clang 18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0707093c0a5df15911d72c3b2e8001b3428f2e2e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=0707093c0a5df15911d72c3b2e8001b3428f2e2e commit 0707093c0a5df15911d72c3b2e8001b3428f2e2e Author: Dimitry Andric AuthorDate: 2024-02-12 08:17:56 +0000 Commit: Dimitry Andric CommitDate: 2024-02-13 18:00:05 +0000 www/qt6-webengine: fix build with clang 18 Clang 18 has become more stringent about narrowing in initializer lists, resulting in errors when building www/qt6-webengine: ../../../../../qtwebengine-everywhere-src-6.6.1/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc:192:54: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list [-Wc++11-narrowing-const-reference] 192 | {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../../../../qtwebengine-everywhere-src-6.6.1/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc:194:8: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list [-Wc++11-narrowing-const-reference] 194 | info.total_output_duration}}; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Cherry-pick https://webrtc.googlesource.com/src/+/267f9bdd53 into the thirdparty directory, which fixes these errors. PR: 276997 MFH: 2024Q1 --- ...rd__party_webrtc_pc_legacy__stats__collector.cc | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc new file mode 100644 index 000000000000..7c8461b8c921 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc @@ -0,0 +1,114 @@ +commit 267f9bdd53a37d1cbee760d5af07880198e1beef +Author: Tommi +Date: 2023-12-21T14:08:26+01:00 + + Update LegacyStatsCollector to conform with Wc++11-narrowing + + Bug: none + Change-Id: Ida6a1af5c324473a55ea4f3b143862ea016ff50a + Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/332240 + Commit-Queue: Tomas Gunnarsson + Reviewed-by: Harald Alvestrand + Auto-Submit: Tomas Gunnarsson + Reviewed-by: Alexander Kornienko + Reviewed-by: Henrik Boström + Cr-Commit-Position: refs/heads/main@{#41432} + +--- src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc.orig 2023-11-20 16:08:07 UTC ++++ src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -189,9 +189,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& in + {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate}, + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast(info.total_output_duration)}}; + + const IntForAdd ints[] = { + {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms}, +@@ -245,9 +246,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info + SetAudioProcessingStats(report, info.apm_statistics); + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); + const IntForAdd ints[] = { +@@ -341,7 +343,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& in + {StatsReport::kStatsValueNamePlisSent, info.plis_sent}, + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, ++ static_cast(info.frames_decoded)}, + }; + + for (const auto& i : ints) +@@ -385,15 +388,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info + info.encode_usage_percent}, + {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, ++ static_cast(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast(info.nacks_rcvd)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, ++ static_cast(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, ++ static_cast(info.huge_frames_sent)}, + }; + + for (const auto& i : ints) +@@ -782,19 +789,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoRe + AddCandidateReport(remote_candidate_stats, false)->id()); + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, ++ static_cast(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, ++ static_cast(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, ++ static_cast(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, ++ static_cast(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, ++ static_cast(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, ++ static_cast(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) + report->AddInt64(i.name, i.value);