diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | webrtc-check-existence-of-cursor-metadata.patch | 31 |
3 files changed, 38 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = chromium-no-extras pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver pkgver = 100.0.4896.60 - pkgrel = 1 + pkgrel = 2 url = https://www.chromium.org/Home arch = x86_64 license = BSD @@ -54,12 +54,14 @@ pkgbase = chromium-no-extras source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz 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 = use-oauth2-client-switches-as-default.patch sha256sums = 0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a sha256sums = a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80 sha256sums = 064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af + sha256sums = 88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95 sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 @@ -11,7 +11,7 @@ pkgname=chromium-no-extras _pkgname=chromium pkgver=100.0.4896.60 -pkgrel=1 +pkgrel=2 _launcher_ver=8 _gcc_patchset=4 pkgdesc="Chromium without hangout services, widevine, pipewire, or chromedriver" @@ -34,12 +34,14 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg 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 webcodecs-stop-using-AudioOpusEncoder.patch + webrtc-check-existence-of-cursor-metadata.patch sql-make-VirtualCursor-standard-layout-type.patch use-oauth2-client-switches-as-default.patch) sha256sums=('0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' 'a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80' '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af' + '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95' 'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -98,6 +100,7 @@ prepare() { # Upstream fixes patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch + patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch 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) |