From c29e620a5a24937576c887e29be143f6382c764c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 27 Sep 2022 22:50:02 +0200 Subject: [PATCH] chromium: update to 106.0.5249.61. --- ...RT-roll-src-third_party-ffmpeg-m102.patch} | 0 ...ll-src-third_party-ffmpeg-m102.patch.args} | 0 ...ERT-roll-src-third_party-ffmpeg-m106.patch | 55 +++++++++++++++++++ ...oll-src-third_party-ffmpeg-m106.patch.args | 1 + .../patches/chromium-105-bitmap-include.patch | 27 --------- .../chromium-105-browser-include.patch | 25 --------- .../patches/chromium-105-math-ceilf.patch | 42 -------------- ...utofillPopupControllerImpl-namespace.patch | 26 +++++++++ .../fix-argument_spec-isnan-isinf.patch | 11 ++++ srcpkgs/chromium/template | 4 +- 10 files changed, 95 insertions(+), 96 deletions(-) rename srcpkgs/chromium/patches/{roll-src-third_party-ffmpeg.patch => REVERT-roll-src-third_party-ffmpeg-m102.patch} (100%) rename srcpkgs/chromium/patches/{roll-src-third_party-ffmpeg.patch.args => REVERT-roll-src-third_party-ffmpeg-m102.patch.args} (100%) create mode 100644 srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch create mode 100644 srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch.args delete mode 100644 srcpkgs/chromium/patches/chromium-105-bitmap-include.patch delete mode 100644 srcpkgs/chromium/patches/chromium-105-browser-include.patch delete mode 100644 srcpkgs/chromium/patches/chromium-105-math-ceilf.patch create mode 100644 srcpkgs/chromium/patches/chromium-106-AutofillPopupControllerImpl-namespace.patch create mode 100644 srcpkgs/chromium/patches/fix-argument_spec-isnan-isinf.patch diff --git a/srcpkgs/chromium/patches/roll-src-third_party-ffmpeg.patch b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m102.patch similarity index 100% rename from srcpkgs/chromium/patches/roll-src-third_party-ffmpeg.patch rename to srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m102.patch diff --git a/srcpkgs/chromium/patches/roll-src-third_party-ffmpeg.patch.args b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m102.patch.args similarity index 100% rename from srcpkgs/chromium/patches/roll-src-third_party-ffmpeg.patch.args rename to srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m102.patch.args diff --git a/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch new file mode 100644 index 000000000000..b2a113791734 --- /dev/null +++ b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch @@ -0,0 +1,55 @@ +From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001 +From: Eugene Zemtsov +Date: Fri, 29 Jul 2022 04:41:04 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 880df5ede..b71ecd02b (279 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/880df5ede50a..b71ecd02b479 + +$ git log 880df5ede..b71ecd02b --date=short --no-merges --format='%ad %ae %s' +2022-07-27 eugene Roll for M106 +2022-07-25 andreas.rheinhardt avcodec/x86/pngdsp: Remove obsolete ff_add_bytes_l2_mmx() +2022-07-22 andreas.rheinhardt avcodec/hevcdec: Output MD5-message in one piece +2022-07-24 epirat07 configure: properly require libx264 if enabled +2022-07-24 zane avformat/argo_cvg: expose loop/reverb/checksum via metadata +(...) +2022-05-03 leo.izen avcodec/libjxldec: properly tag output colorspace +2022-06-25 ffmpeg avfilter/Makefile: always make colorspace.o +2022-03-02 brad avutil/ppc/cpu: Use proper header for OpenBSD PPC CPU detection +2022-06-24 jamrial avformat/http: include version.h +2022-05-16 mbonda-at-nvidia.com AV1 VDPAU hwaccel Decode support + +Created with: + roll-dep src/third_party/ffmpeg + +ffmpeg usage fix: + Switch from AVFrame::pkt_duration to AVFrame::duration, + AVFrame::pkt_duration is deprecated + +Bug: 1344646 +Change-Id: Iaa3abf48ef81dae6d282bca8f0fa2a8dffeeba25 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3788638 +Reviewed-by: Will Cassella +Commit-Queue: Eugene Zemtsov +Cr-Commit-Position: refs/heads/main@{#1029623} +--- + media/filters/audio_file_reader.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index e1be5aa9a5b..951c003956f 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame( + // 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->pkt_duration) { ++ if (audio_codec_ == AudioCodec::kAAC && frame->duration) { + const base::TimeDelta pkt_duration = ConvertFromTimeBase( + glue_->format_context()->streams[stream_index_]->time_base, +- frame->pkt_duration + std::min(static_cast(0), frame->pts)); ++ frame->duration + std::min(static_cast(0), frame->pts)); + const base::TimeDelta frame_duration = + base::Seconds(frames_read / static_cast(sample_rate_)); + diff --git a/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch.args b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch.args new file mode 100644 index 000000000000..8bbbbe948363 --- /dev/null +++ b/srcpkgs/chromium/patches/REVERT-roll-src-third_party-ffmpeg-m106.patch.args @@ -0,0 +1 @@ +-RNp1 diff --git a/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch b/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch deleted file mode 100644 index b37eee65265f..000000000000 --- a/srcpkgs/chromium/patches/chromium-105-bitmap-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-Bitmap-include.patch -From 8959d9d1c6e4ed083c278ab9e8def20a409052b9 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Fri, 22 Jul 2022 16:51:28 +0000 -Subject: [PATCH] IWYU: add memory for std::unique_ptr in disk_cache::Bitmap - -Bug: 957519 -Change-Id: I123198345e5f9062329b7eabe980f312525c268b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3779530 -Reviewed-by: Maks Orlovich -Commit-Queue: Stephan Hartmann -Cr-Commit-Position: refs/heads/main@{#1027289} ---- - -diff --git a/net/disk_cache/blockfile/bitmap.h b/net/disk_cache/blockfile/bitmap.h -index 07806cf..9ffa98b9 100644 ---- a/net/disk_cache/blockfile/bitmap.h -+++ b/net/disk_cache/blockfile/bitmap.h -@@ -8,6 +8,8 @@ - #include - #include - -+#include -+ - #include "base/memory/raw_ptr.h" - #include "net/base/net_export.h" - diff --git a/srcpkgs/chromium/patches/chromium-105-browser-include.patch b/srcpkgs/chromium/patches/chromium-105-browser-include.patch deleted file mode 100644 index 17cd0a296220..000000000000 --- a/srcpkgs/chromium/patches/chromium-105-browser-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-browser_finder-include.patch -From 41dca8bd0c5e8ac5197d7477c6f01556fb88fb43 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sun, 14 Aug 2022 08:41:11 +0000 -Subject: [PATCH] IWYU: add vector for std::vector in browser_finder.h - ---- - chrome/browser/ui/browser_finder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h -index f885be0..ad7a184 100644 ---- a/chrome/browser/ui/browser_finder.h -+++ b/chrome/browser/ui/browser_finder.h -@@ -6,6 +6,7 @@ - #define CHROME_BROWSER_UI_BROWSER_FINDER_H_ - - #include -+#include - - #include "ui/display/types/display_constants.h" - #include "ui/gfx/native_widget_types.h" --- -2.35.1 - diff --git a/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch b/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch deleted file mode 100644 index 3d4a72ad4bfb..000000000000 --- a/srcpkgs/chromium/patches/chromium-105-math-ceilf.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch-Source: https://github.com/stha09/chromium-patches/blob/cd45403f83a2305d388e1b1f930ca05c13535636/chromium-105-AdjustMaskLayerGeometry-ceilf.patch -From 385068e1eb1cde9629d18ceee1fd13255c70c806 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Fri, 22 Jul 2022 18:29:24 +0000 -Subject: [PATCH] libstdc++: use math.h in blink::AdjustMaskLayerGeometry - -libstdc++ does not implement std::ceilf. Use ceilf from math.h -instead. - -Bug: 957519 -Change-Id: I03b5e0a1eb73fdeae34d5f3d2f2e9c8871c52543 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3782841 -Commit-Queue: Stephan Hartmann -Reviewed-by: Juanmi Huertas -Cr-Commit-Position: refs/heads/main@{#1027342} ---- - -diff --git a/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc b/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc -index 4abe1d9..b5b43da 100644 ---- a/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc -+++ b/third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.cc -@@ -4,8 +4,9 @@ - - #include "third_party/blink/renderer/platform/graphics/compositing/adjust_mask_layer_geometry.h" - -+#include - #include --#include -+ - #include "third_party/blink/renderer/platform/graphics/paint/geometry_mapper.h" - #include "third_party/blink/renderer/platform/graphics/paint/transform_paint_property_node.h" - #include "ui/gfx/geometry/size.h" -@@ -29,8 +30,7 @@ - // Map a screen pixel into the layer. - GeometryMapper::SourceToDestinationRect(TransformPaintPropertyNode::Root(), - transform, pixel_rect); -- int outset = -- std::ceilf(std::max(pixel_rect.width(), pixel_rect.height()) * 2); -+ int outset = ceilf(std::max(pixel_rect.width(), pixel_rect.height()) * 2); - // Don't expand too far in extreme cases. - constexpr int kMaxOutset = 1000; - outset = std::min(kMaxOutset, outset); diff --git a/srcpkgs/chromium/patches/chromium-106-AutofillPopupControllerImpl-namespace.patch b/srcpkgs/chromium/patches/chromium-106-AutofillPopupControllerImpl-namespace.patch new file mode 100644 index 000000000000..767e3ac89b27 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-106-AutofillPopupControllerImpl-namespace.patch @@ -0,0 +1,26 @@ +From 65d31137fc8256627daab9d7c91074fca70b5882 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 21 Aug 2022 10:27:08 +0000 +Subject: [PATCH] libstdc++: add namespace for nullptr_t in + AutofillPopupControllerImpl + +--- + chrome/browser/ui/autofill/autofill_popup_controller_impl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h +index 295a104..54bfa4f 100644 +--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h ++++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h +@@ -178,7 +178,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController { + class AutofillPopupViewPtr { + public: + AutofillPopupViewPtr() = default; +- AutofillPopupViewPtr(nullptr_t) : ptr_(nullptr) {} ++ AutofillPopupViewPtr(std::nullptr_t) : ptr_(nullptr) {} + AutofillPopupViewPtr(AutofillPopupView* ptr) : ptr_(ptr) {} + + explicit operator bool() const { return ptr_; } +-- +2.35.1 + diff --git a/srcpkgs/chromium/patches/fix-argument_spec-isnan-isinf.patch b/srcpkgs/chromium/patches/fix-argument_spec-isnan-isinf.patch new file mode 100644 index 000000000000..837a0312dcbc --- /dev/null +++ b/srcpkgs/chromium/patches/fix-argument_spec-isnan-isinf.patch @@ -0,0 +1,11 @@ +--- a/extensions/renderer/bindings/argument_spec.cc ++++ b/extensions/renderer/bindings/argument_spec.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "extensions/renderer/bindings/argument_spec.h" + + #include "base/check.h" diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 01d4a075d759..ead9773251b9 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=105.0.5195.102 +version=106.0.5249.61 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262 +checksum=f27acb929b12fc9e60b035c2f9f1879866eec7cfe1665dccf544048e9e931497 lib32disabled=yes