From 77e0c9ecb53471fd986b6da342a090ca09679aac Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 10 Mar 2023 12:38:28 -0500 Subject: [PATCH] backports/electron: upgrade to 21.4.2 --- backports/electron/APKBUILD | 64 ++-- .../roll-src-third_party-ffmpeg-102.patch | 287 ------------------ .../roll-src-third_party-ffmpeg-106.patch | 15 - 3 files changed, 42 insertions(+), 324 deletions(-) delete mode 100644 backports/electron/roll-src-third_party-ffmpeg-102.patch delete mode 100644 backports/electron/roll-src-third_party-ffmpeg-106.patch diff --git a/backports/electron/APKBUILD b/backports/electron/APKBUILD index 0d7ecaa..6dc3c19 100644 --- a/backports/electron/APKBUILD +++ b/backports/electron/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: psykose pkgname=electron -pkgver=21.3.3 -pkgrel=3 +pkgver=21.4.2 +pkgrel=1 _chromium=106.0.5249.199 -_depot_tools=6fde0fbe9226ae3fc9f5c709adb93249924e5c49 +_depot_tools=d85c5bc6ff0dee8171007d947aabc3dfa6dd433b pkgdesc="Electron cross-platform desktop toolkit" url="https://github.com/electron/electron" arch="aarch64 x86_64" # same as chromium @@ -120,8 +120,6 @@ source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz partition-atfork.patch py3.11.patch quiche-arena-size.patch - roll-src-third_party-ffmpeg-102.patch - roll-src-third_party-ffmpeg-106.patch scoped-file-no-close.patch temp-failure-retry.patch wtf-stacksize.patch @@ -207,6 +205,12 @@ snapshot() { python3 electron/script/apply_all_patches.py \ electron/patches/config.json + + python3 src/tools/update_pgo_profiles.py \ + --target=linux \ + update \ + --gs-url-base=chromium-optimization-profiles/pgo_profiles + python3 src/tools/download_optimization_profile.py \ --newest_state=src/chrome/android/profiles/newest.txt \ --local_state=src/chrome/android/profiles/local.txt \ @@ -231,7 +235,7 @@ snapshot() { --exclude-vcs \ $pkgname-$pkgver - xz -T0 -e -9 -vv -k $pkgname-$pkgver.tar + xz --memlimit=60GB -T0 -e -9 -vv -k $pkgname-$pkgver.tar } prepare() { @@ -330,31 +334,48 @@ prepare() { msg "Configuring build" local gn_config=" - import(\"//electron/build/args/release.gn\") - blink_enable_generated_code_formatting=false - chrome_pgo_phase=0 - clang_use_chrome_plugins=false + clang_base_path=\"/usr\" custom_toolchain=\"//build/toolchain/linux/unbundle:default\" - disable_fieldtrial_testing_config=true - enable_hangout_services_extension=true - enable_nacl=false - enable_stripping=false - enable_vr=false + host_toolchain=\"//build/toolchain/linux/unbundle:default\" + import(\"//electron/build/args/release.gn\") + + blink_enable_generated_code_formatting=false + clang_use_chrome_plugins=false fatal_linker_warnings=false ffmpeg_branding=\"Chrome\" - host_toolchain=\"//build/toolchain/linux/unbundle:default\" icu_use_data_file=true is_cfi=false is_component_ffmpeg=true is_debug=false is_official_build=true + symbol_level=0 + treat_warnings_as_errors=false + + angle_enable_gl_null=false + build_tflite_with_xnnpack=false + build_with_tflite_lib=false + disable_fieldtrial_testing_config=true + enable_hangout_services_extension=true + enable_library_cdms=false + enable_media_remoting=false + enable_nacl=false + enable_paint_preview=false + enable_reading_list=false + enable_remoting=false + enable_reporting=false + enable_screen_ai_service=false + enable_service_discovery=false + enable_stripping=false + enable_vr=false + enable_xz_extractor=false + ozone_platform_headless=false + link_pulseaudio=true proprietary_codecs=true rtc_link_pipewire=true rtc_use_pipewire=true - symbol_level=0 - treat_warnings_as_errors=false use_custom_libcxx=false + use_dawn=false use_gnome_keyring=false use_pulseaudio=true use_sysroot=false @@ -363,10 +384,11 @@ prepare() { use_system_lcms2=true use_system_libdrm=true use_system_libjpeg=true + use_system_libwayland=true use_system_wayland_scanner=true use_system_zlib=true use_vaapi=true - " + " gn gen out/Release \ --args="$(echo $gn_config)" \ @@ -419,7 +441,7 @@ lang() { } sha512sums=" -1d21e74875ade836625c28d8d9351b41d2776def248193e9c82d4cd50375e9e9b2f7c40026673fe2a191a936f05c3fe639b0423964356ad678f41545aceede3c electron-21.3.3.tar.xz +d2a6de4bc851de81d9f19fdb46b023abd77e27acc33bff8fc7cec7b84d0aeda3008e00289444f4f2423b20efcc72e4c3036f809fb6ce1ad9828983bee4721ff2 electron-21.4.2.tar.xz f19ba0c0f542115e6f53019659df256471e811a23d2f37569c9d4dfa265c0c1ace3e62c74d7507f82e6b7b4152c704e651810a00616f8f531592b14bb2af01d9 angle-wayland-include.patch 252b37a2ecc5e7a25385943045f426dc2e30991b28d206ceaff1be7fd8ffeeb024310a8fca6b3e69a4b1c57db535d51c570935351053525f393682d5ecd0f9a9 canonicalize-file-name.patch ac0a80174f95d733f33ddc06fc88cdcf7db0973378c28d8544dc9c19e2dabeac47f91c99b3e7384f650b3405554a9e222543f0860b6acc407c078a8c9180d727 chromium-VirtualCursor-standard-layout.patch @@ -446,8 +468,6 @@ a5aa82c30402773903db1d3876208132fdef175f56ebc0ce1ee4c104a98d498d709c5565c4381736 ad563e29ac7d83c203f5af966c4ed3ebdeb5c997835a45fb28ecde08dde5231d0a775fb413f44867af28724504c42316b27d5a6aaa602057642dcbdf7ec20a7a partition-atfork.patch 65aa0c7c9909a803e59b88ecb6d79c4db491079f3324f7bd02ee485a7bb7a81674b8f0591dab766c97070a401116db7f629fee36af7416a0fefc38f4ae0ad13d py3.11.patch 083ed731e0a3788f2cb04a3035022fbb3e4db99eba01516ea233ea3229f7d898943d8115463a48655ac83eb3cc7a48aceb8bf17c68930a5a1d83b1af95dfade8 quiche-arena-size.patch -128ec0fd14349e065c8bb0910d53cbea7423182a06e06f7b7765f3cba1e5ba5e7a8bccbcdab079335b5235abb7bf0d46dee21ecc8c221be7e1c5c6d9795f958e roll-src-third_party-ffmpeg-102.patch -1063e68f477645914ddf5641eabdd3eaf744e569635d645ea860c3546f67a7ef91eded99331378ee75071b67ecfe9bd4be307bd3da7c7ad93509e2bd634d1ec3 roll-src-third_party-ffmpeg-106.patch 3cf36b269e9fcfa74975d267bbf31bef68b533a51672e5ed81ae511a70f28a45206168af370961a3dab5695ddaff41cb8839c8c2fa53f22a9f3c88d207cb2996 scoped-file-no-close.patch f2f7673f9e793dfbf4456ff8c2be785ea551c36bd512572245d04bf44da08b0133e98d85a1ffd51158009754c83121cad48d755cbc153735df2d2e73233856c0 temp-failure-retry.patch 1d4e8c6e65205e6b72af47b9a2fa6f96aaada9b7d5a74f4e11a345a885df3078b523d02aaf8e9dac3aa30d72bbbd07cd6dc7edcf44fb9ae57a7f81251c398f65 wtf-stacksize.patch diff --git a/backports/electron/roll-src-third_party-ffmpeg-102.patch b/backports/electron/roll-src-third_party-ffmpeg-102.patch deleted file mode 100644 index 5ca8093..0000000 --- a/backports/electron/roll-src-third_party-ffmpeg-102.patch +++ /dev/null @@ -1,287 +0,0 @@ ---- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc -+++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc -@@ -74,7 +74,7 @@ - codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; - } - -- codec_context->ch_layout.nb_channels = config.channel_count; -+ codec_context->channels = config.channel_count; - codec_context->sample_rate = config.samples_per_second; - - if (config.extra_data) { -@@ -124,8 +124,8 @@ - case cdm::kAudioFormatPlanarS16: - case cdm::kAudioFormatPlanarF32: { - const int decoded_size_per_channel = -- decoded_audio_size / av_frame.ch_layout.nb_channels; -- for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { -+ decoded_audio_size / av_frame.channels; -+ for (int i = 0; i < av_frame.channels; ++i) { - memcpy(output_buffer, av_frame.extended_data[i], - decoded_size_per_channel); - output_buffer += decoded_size_per_channel; -@@ -185,14 +185,13 @@ - // Success! - decoding_loop_ = std::make_unique(codec_context_.get()); - samples_per_second_ = config.samples_per_second; -- bytes_per_frame_ = -- codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; -+ bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; - output_timestamp_helper_ = - std::make_unique(config.samples_per_second); - is_initialized_ = true; - - // Store initial values to guard against midstream configuration changes. -- channels_ = codec_context_->ch_layout.nb_channels; -+ channels_ = codec_context_->channels; - av_sample_format_ = codec_context_->sample_fmt; - - return true; -@@ -292,19 +291,17 @@ - for (auto& frame : audio_frames) { - int decoded_audio_size = 0; - if (frame->sample_rate != samples_per_second_ || -- frame->ch_layout.nb_channels != channels_ || -- frame->format != av_sample_format_) { -+ frame->channels != channels_ || frame->format != av_sample_format_) { - DLOG(ERROR) << "Unsupported midstream configuration change!" - << " Sample Rate: " << frame->sample_rate << " vs " -- << samples_per_second_ -- << ", Channels: " << frame->ch_layout.nb_channels << " vs " -- << channels_ << ", Sample Format: " << frame->format << " vs " -- << av_sample_format_; -+ << samples_per_second_ << ", Channels: " << frame->channels -+ << " vs " << channels_ << ", Sample Format: " << frame->format -+ << " vs " << av_sample_format_; - return cdm::kDecodeError; - } - - decoded_audio_size = av_samples_get_buffer_size( -- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, -+ nullptr, codec_context_->channels, frame->nb_samples, - codec_context_->sample_fmt, 1); - if (!decoded_audio_size) - continue; -@@ -323,9 +320,9 @@ - size_t* total_size, - std::vector>* audio_frames, - AVFrame* frame) { -- *total_size += av_samples_get_buffer_size( -- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, -- codec_context_->sample_fmt, 1); -+ *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, -+ frame->nb_samples, -+ codec_context_->sample_fmt, 1); - audio_frames->emplace_back(av_frame_clone(frame)); - return true; - } ---- a/media/ffmpeg/ffmpeg_common.cc -+++ b/media/ffmpeg/ffmpeg_common.cc -@@ -345,11 +345,10 @@ - codec_context->sample_fmt, codec_context->codec_id); - - ChannelLayout channel_layout = -- codec_context->ch_layout.nb_channels > 8 -+ codec_context->channels > 8 - ? CHANNEL_LAYOUT_DISCRETE -- : ChannelLayoutToChromeChannelLayout( -- codec_context->ch_layout.u.mask, -- codec_context->ch_layout.nb_channels); -+ : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, -+ codec_context->channels); - - int sample_rate = codec_context->sample_rate; - switch (codec) { -@@ -402,7 +401,7 @@ - extra_data, encryption_scheme, seek_preroll, - codec_context->delay); - if (channel_layout == CHANNEL_LAYOUT_DISCRETE) -- config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); -+ config->SetChannelsForDiscrete(codec_context->channels); - - #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) - // These are bitstream formats unknown to ffmpeg, so they don't have -@@ -471,7 +470,7 @@ - - // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses - // said information to decode. -- codec_context->ch_layout.nb_channels = config.channels(); -+ codec_context->channels = config.channels(); - codec_context->sample_rate = config.samples_per_second(); - - if (config.extra_data().empty()) { ---- a/media/filters/audio_file_reader.cc -+++ b/media/filters/audio_file_reader.cc -@@ -113,15 +113,14 @@ - - // Verify the channel layout is supported by Chrome. Acts as a sanity check - // against invalid files. See http://crbug.com/171962 -- if (ChannelLayoutToChromeChannelLayout( -- codec_context_->ch_layout.u.mask, -- codec_context_->ch_layout.nb_channels) == -+ if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout, -+ codec_context_->channels) == - CHANNEL_LAYOUT_UNSUPPORTED) { - return false; - } - - // Store initial values to guard against midstream configuration changes. -- channels_ = codec_context_->ch_layout.nb_channels; -+ channels_ = codec_context_->channels; - audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); - sample_rate_ = codec_context_->sample_rate; - av_sample_format_ = codec_context_->sample_fmt; -@@ -224,7 +223,7 @@ - if (frames_read < 0) - return false; - -- const int channels = frame->ch_layout.nb_channels; -+ const int channels = frame->channels; - if (frame->sample_rate != sample_rate_ || channels != channels_ || - frame->format != av_sample_format_) { - DLOG(ERROR) << "Unsupported midstream configuration change!" ---- a/media/filters/audio_file_reader_unittest.cc -+++ b/media/filters/audio_file_reader_unittest.cc -@@ -121,11 +121,11 @@ - EXPECT_FALSE(reader_->Open()); - } - -- void RunTestFailingDecode(const char* fn, int expect_read = 0) { -+ void RunTestFailingDecode(const char* fn) { - Initialize(fn); - EXPECT_TRUE(reader_->Open()); - std::vector> decoded_audio_packets; -- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); -+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); - } - - void RunTestPartialDecode(const char* fn) { -@@ -219,7 +219,7 @@ - } - - TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { -- RunTestFailingDecode("midstream_config_change.mp3", 42624); -+ RunTestFailingDecode("midstream_config_change.mp3"); - } - #endif - ---- a/media/filters/audio_video_metadata_extractor.cc -+++ b/media/filters/audio_video_metadata_extractor.cc -@@ -113,15 +113,6 @@ - if (!stream) - continue; - -- void* display_matrix = -- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); -- if (display_matrix) { -- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix( -- static_cast(display_matrix)) -- .rotation; -- info.tags["rotate"] = base::NumberToString(rotation_); -- } -- - // Extract dictionary from streams also. Needed for containers that attach - // metadata to contained streams instead the container itself, like OGG. - ExtractDictionary(stream->metadata, &info.tags); -@@ -264,6 +255,8 @@ - if (raw_tags->find(tag->key) == raw_tags->end()) - (*raw_tags)[tag->key] = tag->value; - -+ if (ExtractInt(tag, "rotate", &rotation_)) -+ continue; - if (ExtractString(tag, "album", &album_)) - continue; - if (ExtractString(tag, "artist", &artist_)) ---- a/media/filters/ffmpeg_aac_bitstream_converter.cc -+++ b/media/filters/ffmpeg_aac_bitstream_converter.cc -@@ -195,15 +195,14 @@ - if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id || - audio_profile_ != stream_codec_parameters_->profile || - sample_rate_index_ != sample_rate_index || -- channel_configuration_ != -- stream_codec_parameters_->ch_layout.nb_channels || -+ channel_configuration_ != stream_codec_parameters_->channels || - frame_length_ != header_plus_packet_size) { - header_generated_ = - GenerateAdtsHeader(stream_codec_parameters_->codec_id, - 0, // layer - stream_codec_parameters_->profile, sample_rate_index, - 0, // private stream -- stream_codec_parameters_->ch_layout.nb_channels, -+ stream_codec_parameters_->channels, - 0, // originality - 0, // home - 0, // copyrighted_stream -@@ -215,7 +214,7 @@ - codec_ = stream_codec_parameters_->codec_id; - audio_profile_ = stream_codec_parameters_->profile; - sample_rate_index_ = sample_rate_index; -- channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; -+ channel_configuration_ = stream_codec_parameters_->channels; - frame_length_ = header_plus_packet_size; - } - ---- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc -+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc -@@ -34,7 +34,7 @@ - memset(&test_parameters_, 0, sizeof(AVCodecParameters)); - test_parameters_.codec_id = AV_CODEC_ID_AAC; - test_parameters_.profile = FF_PROFILE_AAC_MAIN; -- test_parameters_.ch_layout.nb_channels = 2; -+ test_parameters_.channels = 2; - test_parameters_.extradata = extradata_header_; - test_parameters_.extradata_size = sizeof(extradata_header_); - } ---- a/media/filters/ffmpeg_audio_decoder.cc -+++ b/media/filters/ffmpeg_audio_decoder.cc -@@ -28,7 +28,7 @@ - - // Return the number of channels from the data in |frame|. - static inline int DetermineChannels(AVFrame* frame) { -- return frame->ch_layout.nb_channels; -+ return frame->channels; - } - - // Called by FFmpeg's allocation routine to allocate a buffer. Uses -@@ -231,7 +231,7 @@ - // Translate unsupported into discrete layouts for discrete configurations; - // ffmpeg does not have a labeled discrete configuration internally. - ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( -- codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); -+ codec_context_->channel_layout, codec_context_->channels); - if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && - config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { - channel_layout = CHANNEL_LAYOUT_DISCRETE; -@@ -348,11 +348,11 @@ - // Success! - av_sample_format_ = codec_context_->sample_fmt; - -- if (codec_context_->ch_layout.nb_channels != config.channels()) { -+ if (codec_context_->channels != config.channels()) { - MEDIA_LOG(ERROR, media_log_) - << "Audio configuration specified " << config.channels() - << " channels, but FFmpeg thinks the file contains " -- << codec_context_->ch_layout.nb_channels << " channels"; -+ << codec_context_->channels << " channels"; - ReleaseFFmpegResources(); - state_ = DecoderState::kUninitialized; - return false; -@@ -403,7 +403,7 @@ - if (frame->nb_samples <= 0) - return AVERROR(EINVAL); - -- if (s->ch_layout.nb_channels != channels) { -+ if (s->channels != channels) { - DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; - return AVERROR(EINVAL); - } -@@ -436,8 +436,7 @@ - ChannelLayout channel_layout = - config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE - ? CHANNEL_LAYOUT_DISCRETE -- : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, -- s->ch_layout.nb_channels); -+ : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); - - if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { - DLOG(ERROR) << "Unsupported channel layout."; diff --git a/backports/electron/roll-src-third_party-ffmpeg-106.patch b/backports/electron/roll-src-third_party-ffmpeg-106.patch deleted file mode 100644 index 7520e86..0000000 --- a/backports/electron/roll-src-third_party-ffmpeg-106.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/media/filters/audio_file_reader.cc -+++ b/media/filters/audio_file_reader.cc -@@ -243,10 +243,10 @@ - // silence from being output. In the case where we are also discarding some - // portion of the packet (as indicated by a negative pts), we further want to - // adjust the duration downward by however much exists before zero. -- if (audio_codec_ == AudioCodec::kAAC && frame->duration) { -+ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) { - const base::TimeDelta pkt_duration = ConvertFromTimeBase( - glue_->format_context()->streams[stream_index_]->time_base, -- frame->duration + std::min(static_cast(0), frame->pts)); -+ frame->pkt_duration + std::min(static_cast(0), frame->pts)); - const base::TimeDelta frame_duration = - base::Seconds(frames_read / static_cast(sample_rate_)); -