From nobody Thu Feb 22 21:28:18 2024 X-Original-To: dev-commits-ports-all@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 4TgmTb0QSTz5BS3T; Thu, 22 Feb 2024 21:28:19 +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 4TgmTZ742Cz43Dy; Thu, 22 Feb 2024 21:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708637299; 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=Al4v5wzjegcCsamsnU/JP5pNqCItqjskVf6PbEpNmbQ=; b=DkV5+MwstXI4uJ0m6JAckC20tRvM3f0Bs8TON8Y88Bn62N+gq41HF9+515Ls3jqRO9rgPw /FZLefwKGQMfFLFGGuLiLDDQjLGk/zxgExEtQg8E8XXvp3KZB9XXmPovJhM+BLs+QBX0kN zItyyVz+H9inB1mroGqkljzR3bgQVb0Tw76iGMiIw7u/q5Z1hu/VsgEj53Ds3uTfHPWRtK fp1Ilv1XQO8erHAKUkGjwZ0y7lXAMGJ7nExGahS9dqow+Ry86cFYHQD/naft5ISXqUTxFH naoFenRKYb5Td05QBhnjf14SrFPTclS+063ADCrH+5OLmSdI1qtoD+jDV14jWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708637299; 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=Al4v5wzjegcCsamsnU/JP5pNqCItqjskVf6PbEpNmbQ=; b=Z6kCYEMOMTSmas05R8j5Nz4xOwM+C5W7VSIOpb82mobGlqmSb8zEmtzbUXlCaQTu5qNJik pUQSD/xaI1rpO+2sw8/tP9RYITF+MPh/nAu5viGeU7wh+pJhwc/owj6UsXhSaeJzq7uhB+ 84rAceQq7GCnhEFhMeK5kbLY0NyS5J0d508Ld4IganA7trStkKKJI3A2wAuA3vvQG7tbLS vPuGYZJQma1pcWT3o5ge3RsQs8Jcav7zvR64p1f2ZKqLIcEZxPiMwxcH37UB9XO3/9nP2e w0D/fZpYYUUl3g60Q8OZfM0/TwuEHo5lTkh51TeMOZkXcTHBFh+4+F9s8Pil9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708637299; a=rsa-sha256; cv=none; b=f7ZnT04plMhZUNhcvmGXZ72gNCPDcVyOrmszgmbV01FXgONqJbBNi5fjh1vefgf0UyogBW NM+aH20ow7CNdaFW5YxMp5i9I0urXsTmwGHPbJ3ajXsFzbpPq4xduufHHN5gTG32sLlvGQ u2Ky+xCTu+qUhp1pwqWCkztqcowj94vo1VNZ+U8AB4vLDCZh6qL1oH3avPU5aKWIWUTysw y86kkteFX4N0MBC0hGQBF+F+7ebUXo/BaZwUoh+BdkNBLShPB6sv/ETu+WHhhoaJ7wctNv Zh0JFcGzBDT1uzLaDr/jnfiBcEnijxQFfo30jSdCBBo45Bt/OrARhAww2Ah2gQ== 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 4TgmTZ66Z6zpPp; Thu, 22 Feb 2024 21:28:18 +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 41MLSIVJ024669; Thu, 22 Feb 2024 21:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MLSIP3024666; Thu, 22 Feb 2024 21:28:18 GMT (envelope-from git) Date: Thu, 22 Feb 2024 21:28:18 GMT Message-Id: <202402222128.41MLSIP3024666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 664c5df76078 - main - devel/electron26: fix build with clang 18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 664c5df7607834a4345b4bc99490db6681ac06c2 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=664c5df7607834a4345b4bc99490db6681ac06c2 commit 664c5df7607834a4345b4bc99490db6681ac06c2 Author: Dimitry Andric AuthorDate: 2024-02-22 21:22:24 +0000 Commit: Hiroki Tagato CommitDate: 2024-02-22 21:27:53 +0000 devel/electron26: fix build with clang 18 Clang 18 has become more stringent about narrowing in initializer lists, resulting in errors when building devel/electron26: ../../third_party/webrtc/pc/legacy_stats_collector.cc:191:54: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list [-Wc++11-narrowing-const-reference] 191 | {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../third_party/webrtc/pc/legacy_stats_collector.cc:193:8: error: non-constant-expression cannot be narrowed from type 'double' to 'float' in initializer list [-Wc++11-narrowing-const-reference] 193 | info.total_output_duration}}; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ and later: In file included from ../../cc/layers/mirror_layer_impl.cc:5: ../../cc/layers/mirror_layer_impl.h:59:40: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing-const-reference] 59 | return viz::CompositorRenderPassId{mirrored_layer_id()}; | ^~~~~~~~~~~~~~~~~~~ The first batch of errors can be fixed similarly to bug 276997, by cherry-picking into the thirdparty directory. The second batch of errors can be fixed by cherry-picking . PR: 277129 MFH: 2024Q1 --- .../files/patch-cc_layers_mirror__layer__impl.h | 20 +++++ ...er__metrics_energy__metrics__provider__linux.cc | 14 ++++ ...rd__party_webrtc_pc_legacy__stats__collector.cc | 98 ++++++++++++++++++++++ 3 files changed, 132 insertions(+) diff --git a/devel/electron26/files/patch-cc_layers_mirror__layer__impl.h b/devel/electron26/files/patch-cc_layers_mirror__layer__impl.h new file mode 100644 index 000000000000..0679824cf885 --- /dev/null +++ b/devel/electron26/files/patch-cc_layers_mirror__layer__impl.h @@ -0,0 +1,20 @@ +--- cc/layers/mirror_layer_impl.h.orig 2023-10-09 02:55:16 UTC ++++ cc/layers/mirror_layer_impl.h +@@ -5,6 +5,7 @@ + #ifndef CC_LAYERS_MIRROR_LAYER_IMPL_H_ + #define CC_LAYERS_MIRROR_LAYER_IMPL_H_ + ++#include + #include + + #include "base/memory/ptr_util.h" +@@ -56,7 +57,8 @@ class CC_EXPORT MirrorLayerImpl : public LayerImpl { + private: + const char* LayerTypeAsString() const override; + viz::CompositorRenderPassId mirrored_layer_render_pass_id() const { +- return viz::CompositorRenderPassId{mirrored_layer_id()}; ++ return viz::CompositorRenderPassId{ ++ static_cast(mirrored_layer_id())}; + } + + int mirrored_layer_id_ = 0; diff --git a/devel/electron26/files/patch-components_power__metrics_energy__metrics__provider__linux.cc b/devel/electron26/files/patch-components_power__metrics_energy__metrics__provider__linux.cc new file mode 100644 index 000000000000..33bd8da86c92 --- /dev/null +++ b/devel/electron26/files/patch-components_power__metrics_energy__metrics__provider__linux.cc @@ -0,0 +1,14 @@ +--- components/power_metrics/energy_metrics_provider_linux.cc.orig 2023-10-09 02:55:25 UTC ++++ components/power_metrics/energy_metrics_provider_linux.cc +@@ -61,9 +61,9 @@ base::ScopedFD OpenPerfEvent(perf_event_attr* perf_att + // value of less than 1. Here, we only consider cpu0. See details in + // https://man7.org/linux/man-pages/man2/perf_event_open.2.html. + base::ScopedFD OpenPerfEvent(perf_event_attr* perf_attr) { +- base::ScopedFD perf_fd{syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, ++ base::ScopedFD perf_fd(syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, + /*cpu=*/0, /*group_fd=*/-1, +- PERF_FLAG_FD_CLOEXEC)}; ++ static_cast(PERF_FLAG_FD_CLOEXEC))); + return perf_fd; + } + diff --git a/devel/electron26/files/patch-third__party_webrtc_pc_legacy__stats__collector.cc b/devel/electron26/files/patch-third__party_webrtc_pc_legacy__stats__collector.cc new file mode 100644 index 000000000000..d6582c5d58f0 --- /dev/null +++ b/devel/electron26/files/patch-third__party_webrtc_pc_legacy__stats__collector.cc @@ -0,0 +1,98 @@ +--- third_party/webrtc/pc/legacy_stats_collector.cc.orig 2023-10-09 03:06:13 UTC ++++ third_party/webrtc/pc/legacy_stats_collector.cc +@@ -188,9 +188,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}, +@@ -244,9 +245,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[] = { +@@ -340,7 +342,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) +@@ -384,15 +387,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info + info.encode_usage_percent}, + {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, + {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_received}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast(info.nacks_received)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, +- {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) +@@ -780,19 +787,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);