diff options
| -rw-r--r-- | .SRCINFO | 31 | ||||
| -rw-r--r-- | PKGBUILD | 65 | ||||
| -rw-r--r-- | chromium-93-ffmpeg-4.4.patch | 36 | ||||
| -rw-r--r-- | sql-make-VirtualCursor-standard-layout-type.patch | 94 | ||||
| -rw-r--r-- | unbundle-ffmpeg-av_stream_get_first_dts.patch | 12 | ||||
| -rw-r--r-- | unexpire-accelerated-video-decode-flag.patch | 11 | ||||
| -rw-r--r-- | wayland-fix-binding-to-wrong-version.patch | 683 | ||||
| -rw-r--r-- | webcodecs-stop-using-AudioOpusEncoder.patch | 49 | ||||
| -rw-r--r-- | webrtc-check-existence-of-cursor-metadata.patch | 31 |
9 files changed, 166 insertions, 846 deletions
@@ -1,7 +1,7 @@ pkgbase = ungoogled-chromium-wayland pkgdesc = The classic ungoogled chromium, but now with Ozone patches for wayland - pkgver = 97.0.4692.99 - pkgrel = 1 + pkgver = 100.0.4896.60 + pkgrel = 2 url = https://github.com/Eloston/ungoogled-chromium arch = x86_64 license = BSD @@ -51,33 +51,30 @@ pkgbase = ungoogled-chromium-wayland optdepends = kwallet: support for storing passwords in KWallet on Plasma provides = chromium conflicts = chromium + options = debug options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-97.0.4692.99.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-100.0.4896.60.tar.xz source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz - source = https://github.com/stha09/chromium-patches/releases/download/chromium-97-patchset-4/chromium-97-patchset-4.tar.xz - source = wayland-fix-binding-to-wrong-version.patch + source = https://github.com/stha09/chromium-patches/releases/download/chromium-100-patchset-4/chromium-100-patchset-4.tar.xz + source = webcodecs-stop-using-AudioOpusEncoder.patch + source = webrtc-check-existence-of-cursor-metadata.patch source = sql-make-VirtualCursor-standard-layout-type.patch - source = chromium-93-ffmpeg-4.4.patch - source = unbundle-ffmpeg-av_stream_get_first_dts.patch - source = unexpire-accelerated-video-decode-flag.patch source = use-oauth2-client-switches-as-default.patch source = xdg-basedir.patch source = no-omnibox-suggestion-autocomplete.patch - source = ungoogled-chromium-wayland-97.0.4692.99-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/97.0.4692.99-1.tar.gz + source = ungoogled-chromium-100.0.4896.60-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/100.0.4896.60-1.tar.gz source = chromium-drirc-disable-10bpc-color-configs.conf source = wayland-egl.patch - sha256sums = c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba + sha256sums = 0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a - sha256sums = 7af5c0a55a20c0fb496b2f4448d89203a83bb1914754d864460e55e68731ef0b - sha256sums = 29541840921302060f712838ba460cd7e988148af3ce3c9dc45437fc78442a67 - sha256sums = dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150 - sha256sums = 1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57 - sha256sums = 1f0c1a7a1eb67d91765c9f28df815f58e1c6dc7b37d0acd4d68cac8e5515786c - sha256sums = 2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b + sha256sums = a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80 + sha256sums = 064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af + sha256sums = 88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95 + sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a sha256sums = a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6 - sha256sums = e01148a7e94bfd5ee288b5c5cf7df869aaae545cf48951c8d1f47264792cbf44 + sha256sums = 4de1a8ba276ae91d52bc08b1e60250ee060fe1bf3fa2ccddeb22ec2e77aa8cf4 sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574 @@ -11,8 +11,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ungoogled-chromium-wayland -pkgver=97.0.4692.99 -pkgrel=1 +pkgver=100.0.4896.60 +pkgrel=2 _launcher_ver=8 _gcc_patchset=4 pkgdesc="The classic ungoogled chromium, but now with Ozone patches for wayland" @@ -28,37 +28,33 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland' 'kdialog: support for native dialogs in Plasma' 'org.freedesktop.secrets: password storage backend on GNOME / Xfce' 'kwallet: support for storing passwords in KWallet on Plasma') -options=('!lto') # Chromium adds its own flags for ThinLTO +options=('debug' '!lto') # Chromium adds its own flags for ThinLTO source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz - wayland-fix-binding-to-wrong-version.patch + webcodecs-stop-using-AudioOpusEncoder.patch + webrtc-check-existence-of-cursor-metadata.patch sql-make-VirtualCursor-standard-layout-type.patch - chromium-93-ffmpeg-4.4.patch - unbundle-ffmpeg-av_stream_get_first_dts.patch - unexpire-accelerated-video-decode-flag.patch use-oauth2-client-switches-as-default.patch xdg-basedir.patch no-omnibox-suggestion-autocomplete.patch) -sha256sums=('c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba' +sha256sums=('0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '7af5c0a55a20c0fb496b2f4448d89203a83bb1914754d864460e55e68731ef0b' - '29541840921302060f712838ba460cd7e988148af3ce3c9dc45437fc78442a67' - 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' - '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57' - '1f0c1a7a1eb67d91765c9f28df815f58e1c6dc7b37d0acd4d68cac8e5515786c' - '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b' + 'a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80' + '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af' + '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95' + 'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711' 'cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a' 'a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6') provides=('chromium') conflicts=('chromium') source=(${source[@]} - $pkgname-$pkgver-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-1.tar.gz + ${pkgname%-*}-$pkgver-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-1.tar.gz chromium-drirc-disable-10bpc-color-configs.conf wayland-egl.patch) sha256sums=(${sha256sums[@]} - 'e01148a7e94bfd5ee288b5c5cf7df869aaae545cf48951c8d1f47264792cbf44' + '4de1a8ba276ae91d52bc08b1e60250ee060fe1bf3fa2ccddeb22ec2e77aa8cf4' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574') @@ -107,15 +103,12 @@ prepare() { # runtime -- this allows signing into Chromium without baked-in values patch -Np1 -i ../use-oauth2-client-switches-as-default.patch - # Fix build with older ffmpeg - patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch + # Upstream fixes + patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch + patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch - # Substitute the custom function 'av_stream_get_first_dts'; will need to - # switch to bundled ffmpeg when we're no longer using ffmpeg 4.4 in Arch - # Upstream commit that made first_dts internal causing Chromium to add a - # custom function: https://github.com/FFmpeg/FFmpeg/commit/591b88e6787c4 - # https://crbug.com/1251779 - patch -Np1 -i ../unbundle-ffmpeg-av_stream_get_first_dts.patch + # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 + patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki patch -p1 -i ../xdg-basedir.patch @@ -125,15 +118,6 @@ prepare() { # called 'shoulder surfing'). patch -p1 -i ../no-omnibox-suggestion-autocomplete.patch - # https://crbug.com/1207478 - patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch - - # Upstream fixes - patch -Np1 -i ../wayland-fix-binding-to-wrong-version.patch - - # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 - patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch - # Fixes for building with libstdc++ instead of libc++ #patch -Np1 -i ../patches/ @@ -184,6 +168,7 @@ build() { 'custom_toolchain="//build/toolchain/linux/unbundle:default"' 'host_toolchain="//build/toolchain/linux/unbundle:default"' 'is_official_build=true' # implies is_cfi=true on x86_64 + 'symbol_level=0' # sufficient for backtraces on x86(_64) 'disable_fieldtrial_testing_config=true' 'blink_enable_generated_code_formatting=false' 'ffmpeg_branding="Chrome"' @@ -201,10 +186,6 @@ build() { _flags+=('icu_use_data_file=false') fi - if check_option strip y; then - _flags+=('symbol_level=0') - fi - # Append ungoogled chromium flags to _flags array _ungoogled_repo="$srcdir/${pkgname%xdg*}$pkgver-1" readarray -t -O ${#_flags[@]} _flags < "${_ungoogled_repo}/flags.gn" @@ -218,13 +199,18 @@ build() { CFLAGS+=' -Wno-unknown-warning-option' CXXFLAGS+=' -Wno-unknown-warning-option' + # Let Chromium set its own symbol level + CFLAGS=${CFLAGS/-g } + CXXFLAGS=${CXXFLAGS/-g } + # https://github.com/ungoogled-software/ungoogled-chromium-archlinux/issues/123 CFLAGS=${CFLAGS/-fexceptions} CFLAGS=${CFLAGS/-fcf-protection} CXXFLAGS=${CXXFLAGS/-fexceptions} CXXFLAGS=${CXXFLAGS/-fcf-protection} - # This appears to cause random segfaults + # This appears to cause random segfaults when combined with ThinLTO + # https://bugs.archlinux.org/task/73518 CFLAGS=${CFLAGS/-fstack-clash-protection} CXXFLAGS=${CXXFLAGS/-fstack-clash-protection} @@ -244,8 +230,8 @@ package() { cd "$srcdir/chromium-$pkgver" install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" + install -D out/Release/chromedriver "$pkgdir/usr/bin/chromedriver" install -Dm4755 out/Release/chrome_sandbox "$pkgdir/usr/lib/chromium/chrome-sandbox" - ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver" install -Dm644 ../chromium-drirc-disable-10bpc-color-configs.conf \ "$pkgdir/usr/share/drirc.d/10-$pkgname.conf" @@ -274,7 +260,6 @@ package() { chrome_100_percent.pak chrome_200_percent.pak chrome_crashpad_handler - chromedriver resources.pak v8_context_snapshot.bin diff --git a/chromium-93-ffmpeg-4.4.patch b/chromium-93-ffmpeg-4.4.patch deleted file mode 100644 index f0ec736f98bc..000000000000 --- a/chromium-93-ffmpeg-4.4.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index ac4713b07268..492a9a37d096 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - scoped_refptr<DecoderBuffer> buffer; - - if (type() == DemuxerStream::TEXT) { -- size_t id_size = 0; -+ int id_size = 0; - uint8_t* id_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); - -- size_t settings_size = 0; -+ int settings_size = 0; - uint8_t* settings_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); - -@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, - side_data.data(), side_data.size()); - } else { -- size_t side_data_size = 0; -+ int side_data_size = 0; - uint8_t* side_data = av_packet_get_side_data( - packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); - -@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - packet->size - data_offset); - } - -- size_t skip_samples_size = 0; -+ int skip_samples_size = 0; - const uint32_t* skip_samples_ptr = - reinterpret_cast<const uint32_t*>(av_packet_get_side_data( - packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); diff --git a/sql-make-VirtualCursor-standard-layout-type.patch b/sql-make-VirtualCursor-standard-layout-type.patch index c1c68f11646a..3364d41ee07a 100644 --- a/sql-make-VirtualCursor-standard-layout-type.patch +++ b/sql-make-VirtualCursor-standard-layout-type.patch @@ -1,30 +1,29 @@ -From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001 +From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Tue, 4 May 2021 15:00:19 +0000 +Date: Sun, 16 Jan 2022 19:15:26 +0000 Subject: [PATCH] sql: make VirtualCursor standard layout type sql::recover::VirtualCursor needs to be a standard layout type, but has members of type std::unique_ptr. However, std::unique_ptr is not guaranteed to be standard layout. Compiling with clang combined with -gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with -raw pointers. +gcc-11 libstdc++ fails because of this. Bug: 1189788 Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c --- - sql/recover_module/btree.cc | 21 +++++++++++++++------ - sql/recover_module/btree.h | 17 +++++++++++++---- + sql/recover_module/btree.cc | 18 ++++++++++++------ + sql/recover_module/btree.h | 21 +++++++++++++++------ sql/recover_module/cursor.cc | 24 ++++++++++++------------ sql/recover_module/cursor.h | 2 +- - sql/recover_module/pager.cc | 7 +++---- - sql/recover_module/pager.h | 5 +++-- - 6 files changed, 47 insertions(+), 29 deletions(-) + sql/recover_module/pager.cc | 5 ++--- + sql/recover_module/pager.h | 6 +++--- + 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc -index 9ecaafe8a3..839318abf9 100644 +index cc9420e5c05..f12d8fa32a2 100644 --- a/sql/recover_module/btree.cc +++ b/sql/recover_module/btree.cc -@@ -135,16 +135,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value, +@@ -136,16 +136,22 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value, "Move the destructor to the .cc file if it's non-trival"); #endif // !DCHECK_IS_ON() @@ -34,46 +33,47 @@ index 9ecaafe8a3..839318abf9 100644 - cell_count_(ComputeCellCount(db_reader)), - next_read_index_(0), - last_record_size_(0) { ++LeafPageDecoder::LeafPageDecoder() noexcept = default; ++ +void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) { -+ DCHECK(db_reader); - DCHECK(IsOnValidPage(db_reader)); + page_id_ = db_reader->page_id(); + db_reader_ = db_reader; + cell_count_ = ComputeCellCount(db_reader); + next_read_index_ = 0; + last_record_size_ = 0; + DCHECK(IsOnValidPage(db_reader)); DCHECK(DatabasePageReader::IsValidPageId(page_id_)); } +void LeafPageDecoder::Reset() { + db_reader_ = nullptr; -+ page_id_ = 0; -+ cell_count_ = 0; -+ next_read_index_ = 0; -+ last_record_size_ = 0; +} + bool LeafPageDecoder::TryAdvance() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(CanAdvance()); diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h -index d76d076bf6..33114b01fa 100644 +index eaa087a5c52..df0e0c937c0 100644 --- a/sql/recover_module/btree.h +++ b/sql/recover_module/btree.h -@@ -102,7 +102,7 @@ class LeafPageDecoder { +@@ -101,9 +101,7 @@ class LeafPageDecoder { + public: + // Creates a decoder for a DatabasePageReader's last read page. // - // |db_reader| must have been used to read an inner page of a table B-tree. - // |db_reader| must outlive this instance. +- // |db_reader| must have been used to read an inner page of a table B-tree. +- // |db_reader| must outlive this instance. - explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept; -+ explicit LeafPageDecoder() noexcept = default; ++ LeafPageDecoder() noexcept; ~LeafPageDecoder() noexcept = default; LeafPageDecoder(const LeafPageDecoder&) = delete; -@@ -150,6 +150,15 @@ class LeafPageDecoder { +@@ -151,6 +149,17 @@ class LeafPageDecoder { // read as long as CanAdvance() returns true. bool TryAdvance(); + // Initialize with DatabasePageReader ++ // |db_reader| must have been used to read an inner page of a table B-tree. ++ // |db_reader| must outlive this instance. + void Initialize(DatabasePageReader* db_reader); + + // Reset internal DatabasePageReader @@ -85,7 +85,7 @@ index d76d076bf6..33114b01fa 100644 // True if the given reader may point to an inner page in a table B-tree. // // The last ReadPage() call on |db_reader| must have succeeded. -@@ -163,14 +172,14 @@ class LeafPageDecoder { +@@ -164,14 +173,14 @@ class LeafPageDecoder { static int ComputeCellCount(DatabasePageReader* db_reader); // The number of the B-tree page this reader is reading. @@ -104,10 +104,10 @@ index d76d076bf6..33114b01fa 100644 // The reader's cursor state. // diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc -index 0029ff9295..42548bc4b5 100644 +index 4f827edf1b4..240de4999fe 100644 --- a/sql/recover_module/cursor.cc +++ b/sql/recover_module/cursor.cc -@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() { +@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() { int VirtualCursor::First() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); inner_decoders_.clear(); @@ -116,7 +116,7 @@ index 0029ff9295..42548bc4b5 100644 AppendPageDecoder(table_->root_page_id()); return Next(); -@@ -36,18 +36,18 @@ int VirtualCursor::Next() { +@@ -38,18 +38,18 @@ int VirtualCursor::Next() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); record_reader_.Reset(); @@ -142,7 +142,7 @@ index 0029ff9295..42548bc4b5 100644 continue; } if (!record_reader_.Initialize()) -@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index, +@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column_index, int64_t VirtualCursor::RowId() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(record_reader_.IsInitialized()); @@ -159,7 +159,7 @@ index 0029ff9295..42548bc4b5 100644 << __func__ << " must only be called when the current path has no leaf decoder"; -@@ -113,7 +113,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) { +@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) { return; if (LeafPageDecoder::IsOnValidPage(&db_reader_)) { @@ -169,10 +169,10 @@ index 0029ff9295..42548bc4b5 100644 } diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h -index afcd6900e1..b15c31d425 100644 +index 845b7852648..cc4e85f83f9 100644 --- a/sql/recover_module/cursor.h +++ b/sql/recover_module/cursor.h -@@ -129,7 +129,7 @@ class VirtualCursor { +@@ -130,7 +130,7 @@ class VirtualCursor { std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_; // Decodes the leaf page containing records. @@ -182,7 +182,7 @@ index afcd6900e1..b15c31d425 100644 SEQUENCE_CHECKER(sequence_checker_); }; diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc -index 58e75de270..5fe96204e5 100644 +index 58e75de2704..69d98cef98d 100644 --- a/sql/recover_module/pager.cc +++ b/sql/recover_module/pager.cc @@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(), @@ -191,34 +191,34 @@ index 58e75de270..5fe96204e5 100644 DatabasePageReader::DatabasePageReader(VirtualTable* table) - : page_data_(std::make_unique<uint8_t[]>(table->page_size())), - table_(table) { -+ : page_data_(), table_(table) { ++ : page_data_(table->page_size()), table_(table) { DCHECK(table != nullptr); DCHECK(IsValidPageSize(table->page_size())); } -@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) { - std::numeric_limits<int64_t>::max(), +@@ -58,7 +57,7 @@ int DatabasePageReader::ReadPage(int page_id) { "The |read_offset| computation above may overflow"); -- int sqlite_status = + int sqlite_status = - RawRead(sqlite_file, read_size, read_offset, page_data_.get()); -+ int sqlite_status = RawRead(sqlite_file, read_size, read_offset, -+ const_cast<uint8_t*>(page_data_.data())); ++ RawRead(sqlite_file, read_size, read_offset, page_data_.data()); // |page_id_| needs to be set to kInvalidPageId if the read failed. // Otherwise, future ReadPage() calls with the previous |page_id_| value diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h -index 0e388ddc3b..99314e30ff 100644 +index 07cac3cb989..d08f0932fab 100644 --- a/sql/recover_module/pager.h +++ b/sql/recover_module/pager.h -@@ -5,6 +5,7 @@ - #ifndef SQL_RECOVER_MODULE_PAGER_H_ +@@ -6,8 +6,8 @@ #define SQL_RECOVER_MODULE_PAGER_H_ -+#include <array> #include <cstdint> - #include <memory> +-#include <memory> + #include <ostream> ++#include <vector> -@@ -70,7 +71,7 @@ class DatabasePageReader { + #include "base/check_op.h" + #include "base/memory/raw_ptr.h" +@@ -72,7 +72,7 @@ class DatabasePageReader { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_NE(page_id_, kInvalidPageId) << "Successful ReadPage() required before accessing pager state"; @@ -227,12 +227,12 @@ index 0e388ddc3b..99314e30ff 100644 } // The number of bytes in the page read by the last ReadPage() call. -@@ -137,7 +138,7 @@ class DatabasePageReader { +@@ -139,7 +139,7 @@ class DatabasePageReader { int page_id_ = kInvalidPageId; // Stores the bytes of the last page successfully read by ReadPage(). // The content is undefined if the last call to ReadPage() did not succeed. - const std::unique_ptr<uint8_t[]> page_data_; -+ const std::array<uint8_t, kMaxPageSize> page_data_; ++ std::vector<uint8_t> page_data_; // Raw pointer usage is acceptable because this instance's owner is expected // to ensure that the VirtualTable outlives this. - VirtualTable* const table_; + const raw_ptr<VirtualTable> table_; diff --git a/unbundle-ffmpeg-av_stream_get_first_dts.patch b/unbundle-ffmpeg-av_stream_get_first_dts.patch deleted file mode 100644 index dae1adde0bc6..000000000000 --- a/unbundle-ffmpeg-av_stream_get_first_dts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn -index 16e20744706..6a079b32221 100644 ---- a/build/linux/unbundle/ffmpeg.gn -+++ b/build/linux/unbundle/ffmpeg.gn -@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") { - "libavformat", - "libavutil", - ] -+ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ] - } - - buildflag_header("ffmpeg_features") { diff --git a/unexpire-accelerated-video-decode-flag.patch b/unexpire-accelerated-video-decode-flag.patch deleted file mode 100644 index da3a4a5e91e0..000000000000 --- a/unexpire-accelerated-video-decode-flag.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/flag-metadata.json.orig 2021-09-21 18:34:38.740426608 +0000 -+++ chrome/browser/flag-metadata.json 2021-09-21 18:35:09.392000797 +0000 -@@ -1285,7 +1285,7 @@ - { - "name": "enable-accelerated-video-decode", - "owners": [ "media-dev@chromium.org" ], -- "expiry_milestone": 93 -+ "expiry_milestone": 99 - }, - { - "name": "enable-accessibility-live-caption", diff --git a/wayland-fix-binding-to-wrong-version.patch b/wayland-fix-binding-to-wrong-version.patch deleted file mode 100644 index 016c3adcd542..000000000000 --- a/wayland-fix-binding-to-wrong-version.patch +++ /dev/null @@ -1,683 +0,0 @@ -From 5e3ed3d015d0ddae5e4d813204616d89d2f859c7 Mon Sep 17 00:00:00 2001 -From: Alexander Dunaev <adunaev@igalia.com> -Date: Tue, 14 Dec 2021 09:54:52 +0000 -Subject: [PATCH 1/2] [linux/wayland] Fixed terminate caused by binding to - wrong version. - -The Ozone/Wayland implementation had a few places where the Wayland -objects were bound without proper checking for their versions. That was -part of the technical debt not addressed before, and ended up causing -the issue explained in the linked crbug: the compositor terminates the -client that binds to the protocol that it does not actually support. - -This patch fixes the issue by adding the necessary checks in all places -where they were missing. Also a convenience macro for validating the -version is proposed. - -Bug: 1279574 -Change-Id: I74efa97f64b480bed47372d8d559593ae84eeb18 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3337037 -Reviewed-by: Maksim Sisov <msisov@igalia.com> -Commit-Queue: Alexander Dunaev <adunaev@igalia.com> -Cr-Commit-Position: refs/heads/main@{#951428} - -(cherry picked from commit dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d) ---- - .../platform/wayland/common/wayland_object.cc | 21 +++++++++++++++++++ - .../platform/wayland/common/wayland_object.h | 11 ++++++++++ - .../gtk_primary_selection_device_manager.cc | 11 +++++----- - ui/ozone/platform/wayland/host/gtk_shell1.cc | 12 ++++++----- - .../wayland/host/org_kde_kwin_idle.cc | 9 ++++---- - .../wayland/host/overlay_prioritizer.cc | 9 ++++---- - .../wayland/host/surface_augmenter.cc | 11 ++++++---- - .../host/wayland_data_device_manager.cc | 9 +++++--- - ui/ozone/platform/wayland/host/wayland_drm.cc | 6 ++++-- - .../platform/wayland/host/wayland_output.cc | 10 ++++----- - ui/ozone/platform/wayland/host/wayland_shm.cc | 9 ++++---- - .../wayland/host/wayland_zaura_shell.cc | 9 +++++--- - .../wayland/host/wayland_zcr_cursor_shapes.cc | 10 +++++---- - .../wayland/host/wayland_zwp_linux_dmabuf.cc | 9 +++++--- - .../host/wayland_zwp_pointer_constraints.cc | 6 +++--- - .../host/wayland_zwp_pointer_gestures.cc | 7 ++++--- - .../wayland_zwp_relative_pointer_manager.cc | 8 ++++--- - .../wayland/host/xdg_foreign_wrapper.cc | 14 ++++++++----- - .../wayland/host/zwp_idle_inhibit_manager.cc | 10 +++++---- - .../zwp_primary_selection_device_manager.cc | 9 ++++---- - 20 files changed, 131 insertions(+), 69 deletions(-) - -diff --git a/ui/ozone/platform/wayland/common/wayland_object.cc b/ui/ozone/platform/wayland/common/wayland_object.cc -index 0374cb9d874..8faa648120d 100644 ---- a/ui/ozone/platform/wayland/common/wayland_object.cc -+++ b/ui/ozone/platform/wayland/common/wayland_object.cc -@@ -35,6 +35,8 @@ - #include <xdg-shell-client-protocol.h> - #include <xdg-shell-unstable-v6-client-protocol.h> - -+#include "base/logging.h" -+ - namespace wl { - namespace { - -@@ -77,6 +79,25 @@ void delete_touch(wl_touch* touch) { - - } // namespace - -+bool CanBind(const std::string& interface, -+ uint32_t available_version, -+ uint32_t min_version, -+ uint32_t max_version) { -+ if (available_version < min_version) { -+ LOG(WARNING) << "Unable to bind to " << interface << " version " -+ << available_version << ". The minimum supported version is " -+ << min_version << "."; -+ return false; -+ } -+ -+ if (available_version > max_version) { -+ LOG(WARNING) << "Binding to " << interface << " version " << max_version -+ << " but version " << available_version << " is available."; -+ } -+ -+ return true; -+} -+ - void (*ObjectTraits<wl_cursor_theme>::deleter)(wl_cursor_theme*) = - &wl_cursor_theme_destroy; - -diff --git a/ui/ozone/platform/wayland/common/wayland_object.h b/ui/ozone/platform/wayland/common/wayland_object.h -index 3a8bb9e494d..ce787bf8805 100644 ---- a/ui/ozone/platform/wayland/common/wayland_object.h -+++ b/ui/ozone/platform/wayland/common/wayland_object.h -@@ -79,6 +79,17 @@ struct ObjectTraits<wl_proxy> { - static void (*deleter)(void*); - }; - -+// Checks the given |available_version| exposed by the server against -+// |min_version| and |max_version| supported by the client. -+// Returns false (with rendering a warning) if |available_version| is less than -+// the minimum supported version. -+// Returns true otherwise, renders an info message if |available_version| is -+// greater than the maximum supported one. -+bool CanBind(const std::string& interface, -+ uint32_t available_version, -+ uint32_t min_version, -+ uint32_t max_version); -+ - } // namespace wl - - // Puts the forward declaration for struct TYPE and declares the template -diff --git a/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc b/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc -index af3087d1891..2991233fe6e 100644 ---- a/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc -+++ b/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc -@@ -16,7 +16,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxGtkPrimarySelectionDeviceManagerVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -31,12 +31,13 @@ void GtkPrimarySelectionDeviceManager::Instantiate( - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->gtk_primary_selection_device_manager()) -+ if (connection->gtk_primary_selection_device_manager() || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto manager = wl::Bind<gtk_primary_selection_device_manager>( -- registry, name, -- std::min(version, kMaxGtkPrimarySelectionDeviceManagerVersion)); -+ auto manager = wl::Bind<gtk_primary_selection_device_manager>(registry, name, -+ kMinVersion); - if (!manager) { - LOG(ERROR) << "Failed to bind gtk_primary_selection_device_manager"; - return; -diff --git a/ui/ozone/platform/wayland/host/gtk_shell1.cc b/ui/ozone/platform/wayland/host/gtk_shell1.cc -index cb3b0c8fa02..26dfd7fbf3f 100644 ---- a/ui/ozone/platform/wayland/host/gtk_shell1.cc -+++ b/ui/ozone/platform/wayland/host/gtk_shell1.cc -@@ -17,8 +17,8 @@ namespace { - // gtk_shell1 exposes request_focus() since version 3. Below that, it is not - // interesting for us, although it provides some shell integration that might be - // useful. --constexpr uint32_t kMinGtkShell1Version = 3; --constexpr uint32_t kMaxGtkShell1Version = 4; -+constexpr uint32_t kMinVersion = 3; -+constexpr uint32_t kMaxVersion = 4; - } // namespace - - // static -@@ -32,11 +32,13 @@ void GtkShell1::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->gtk_shell1_ || version < kMinGtkShell1Version) -+ if (connection->gtk_shell1_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - -- auto gtk_shell1 = wl::Bind<::gtk_shell1>( -- registry, name, std::min(version, kMaxGtkShell1Version)); -+ auto gtk_shell1 = -+ wl::Bind<::gtk_shell1>(registry, name, std::min(version, kMaxVersion)); - if (!gtk_shell1) { - LOG(ERROR) << "Failed to bind gtk_shell1"; - return; -diff --git a/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc b/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc -index 4746aa798c0..8b7a7416d95 100644 ---- a/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc -+++ b/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc -@@ -13,7 +13,7 @@ namespace ui { - - namespace { - --constexpr uint32_t kMaxOrgKdeKwinIdleVersion = 1; -+constexpr uint32_t kMinVersion = 1; - - // After the system has gone idle, it will wait for this time before notifying - // us. This reduces "jitter" of the idle/active state, but also adds some lag -@@ -58,11 +58,12 @@ void OrgKdeKwinIdle::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->org_kde_kwin_idle_) -+ if (connection->org_kde_kwin_idle_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto idle = wl::Bind<struct org_kde_kwin_idle>( -- registry, name, std::min(version, kMaxOrgKdeKwinIdleVersion)); -+ auto idle = wl::Bind<struct org_kde_kwin_idle>(registry, name, kMinVersion); - if (!idle) { - LOG(ERROR) << "Failed to bind to org_kde_kwin_idle global"; - return; -diff --git a/ui/ozone/platform/wayland/host/overlay_prioritizer.cc b/ui/ozone/platform/wayland/host/overlay_prioritizer.cc -index e8aaf39a337..11496b52324 100644 ---- a/ui/ozone/platform/wayland/host/overlay_prioritizer.cc -+++ b/ui/ozone/platform/wayland/host/overlay_prioritizer.cc -@@ -12,7 +12,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxOverlayPrioritizerVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -26,11 +26,12 @@ void OverlayPrioritizer::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->overlay_prioritizer_) -+ if (connection->overlay_prioritizer_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto prioritizer = wl::Bind<overlay_prioritizer>( -- registry, name, std::min(version, kMaxOverlayPrioritizerVersion)); -+ auto prioritizer = wl::Bind<overlay_prioritizer>(registry, name, kMinVersion); - if (!prioritizer) { - LOG(ERROR) << "Failed to bind overlay_prioritizer"; - return; -diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc -index 8294897bcd5..0589076bcf5 100644 ---- a/ui/ozone/platform/wayland/host/surface_augmenter.cc -+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc -@@ -13,7 +13,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 1; - } - - // static -@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->surface_augmenter_) -+ if (connection->surface_augmenter_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - -- auto augmenter = wl::Bind<surface_augmenter>( -- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); -+ auto augmenter = wl::Bind<surface_augmenter>(registry, name, -+ std::min(version, kMaxVersion)); - if (!augmenter) { - LOG(ERROR) << "Failed to bind overlay_prioritizer"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc b/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc -index 408cb1c72f4..0f03942e699 100644 ---- a/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc -+++ b/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc -@@ -14,7 +14,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxDeviceManagerVersion = 3; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 3; - } - - // static -@@ -28,11 +29,13 @@ void WaylandDataDeviceManager::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->data_device_manager_) -+ if (connection->data_device_manager_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - - auto data_device_manager = wl::Bind<wl_data_device_manager>( -- registry, name, std::min(version, kMaxDeviceManagerVersion)); -+ registry, name, std::min(version, kMaxVersion)); - if (!data_device_manager) { - LOG(ERROR) << "Failed to bind to wl_data_device_manager global"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_drm.cc b/ui/ozone/platform/wayland/host/wayland_drm.cc -index d806e8e9f5d..a7ed2e20ffe 100644 ---- a/ui/ozone/platform/wayland/host/wayland_drm.cc -+++ b/ui/ozone/platform/wayland/host/wayland_drm.cc -@@ -17,7 +17,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMinWlDrmVersion = 2; -+constexpr uint32_t kMinVersion = 2; - } - - // static -@@ -31,8 +31,10 @@ void WaylandDrm::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->drm_ || version < kMinWlDrmVersion) -+ if (connection->drm_ || -+ !!wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - - auto wl_drm = wl::Bind<struct wl_drm>(registry, name, version); - if (!wl_drm) { -diff --git a/ui/ozone/platform/wayland/host/wayland_output.cc b/ui/ozone/platform/wayland/host/wayland_output.cc -index 2d481d1167e..13e2b2ea685 100644 ---- a/ui/ozone/platform/wayland/host/wayland_output.cc -+++ b/ui/ozone/platform/wayland/host/wayland_output.cc -@@ -16,7 +16,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMinWlOutputVersion = 2; -+// TODO(crbug.com/1279681): support newer versions. -+constexpr uint32_t kMinVersion = 2; - } - - // static -@@ -30,14 +31,11 @@ void WaylandOutput::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (version < kMinWlOutputVersion) { -- LOG(ERROR) -- << "Unable to bind to the unsupported wl_output object with version= " -- << version << ". Minimum supported version is " << kMinWlOutputVersion; -+ if (!wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; - } - -- auto output = wl::Bind<wl_output>(registry, name, version); -+ auto output = wl::Bind<wl_output>(registry, name, kMinVersion); - if (!output) { - LOG(ERROR) << "Failed to bind to wl_output global"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_shm.cc b/ui/ozone/platform/wayland/host/wayland_shm.cc -index 7c6cd40569d..de97ad1c2b2 100644 ---- a/ui/ozone/platform/wayland/host/wayland_shm.cc -+++ b/ui/ozone/platform/wayland/host/wayland_shm.cc -@@ -10,7 +10,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxShmVersion = 1; -+constexpr uint32_t kMinVersion = 1; - constexpr uint32_t kShmFormat = WL_SHM_FORMAT_ARGB8888; - } // namespace - -@@ -25,11 +25,12 @@ void WaylandShm::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->shm_) -+ if (connection->shm_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto shm = -- wl::Bind<wl_shm>(registry, name, std::min(version, kMaxShmVersion)); -+ auto shm = wl::Bind<wl_shm>(registry, name, kMinVersion); - if (!shm) { - LOG(ERROR) << "Failed to bind to wl_shm global"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc -index b1ae436db08..1b5585f7c18 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc -@@ -19,7 +19,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxAuraShellVersion = 28; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 28; - } - - // static -@@ -33,11 +34,13 @@ void WaylandZAuraShell::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->zaura_shell_) -+ if (connection->zaura_shell_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - - auto zaura_shell = wl::Bind<struct zaura_shell>( -- registry, name, std::min(version, kMaxAuraShellVersion)); -+ registry, name, std::min(version, kMaxVersion)); - if (!zaura_shell) { - LOG(ERROR) << "Failed to bind zaura_shell"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc b/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc -index 094a2f98686..84d847eea16 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc -@@ -16,7 +16,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxCursorShapesVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - using mojom::CursorType; -@@ -32,11 +32,13 @@ void WaylandZcrCursorShapes::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->zcr_cursor_shapes_) -+ if (connection->zcr_cursor_shapes_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto zcr_cursor_shapes = wl::Bind<zcr_cursor_shapes_v1>( -- registry, name, std::min(version, kMaxCursorShapesVersion)); -+ auto zcr_cursor_shapes = -+ wl::Bind<zcr_cursor_shapes_v1>(registry, name, kMinVersion); - if (!zcr_cursor_shapes) { - LOG(ERROR) << "Failed to bind zcr_cursor_shapes_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc b/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc -index 7035dc4ed26..cee793b9ae8 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc -@@ -14,7 +14,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxLinuxDmabufVersion = 3; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 3; - } - - // static -@@ -28,11 +29,13 @@ void WaylandZwpLinuxDmabuf::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->zwp_dmabuf()) -+ if (connection->zwp_dmabuf() || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - - auto zwp_linux_dmabuf = wl::Bind<zwp_linux_dmabuf_v1>( -- registry, name, std::min(version, kMaxLinuxDmabufVersion)); -+ registry, name, std::min(version, kMaxVersion)); - if (!zwp_linux_dmabuf) { - LOG(ERROR) << "Failed to bind zwp_linux_dmabuf_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc -index 24e4dacc7ee..c1aca770ff5 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc -@@ -15,7 +15,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMinZwpPointerConstraintsVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -30,12 +30,12 @@ void WaylandZwpPointerConstraints::Instantiate(WaylandConnection* connection, - DCHECK_EQ(interface, kInterfaceName); - - if (connection->wayland_zwp_pointer_constraints_ || -- version < kMinZwpPointerConstraintsVersion) { -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; - } - - auto zwp_pointer_constraints_v1 = -- wl::Bind<struct zwp_pointer_constraints_v1>(registry, name, version); -+ wl::Bind<struct zwp_pointer_constraints_v1>(registry, name, kMinVersion); - if (!zwp_pointer_constraints_v1) { - LOG(ERROR) << "Failed to bind wp_pointer_constraints_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc -index 5d96c8923fd..31bffb726c6 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc -@@ -19,7 +19,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMinZwpPointerGesturesVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -34,11 +34,12 @@ void WaylandZwpPointerGestures::Instantiate(WaylandConnection* connection, - DCHECK_EQ(interface, kInterfaceName); - - if (connection->wayland_zwp_pointer_gestures_ || -- version < kMinZwpPointerGesturesVersion) -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - - auto zwp_pointer_gestures_v1 = -- wl::Bind<struct zwp_pointer_gestures_v1>(registry, name, version); -+ wl::Bind<struct zwp_pointer_gestures_v1>(registry, name, kMinVersion); - if (!zwp_pointer_gestures_v1) { - LOG(ERROR) << "Failed to bind wp_pointer_gestures_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc b/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc -index 3a8ef4c7f96..c84a891dfe7 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc -@@ -14,7 +14,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMinZwpRelativePointerManagerVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -30,11 +30,13 @@ void WaylandZwpRelativePointerManager::Instantiate( - DCHECK_EQ(interface, kInterfaceName); - - if (connection->wayland_zwp_relative_pointer_manager_ || -- version < kMinZwpRelativePointerManagerVersion) -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - - auto zwp_relative_pointer_manager_v1 = -- wl::Bind<struct zwp_relative_pointer_manager_v1>(registry, name, version); -+ wl::Bind<struct zwp_relative_pointer_manager_v1>(registry, name, -+ kMinVersion); - if (!zwp_relative_pointer_manager_v1) { - LOG(ERROR) << "Failed to bind zwp_relative_pointer_manager_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc b/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc -index a34b684d128..2586adf9b85 100644 ---- a/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc -+++ b/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc -@@ -19,6 +19,8 @@ constexpr char XdgForeignWrapper::kInterfaceNameV1[]; - // static - constexpr char XdgForeignWrapper::kInterfaceNameV2[]; - -+constexpr uint32_t kMinVersion = 1; -+ - using OnHandleExported = XdgForeignWrapper::OnHandleExported; - - namespace { -@@ -185,15 +187,17 @@ void XdgForeignWrapper::Instantiate(WaylandConnection* connection, - uint32_t name, - const std::string& interface, - uint32_t version) { -- if (connection->xdg_foreign_) -+ if (connection->xdg_foreign_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - - if (interface == kInterfaceNameV1) { -- connection->xdg_foreign_ = -- CreateWrapper<zxdg_exporter_v1>(connection, registry, name, version); -+ connection->xdg_foreign_ = CreateWrapper<zxdg_exporter_v1>( -+ connection, registry, name, kMinVersion); - } else if (interface == kInterfaceNameV2) { -- connection->xdg_foreign_ = -- CreateWrapper<zxdg_exporter_v2>(connection, registry, name, version); -+ connection->xdg_foreign_ = CreateWrapper<zxdg_exporter_v2>( -+ connection, registry, name, kMinVersion); - } else { - NOTREACHED() << " unexpected interface name: " << interface; - } -diff --git a/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc b/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc -index 47121293acb..fc05de68778 100644 ---- a/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc -+++ b/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc -@@ -12,7 +12,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxZwpIdleInhibitManagerVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } - - // static -@@ -26,11 +26,13 @@ void ZwpIdleInhibitManager::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->zwp_idle_inhibit_manager_) -+ if (connection->zwp_idle_inhibit_manager_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - -- auto manager = wl::Bind<zwp_idle_inhibit_manager_v1>( -- registry, name, std::min(version, kMaxZwpIdleInhibitManagerVersion)); -+ auto manager = -+ wl::Bind<zwp_idle_inhibit_manager_v1>(registry, name, kMinVersion); - if (!manager) { - LOG(ERROR) << "Failed to bind zwp_idle_inhibit_manager_v1"; - return; -diff --git a/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc b/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc -index f6f9fd23c35..795a09c0565 100644 ---- a/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc -+++ b/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc -@@ -16,7 +16,7 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxGtkPrimarySelectionDeviceManagerVersion = 1; -+constexpr uint32_t kMinVersion = 1; - } // namespace - - // static -@@ -31,12 +31,13 @@ void ZwpPrimarySelectionDeviceManager::Instantiate( - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->zwp_primary_selection_device_manager_) -+ if (connection->zwp_primary_selection_device_manager_ || -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; -+ } - - auto manager = wl::Bind<zwp_primary_selection_device_manager_v1>( -- registry, name, -- std::min(version, kMaxGtkPrimarySelectionDeviceManagerVersion)); -+ registry, name, kMinVersion); - if (!manager) { - LOG(ERROR) << "Failed to bind zwp_primary_selection_device_manager_v1"; - return; - -From cd9eae3117ccc930f0cfae6d24bba1d6d66d769c Mon Sep 17 00:00:00 2001 -From: Alexander Dunaev <adunaev@igalia.com> -Date: Tue, 28 Dec 2021 14:02:05 +0000 -Subject: [PATCH 2/2] [linux/wayland] Fixed terminate caused by binding to - wrong version. - -This is a fixup to [1] where a typo creeped in. - -[1] https://chromium-review.googlesource.com/c/chromium/src/+/3337037 - -Bug: 1279574 -Change-Id: If8f1a308ce8d27b51a9cd4d52ad8eec2e29edf95 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3358254 -Reviewed-by: Antonio Gomes <tonikitoo@igalia.com> -Commit-Queue: Alexander Dunaev <adunaev@igalia.com> -Auto-Submit: Alexander Dunaev <adunaev@igalia.com> -Cr-Commit-Position: refs/heads/main@{#954286} - -(cherry picked from commit a84b79daa8897b822336b8f348ef4daaae07af37) ---- - ui/ozone/platform/wayland/host/wayland_drm.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/ozone/platform/wayland/host/wayland_drm.cc b/ui/ozone/platform/wayland/host/wayland_drm.cc -index a7ed2e20ffe..b10b79412e5 100644 ---- a/ui/ozone/platform/wayland/host/wayland_drm.cc -+++ b/ui/ozone/platform/wayland/host/wayland_drm.cc -@@ -32,7 +32,7 @@ void WaylandDrm::Instantiate(WaylandConnection* connection, - DCHECK_EQ(interface, kInterfaceName); - - if (connection->drm_ || -- !!wl::CanBind(interface, version, kMinVersion, kMinVersion)) { -+ !wl::CanBind(interface, version, kMinVersion, kMinVersion)) { - return; - } - diff --git a/webcodecs-stop-using-AudioOpusEncoder.patch b/webcodecs-stop-using-AudioOpusEncoder.patch new file mode 100644 index 000000000000..32957d32fa37 --- /dev/null +++ b/webcodecs-stop-using-AudioOpusEncoder.patch @@ -0,0 +1,49 @@ +From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 +From: Eugene Zemtsov <eugene@chromium.org> +Date: Thu, 24 Feb 2022 23:17:20 +0000 +Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo + audio encoder + +AudioOpusEncoder was only used here for testing. Let's not let it get +comfortable. We'll use MF AAC encoder here when we have it. (Soon...) + +Bug: 1259883 +Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 +Commit-Queue: Eugene Zemtsov <eugene@chromium.org> +Auto-Submit: Eugene Zemtsov <eugene@chromium.org> +Reviewed-by: Dale Curtis <dalecurtis@chromium.org> +Commit-Queue: Dale Curtis <dalecurtis@chromium.org> +Cr-Commit-Position: refs/heads/main@{#974895} +--- + media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc +index 8f83a4d6cf6..40cdaff8d3a 100644 +--- a/media/mojo/services/gpu_mojo_media_client.cc ++++ b/media/mojo/services/gpu_mojo_media_client.cc +@@ -13,7 +13,6 @@ + #include "build/chromeos_buildflags.h" + #include "gpu/ipc/service/gpu_channel.h" + #include "media/audio/audio_features.h" +-#include "media/audio/audio_opus_encoder.h" + #include "media/base/audio_decoder.h" + #include "media/base/cdm_factory.h" + #include "media/base/media_switches.h" +@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder( + scoped_refptr<base::SequencedTaskRunner> task_runner) { + if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) + return nullptr; +- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on +- // we'll create a real platform encoder here. +- auto opus_encoder = std::make_unique<AudioOpusEncoder>(); +- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( +- {base::TaskPriority::USER_BLOCKING}); +- return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder), +- std::move(encoding_runner), +- std::move(task_runner)); ++ return nullptr; + } + + VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() { diff --git a/webrtc-check-existence-of-cursor-metadata.patch b/webrtc-check-existence-of-cursor-metadata.patch new file mode 100644 index 000000000000..0c7e7310daf5 --- /dev/null +++ b/webrtc-check-existence-of-cursor-metadata.patch @@ -0,0 +1,31 @@ +From c2cd814cdd8cbf8dda6ccec2266327a5321fbde8 Mon Sep 17 00:00:00 2001 +From: Jan Grulich <grulja@gmail.com> +Date: Tue, 15 Mar 2022 14:31:55 +0100 +Subject: [PATCH] PipeWire capturer: check existence of cursor metadata + +Check whether there are any cursor metadata before we try to validate +and use them, otherwise we might crash on this. + +Bug: webrtc:13429 +Change-Id: I365da59a189b6b974cebafc94fec49d5b942efae +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255601 +Reviewed-by: Alexander Cooper <alcooper@chromium.org> +Commit-Queue: Alexander Cooper <alcooper@chromium.org> +Cr-Commit-Position: refs/heads/main@{#36240} +--- + .../desktop_capture/linux/wayland/shared_screencast_stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +index a8c86e26..9e81df4c 100644 +--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc ++++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc +@@ -650,7 +650,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) { + const struct spa_meta_cursor* cursor = + static_cast<struct spa_meta_cursor*>(spa_buffer_find_meta_data( + spa_buffer, SPA_META_Cursor, sizeof(*cursor))); +- if (spa_meta_cursor_is_valid(cursor)) { ++ if (cursor && spa_meta_cursor_is_valid(cursor)) { + struct spa_meta_bitmap* bitmap = nullptr; + + if (cursor->bitmap_offset) |