Date: Sunday, February 12, 2023 @ 09:50:03 Author: foutrelis Revision: 1399971
archrelease: copy trunk to community-x86_64 Added: electron21/repos/community-x86_64/PKGBUILD (from rev 1399969, electron21/trunk/PKGBUILD) electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m102.patch (from rev 1399969, electron21/trunk/REVERT-roll-src-third_party-ffmpeg-m102.patch) electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m106.patch (from rev 1399969, electron21/trunk/REVERT-roll-src-third_party-ffmpeg-m106.patch) electron21/repos/community-x86_64/angle-wayland-include-protocol.patch (from rev 1399969, electron21/trunk/angle-wayland-include-protocol.patch) electron21/repos/community-x86_64/default_app-icon.patch (from rev 1399969, electron21/trunk/default_app-icon.patch) electron21/repos/community-x86_64/electron-launcher.sh (from rev 1399969, electron21/trunk/electron-launcher.sh) electron21/repos/community-x86_64/electron.desktop (from rev 1399970, electron21/trunk/electron.desktop) electron21/repos/community-x86_64/jinja-python-3.10.patch (from rev 1399970, electron21/trunk/jinja-python-3.10.patch) electron21/repos/community-x86_64/std-vector-non-const.patch (from rev 1399970, electron21/trunk/std-vector-non-const.patch) electron21/repos/community-x86_64/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch (from rev 1399970, electron21/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch) electron21/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 1399970, electron21/trunk/use-system-libraries-in-node.patch) Deleted: electron21/repos/community-x86_64/PKGBUILD electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m102.patch electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m106.patch electron21/repos/community-x86_64/angle-wayland-include-protocol.patch electron21/repos/community-x86_64/default_app-icon.patch electron21/repos/community-x86_64/electron-launcher.sh electron21/repos/community-x86_64/electron.desktop electron21/repos/community-x86_64/jinja-python-3.10.patch electron21/repos/community-x86_64/std-vector-non-const.patch electron21/repos/community-x86_64/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch electron21/repos/community-x86_64/use-system-libraries-in-node.patch ----------------------------------------------------------+ PKGBUILD | 622 ++++++------ REVERT-roll-src-third_party-ffmpeg-m102.patch | 666 ++++++------- REVERT-roll-src-third_party-ffmpeg-m106.patch | 110 +- angle-wayland-include-protocol.patch | 76 - default_app-icon.patch | 42 electron-launcher.sh | 40 electron.desktop | 14 jinja-python-3.10.patch | 44 std-vector-non-const.patch | 218 ++-- unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch | 76 - use-system-libraries-in-node.patch | 106 +- 11 files changed, 1007 insertions(+), 1007 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-02-12 09:49:57 UTC (rev 1399970) +++ PKGBUILD 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,311 +0,0 @@ -# Maintainer: Bruno Pagani <archa...@archlinux.org> - -_use_suffix=1 -pkgver=21.3.5 -_commit=19e35495ee112f358177bc5a2a819f322f1d22d2 -_chromiumver=106.0.5249.199 -_gcc_patchset=2 -# shellcheck disable=SC2034 -pkgrel=1 - -_major_ver=${pkgver%%.*} -if [[ ${_use_suffix} != 0 ]]; then - pkgname="electron${_major_ver}" -else - pkgname=electron -fi -# shellcheck disable=SC2034 -pkgdesc='Build cross platform desktop apps with web technologies' -# shellcheck disable=SC2034 -arch=('x86_64') -# shellcheck disable=SC2034 -url='https://electronjs.org/' -# shellcheck disable=SC2034 -license=('MIT' 'custom') -# shellcheck disable=SC2034 -depends=('c-ares' 'gtk3' 'libevent' 'nss') -# shellcheck disable=SC2034 -makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser' - 'java-runtime-headless' 'libnotify' 'lld' 'llvm' 'ninja' - 'npm' 'pciutils' 'pipewire' 'python' 'python-httplib2' - 'python-pyparsing' 'python-six' 'wget' 'yarn') -# shellcheck disable=SC2034 -optdepends=('kde-cli-tools: file deletion support (kioclient5)' - 'libappindicator-gtk3: StatusNotifierItem support' - 'pipewire: WebRTC desktop sharing under Wayland' - 'trash-cli: file deletion support (trash-put)' - 'xdg-utils: open URLs with desktop’s default (xdg-email, xdg-open)') -if [[ ${_use_suffix} == 0 ]]; then - # shellcheck disable=SC2034 - conflicts=("electron${_major_ver}") - # shellcheck disable=SC2034 - provides=("electron${_major_ver}") -fi -# shellcheck disable=SC2034 -options=('!lto') # Electron adds its own flags for ThinLTO -# shellcheck disable=SC2034 -source=('git+https://github.com/electron/electron.git' - 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git#branch=main' - "https://github.com/stha09/chromium-patches/releases/download/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}.tar.xz" - "electron-launcher.sh" - "electron.desktop" - 'default_app-icon.patch' - 'jinja-python-3.10.patch' - 'use-system-libraries-in-node.patch' - 'std-vector-non-const.patch' - 'unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch' - 'REVERT-roll-src-third_party-ffmpeg-m102.patch' - 'REVERT-roll-src-third_party-ffmpeg-m106.patch' - 'angle-wayland-include-protocol.patch' - ) -# shellcheck disable=SC2034 -sha256sums=('SKIP' - 'SKIP' - '2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121' - '77817939c9833f8dda74a8c75620c15747170551ffa6f14f7c5b4071599e8831' - '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' - 'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4' - '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e' - 'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c' - '1c5521fdfbfe26f19f5dcbf96dc36e96c9ef060c8e24baa5f949478cb4220bb3' - 'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00' - '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' - '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152' - 'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572') - -# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py -# Keys are the names in the above script; values are the dependencies in Arch -declare -gA _system_libs=( - [brotli]=brotli - [dav1d]=dav1d - [ffmpeg]=ffmpeg - [flac]=flac - [fontconfig]=fontconfig - [freetype]=freetype2 - [harfbuzz-ng]=harfbuzz - [icu]=icu - [jsoncpp]=jsoncpp - [libaom]=aom - [libavif]=libavif - [libdrm]= - [libjpeg]=libjpeg - [libpng]=libpng - #[libvpx]=libvpx - [libwebp]=libwebp - [libxml]=libxml2 - [libxslt]=libxslt - [opus]=opus - [re2]=re2 - [snappy]=snappy - [woff2]=woff2 - [zlib]=minizip -) -_unwanted_bundled_libs=( - $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') -) -depends+=(${_system_libs[@]}) - -prepare() { - sed -i "s|@ELECTRON@|${pkgname}|" electron-launcher.sh - sed -i "s|@ELECTRON@|${pkgname}|" electron.desktop - if [[ ${_use_suffix} != 0 ]]; then - sed -i "s|@ELECTRON_NAME@|Electron ${_major_ver}|" electron.desktop - else - sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop - fi - -cat >.gclient <<EOF -solutions = [ - { - "name": "src/electron", - "url": "file://${srcdir}/electron@${_commit}", - "deps_file": "DEPS", - "managed": False, - "custom_deps": { - "src": None, - }, - "custom_vars": {}, - }, -] -EOF - - export PATH+=":$PWD/depot_tools" DEPOT_TOOLS_UPDATE=0 - export VPYTHON_BYPASS='manually managed python not supported by chrome operations' - - echo "Fetching chromium..." - git clone -b ${_chromiumver} --depth=2 https://chromium.googlesource.com/chromium/src - - depot_tools/gclient.py sync -D \ - --nohooks \ - --with_branch_heads \ - --with_tags - - ( - cd src/electron || exit - patch -Np1 -i ../../std-vector-non-const.patch - ) - - echo "Running hooks..." - # python "${srcdir}/depot_tools/gclient.py" runhooks - src/build/landmines.py - src/build/util/lastchange.py -o src/build/util/LASTCHANGE - src/build/util/lastchange.py -m GPU_LISTS_VERSION \ - --revision-id-only --header src/gpu/config/gpu_lists_version.h - src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ - -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h - src/build/util/lastchange.py \ - -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION - src/tools/update_pgo_profiles.py --target=linux update \ - --gs-url-base=chromium-optimization-profiles/pgo_profiles - depot_tools/download_from_google_storage.py --no_resume --extract --no_auth \ - --bucket chromium-nodejs -s src/third_party/node/node_modules.tar.gz.sha1 - # Create sysmlink to system clang-format - ln -s /usr/bin/clang-format src/buildtools/linux64 - # Create sysmlink to system Node.js - mkdir -p src/third_party/node/linux/node-linux-x64/bin - ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin - src/electron/script/apply_all_patches.py \ - src/electron/patches/config.json - cd src/electron || exit - yarn install --frozen-lockfile - cd .. - - echo "Applying local patches..." - - # Upstream fixes - patch -Np1 -i ../unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch - - # Revert ffmpeg roll requiring new channel layout API support - # https://crbug.com/1325301 - patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m102.patch - # Revert switch from AVFrame::pkt_duration to AVFrame::duration - patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m106.patch - - # https://crbug.com/angleproject/7582 - patch -Np0 -i ../angle-wayland-include-protocol.patch - - # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch - patch -Np1 -i ../patches/chromium-106-AutofillPopupControllerImpl-namespace.patch - - # Electron specific fixes - patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ - -Np1 -i ../../../../../../jinja-python-3.10.patch - patch -Np1 -i ../use-system-libraries-in-node.patch - patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file - - # Allow building against system libraries in official builds - echo "Patching Chromium for using system libraries..." - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ - tools/generate_shim_headers/generate_shim_headers.py - # Remove bundled libraries for which we will use the system copies; this - # *should* do what the remove_bundled_libraries.py script does, with the - # added benefit of not having to list all the remaining libraries - local _lib - for _lib in ${_unwanted_bundled_libs[@]}; do - third_party_dir="third_party/$_lib" - if [ ! -d "${third_party_dir}" ]; then - third_party_dir="base/${third_party_dir}" - fi - find "${third_party_dir}" -type f \ - \! -path "${third_party_dir}/chromium/*" \ - \! -path "${third_party_dir}/google/*" \ - \! -path 'third_party/harfbuzz-ng/utils/hb_scoped.h' \ - \! -regex '.*\.\(gn\|gni\|isolate\)' \ - -delete - done - - ./build/linux/unbundle/replace_gn_files.py \ - --system-libraries "${!_system_libs[@]}" -} - -build() { - export CC=clang - export CXX=clang++ - export AR=ar - export NM=nm - - # https://github.com/webpack/webpack/issues/14532 - export NODE_OPTIONS=--openssl-legacy-provider - - # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) - CFLAGS+=' -Wno-builtin-macro-redefined' - CXXFLAGS+=' -Wno-builtin-macro-redefined' - CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' - - # Do not warn about unknown warning options - 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 when combined with ThinLTO - # https://bugs.archlinux.org/task/73518 - CFLAGS=${CFLAGS/-fstack-clash-protection} - CXXFLAGS=${CXXFLAGS/-fstack-clash-protection} - - # https://crbug.com/957519#c122 - CXXFLAGS=${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS} - - # Do not warn about unknown warning options - CFLAGS+=' -Wno-unknown-warning-option' - CXXFLAGS+=' -Wno-unknown-warning-option' - - cd src || exit - export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" - GN_EXTRA_ARGS=' - custom_toolchain = "//build/toolchain/linux/unbundle:default" - host_toolchain = "//build/toolchain/linux/unbundle:default" - clang_use_chrome_plugins = false - symbol_level = 0 # sufficient for backtraces on x86(_64) - chrome_pgo_phase = 2 - treat_warnings_as_errors = false - rtc_use_pipewire = true - link_pulseaudio = true - use_gnome_keyring = false - use_sysroot = false - use_custom_libcxx = false - icu_use_data_file = false - is_component_ffmpeg = false - ' - gn gen out/Release \ - --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" - ninja -C out/Release electron - ninja -C out/Release electron_dist_zip - # ninja -C out/Release third_party/electron_node:headers -} - -package() { - install -dm755 "${pkgdir:?}/usr/lib/${pkgname}" - bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}" - - chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox" - - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do - ln -s \ - "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${l}")" \ - "${pkgdir}/usr/share/licenses/${pkgname}" - done - - install -Dm755 "${srcdir}/electron-launcher.sh" \ - "${pkgdir}/usr/bin/${pkgname}" - if [[ "${_use_suffix}" == 0 ]]; then - ln -s "/usr/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}${_major_ver}" - ln -s "/usr/lib/${pkgname}" "${pkgdir}/usr/lib/${pkgname}${_major_ver}" - fi - - # Install .desktop and icon file (see default_app-icon.patch) - install -Dm644 electron.desktop \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 src/electron/default_app/icon.png \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 -} Copied: electron21/repos/community-x86_64/PKGBUILD (from rev 1399969, electron21/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,311 @@ +# Maintainer: Bruno Pagani <archa...@archlinux.org> + +_use_suffix=1 +pkgver=21.3.5 +_commit=19e35495ee112f358177bc5a2a819f322f1d22d2 +_chromiumver=106.0.5249.199 +_gcc_patchset=2 +# shellcheck disable=SC2034 +pkgrel=2 + +_major_ver=${pkgver%%.*} +if [[ ${_use_suffix} != 0 ]]; then + pkgname="electron${_major_ver}" +else + pkgname=electron +fi +# shellcheck disable=SC2034 +pkgdesc='Build cross platform desktop apps with web technologies' +# shellcheck disable=SC2034 +arch=('x86_64') +# shellcheck disable=SC2034 +url='https://electronjs.org/' +# shellcheck disable=SC2034 +license=('MIT' 'custom') +# shellcheck disable=SC2034 +depends=('c-ares' 'gtk3' 'libevent' 'nss') +# shellcheck disable=SC2034 +makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser' + 'java-runtime-headless' 'libnotify' 'lld' 'llvm' 'ninja' + 'npm' 'pciutils' 'pipewire' 'python' 'python-httplib2' + 'python-pyparsing' 'python-six' 'wget' 'yarn') +# shellcheck disable=SC2034 +optdepends=('kde-cli-tools: file deletion support (kioclient5)' + 'libappindicator-gtk3: StatusNotifierItem support' + 'pipewire: WebRTC desktop sharing under Wayland' + 'trash-cli: file deletion support (trash-put)' + 'xdg-utils: open URLs with desktop’s default (xdg-email, xdg-open)') +if [[ ${_use_suffix} == 0 ]]; then + # shellcheck disable=SC2034 + conflicts=("electron${_major_ver}") + # shellcheck disable=SC2034 + provides=("electron${_major_ver}") +fi +# shellcheck disable=SC2034 +options=('!lto') # Electron adds its own flags for ThinLTO +# shellcheck disable=SC2034 +source=('git+https://github.com/electron/electron.git' + 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git#branch=main' + "https://github.com/stha09/chromium-patches/releases/download/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}.tar.xz" + "electron-launcher.sh" + "electron.desktop" + 'default_app-icon.patch' + 'jinja-python-3.10.patch' + 'use-system-libraries-in-node.patch' + 'std-vector-non-const.patch' + 'unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch' + 'REVERT-roll-src-third_party-ffmpeg-m102.patch' + 'REVERT-roll-src-third_party-ffmpeg-m106.patch' + 'angle-wayland-include-protocol.patch' + ) +# shellcheck disable=SC2034 +sha256sums=('SKIP' + 'SKIP' + '2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121' + '77817939c9833f8dda74a8c75620c15747170551ffa6f14f7c5b4071599e8831' + '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' + 'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4' + '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e' + 'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c' + '1c5521fdfbfe26f19f5dcbf96dc36e96c9ef060c8e24baa5f949478cb4220bb3' + 'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00' + '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' + '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152' + 'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572') + +# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py +# Keys are the names in the above script; values are the dependencies in Arch +declare -gA _system_libs=( + [brotli]=brotli + [dav1d]=dav1d + [ffmpeg]=ffmpeg + [flac]=flac + [fontconfig]=fontconfig + [freetype]=freetype2 + [harfbuzz-ng]=harfbuzz + [icu]=icu + [jsoncpp]=jsoncpp + [libaom]=aom + [libavif]=libavif + [libdrm]= + [libjpeg]=libjpeg + [libpng]=libpng + #[libvpx]=libvpx + [libwebp]=libwebp + [libxml]=libxml2 + [libxslt]=libxslt + [opus]=opus + [re2]=re2 + [snappy]=snappy + [woff2]=woff2 + [zlib]=minizip +) +_unwanted_bundled_libs=( + $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') +) +depends+=(${_system_libs[@]}) + +prepare() { + sed -i "s|@ELECTRON@|${pkgname}|" electron-launcher.sh + sed -i "s|@ELECTRON@|${pkgname}|" electron.desktop + if [[ ${_use_suffix} != 0 ]]; then + sed -i "s|@ELECTRON_NAME@|Electron ${_major_ver}|" electron.desktop + else + sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop + fi + +cat >.gclient <<EOF +solutions = [ + { + "name": "src/electron", + "url": "file://${srcdir}/electron@${_commit}", + "deps_file": "DEPS", + "managed": False, + "custom_deps": { + "src": None, + }, + "custom_vars": {}, + }, +] +EOF + + export PATH+=":$PWD/depot_tools" DEPOT_TOOLS_UPDATE=0 + export VPYTHON_BYPASS='manually managed python not supported by chrome operations' + + echo "Fetching chromium..." + git clone -b ${_chromiumver} --depth=2 https://chromium.googlesource.com/chromium/src + + depot_tools/gclient.py sync -D \ + --nohooks \ + --with_branch_heads \ + --with_tags + + ( + cd src/electron || exit + patch -Np1 -i ../../std-vector-non-const.patch + ) + + echo "Running hooks..." + # python "${srcdir}/depot_tools/gclient.py" runhooks + src/build/landmines.py + src/build/util/lastchange.py -o src/build/util/LASTCHANGE + src/build/util/lastchange.py -m GPU_LISTS_VERSION \ + --revision-id-only --header src/gpu/config/gpu_lists_version.h + src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ + -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h + src/build/util/lastchange.py \ + -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION + src/tools/update_pgo_profiles.py --target=linux update \ + --gs-url-base=chromium-optimization-profiles/pgo_profiles + depot_tools/download_from_google_storage.py --no_resume --extract --no_auth \ + --bucket chromium-nodejs -s src/third_party/node/node_modules.tar.gz.sha1 + # Create sysmlink to system clang-format + ln -s /usr/bin/clang-format src/buildtools/linux64 + # Create sysmlink to system Node.js + mkdir -p src/third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin + src/electron/script/apply_all_patches.py \ + src/electron/patches/config.json + cd src/electron || exit + yarn install --frozen-lockfile + cd .. + + echo "Applying local patches..." + + # Upstream fixes + patch -Np1 -i ../unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch + + # Revert ffmpeg roll requiring new channel layout API support + # https://crbug.com/1325301 + patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m102.patch + # Revert switch from AVFrame::pkt_duration to AVFrame::duration + patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m106.patch + + # https://crbug.com/angleproject/7582 + patch -Np0 -i ../angle-wayland-include-protocol.patch + + # Fixes for building with libstdc++ instead of libc++ + patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch + patch -Np1 -i ../patches/chromium-106-AutofillPopupControllerImpl-namespace.patch + + # Electron specific fixes + patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ + -Np1 -i ../../../../../../jinja-python-3.10.patch + patch -Np1 -i ../use-system-libraries-in-node.patch + patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file + + # Allow building against system libraries in official builds + echo "Patching Chromium for using system libraries..." + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py + # Remove bundled libraries for which we will use the system copies; this + # *should* do what the remove_bundled_libraries.py script does, with the + # added benefit of not having to list all the remaining libraries + local _lib + for _lib in ${_unwanted_bundled_libs[@]}; do + third_party_dir="third_party/$_lib" + if [ ! -d "${third_party_dir}" ]; then + third_party_dir="base/${third_party_dir}" + fi + find "${third_party_dir}" -type f \ + \! -path "${third_party_dir}/chromium/*" \ + \! -path "${third_party_dir}/google/*" \ + \! -path 'third_party/harfbuzz-ng/utils/hb_scoped.h' \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + done + + ./build/linux/unbundle/replace_gn_files.py \ + --system-libraries "${!_system_libs[@]}" +} + +build() { + export CC=clang + export CXX=clang++ + export AR=ar + export NM=nm + + # https://github.com/webpack/webpack/issues/14532 + export NODE_OPTIONS=--openssl-legacy-provider + + # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) + CFLAGS+=' -Wno-builtin-macro-redefined' + CXXFLAGS+=' -Wno-builtin-macro-redefined' + CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__=' + + # Do not warn about unknown warning options + 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 when combined with ThinLTO + # https://bugs.archlinux.org/task/73518 + CFLAGS=${CFLAGS/-fstack-clash-protection} + CXXFLAGS=${CXXFLAGS/-fstack-clash-protection} + + # https://crbug.com/957519#c122 + CXXFLAGS=${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS} + + # Do not warn about unknown warning options + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + + cd src || exit + export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" + GN_EXTRA_ARGS=' + custom_toolchain = "//build/toolchain/linux/unbundle:default" + host_toolchain = "//build/toolchain/linux/unbundle:default" + clang_use_chrome_plugins = false + symbol_level = 0 # sufficient for backtraces on x86(_64) + chrome_pgo_phase = 2 + treat_warnings_as_errors = false + rtc_use_pipewire = true + link_pulseaudio = true + use_gnome_keyring = false + use_sysroot = false + use_custom_libcxx = false + icu_use_data_file = false + is_component_ffmpeg = false + ' + gn gen out/Release \ + --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" + ninja -C out/Release electron + ninja -C out/Release electron_dist_zip + # ninja -C out/Release third_party/electron_node:headers +} + +package() { + install -dm755 "${pkgdir:?}/usr/lib/${pkgname}" + bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}" + + chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox" + + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do + ln -s \ + "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${l}")" \ + "${pkgdir}/usr/share/licenses/${pkgname}" + done + + install -Dm755 "${srcdir}/electron-launcher.sh" \ + "${pkgdir}/usr/bin/${pkgname}" + if [[ "${_use_suffix}" == 0 ]]; then + ln -s "/usr/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}${_major_ver}" + ln -s "/usr/lib/${pkgname}" "${pkgdir}/usr/lib/${pkgname}${_major_ver}" + fi + + # Install .desktop and icon file (see default_app-icon.patch) + install -Dm644 electron.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 src/electron/default_app/icon.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 +} Deleted: REVERT-roll-src-third_party-ffmpeg-m102.patch =================================================================== --- REVERT-roll-src-third_party-ffmpeg-m102.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ REVERT-roll-src-third_party-ffmpeg-m102.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,333 +0,0 @@ -From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 -From: Dale Curtis <dalecur...@chromium.org> -Date: Sat, 2 Apr 2022 05:13:53 +0000 -Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 - commits) - -https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 - -Created with: - roll-dep src/third_party/ffmpeg - -Fixed: 1293918 -Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng -Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 -Auto-Submit: Dale Curtis <dalecur...@chromium.org> -Reviewed-by: Dan Sanders <sande...@chromium.org> -Commit-Queue: Dale Curtis <dalecur...@chromium.org> -Cr-Commit-Position: refs/heads/main@{#988253} ---- - .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- - media/ffmpeg/ffmpeg_common.cc | 11 +++---- - media/filters/audio_file_reader.cc | 9 +++--- - media/filters/audio_file_reader_unittest.cc | 6 ++-- - .../filters/audio_video_metadata_extractor.cc | 11 +++++-- - .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- - ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- - media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- - 8 files changed, 51 insertions(+), 37 deletions(-) - -diff --git 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 -index e4fc3f460e2..9b1ad9f7675 100644 ---- 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 @@ void CdmAudioDecoderConfigToAVCodecContext( - codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; - } - -- codec_context->channels = config.channel_count; -+ codec_context->ch_layout.nb_channels = config.channel_count; - codec_context->sample_rate = config.samples_per_second; - - if (config.extra_data) { -@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, - case cdm::kAudioFormatPlanarS16: - case cdm::kAudioFormatPlanarF32: { - const int decoded_size_per_channel = -- decoded_audio_size / av_frame.channels; -- for (int i = 0; i < av_frame.channels; ++i) { -+ decoded_audio_size / av_frame.ch_layout.nb_channels; -+ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { - memcpy(output_buffer, av_frame.extended_data[i], - decoded_size_per_channel); - output_buffer += decoded_size_per_channel; -@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( - // Success! - decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get()); - samples_per_second_ = config.samples_per_second; -- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; -+ bytes_per_frame_ = -+ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; - output_timestamp_helper_ = - std::make_unique<AudioTimestampHelper>(config.samples_per_second); - is_initialized_ = true; - - // Store initial values to guard against midstream configuration changes. -- channels_ = codec_context_->channels; -+ channels_ = codec_context_->ch_layout.nb_channels; - av_sample_format_ = codec_context_->sample_fmt; - - return true; -@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( - for (auto& frame : audio_frames) { - int decoded_audio_size = 0; - if (frame->sample_rate != samples_per_second_ || -- frame->channels != channels_ || frame->format != av_sample_format_) { -+ frame->ch_layout.nb_channels != channels_ || -+ frame->format != av_sample_format_) { - DLOG(ERROR) << "Unsupported midstream configuration change!" - << " Sample Rate: " << frame->sample_rate << " vs " -- << samples_per_second_ << ", Channels: " << frame->channels -- << " vs " << channels_ << ", Sample Format: " << frame->format -- << " vs " << av_sample_format_; -+ << samples_per_second_ -+ << ", Channels: " << frame->ch_layout.nb_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_->channels, frame->nb_samples, -+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, - codec_context_->sample_fmt, 1); - if (!decoded_audio_size) - continue; -@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( - size_t* total_size, - std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames, - AVFrame* frame) { -- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, -- frame->nb_samples, -- codec_context_->sample_fmt, 1); -+ *total_size += av_samples_get_buffer_size( -+ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, -+ codec_context_->sample_fmt, 1); - audio_frames->emplace_back(av_frame_clone(frame)); - return true; - } -diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc -index 87ca8969626..76f03d6608e 100644 ---- a/media/ffmpeg/ffmpeg_common.cc -+++ b/media/ffmpeg/ffmpeg_common.cc -@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, - codec_context->sample_fmt, codec_context->codec_id); - - ChannelLayout channel_layout = -- codec_context->channels > 8 -+ codec_context->ch_layout.nb_channels > 8 - ? CHANNEL_LAYOUT_DISCRETE -- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, -- codec_context->channels); -+ : ChannelLayoutToChromeChannelLayout( -+ codec_context->ch_layout.u.mask, -+ codec_context->ch_layout.nb_channels); - - int sample_rate = codec_context->sample_rate; - switch (codec) { -@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, - extra_data, encryption_scheme, seek_preroll, - codec_context->delay); - if (channel_layout == CHANNEL_LAYOUT_DISCRETE) -- config->SetChannelsForDiscrete(codec_context->channels); -+ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); - - #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) - // These are bitstream formats unknown to ffmpeg, so they don't have -@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, - - // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses - // said information to decode. -- codec_context->channels = config.channels(); -+ codec_context->ch_layout.nb_channels = config.channels(); - codec_context->sample_rate = config.samples_per_second(); - - if (config.extra_data().empty()) { -diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc -index 5f257bdfaa6..e1be5aa9a5b 100644 ---- a/media/filters/audio_file_reader.cc -+++ b/media/filters/audio_file_reader.cc -@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { - - // 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_->channel_layout, -- codec_context_->channels) == -+ if (ChannelLayoutToChromeChannelLayout( -+ codec_context_->ch_layout.u.mask, -+ codec_context_->ch_layout.nb_channels) == - CHANNEL_LAYOUT_UNSUPPORTED) { - return false; - } - - // Store initial values to guard against midstream configuration changes. -- channels_ = codec_context_->channels; -+ channels_ = codec_context_->ch_layout.nb_channels; - audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); - sample_rate_ = codec_context_->sample_rate; - av_sample_format_ = codec_context_->sample_fmt; -@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( - if (frames_read < 0) - return false; - -- const int channels = frame->channels; -+ const int channels = frame->ch_layout.nb_channels; - if (frame->sample_rate != sample_rate_ || channels != channels_ || - frame->format != av_sample_format_) { - DLOG(ERROR) << "Unsupported midstream configuration change!" -diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc -index 2aba7927a31..1f45a50cace 100644 ---- a/media/filters/audio_file_reader_unittest.cc -+++ b/media/filters/audio_file_reader_unittest.cc -@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test { - EXPECT_FALSE(reader_->Open()); - } - -- void RunTestFailingDecode(const char* fn) { -+ void RunTestFailingDecode(const char* fn, int expect_read = 0) { - Initialize(fn); - EXPECT_TRUE(reader_->Open()); - std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets; -- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); -+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); - } - - void RunTestPartialDecode(const char* fn) { -@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { - } - - TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { -- RunTestFailingDecode("midstream_config_change.mp3"); -+ RunTestFailingDecode("midstream_config_change.mp3", 42624); - } - #endif - -diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc -index 185819eb936..69ff508c221 100644 ---- a/media/filters/audio_video_metadata_extractor.cc -+++ b/media/filters/audio_video_metadata_extractor.cc -@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source, - 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<int32_t*>(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); -@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata, - 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_)) -diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc -index 6f231c85729..ca5e5fb927d 100644 ---- a/media/filters/ffmpeg_aac_bitstream_converter.cc -+++ b/media/filters/ffmpeg_aac_bitstream_converter.cc -@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { - 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_->channels || -+ channel_configuration_ != -+ stream_codec_parameters_->ch_layout.nb_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_->channels, -+ stream_codec_parameters_->ch_layout.nb_channels, - 0, // originality - 0, // home - 0, // copyrighted_stream -@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { - codec_ = stream_codec_parameters_->codec_id; - audio_profile_ = stream_codec_parameters_->profile; - sample_rate_index_ = sample_rate_index; -- channel_configuration_ = stream_codec_parameters_->channels; -+ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; - frame_length_ = header_plus_packet_size; - } - -diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc -index 1fd4c5ccd7d..f59bcd8fdaf 100644 ---- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc -+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc -@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { - memset(&test_parameters_, 0, sizeof(AVCodecParameters)); - test_parameters_.codec_id = AV_CODEC_ID_AAC; - test_parameters_.profile = FF_PROFILE_AAC_MAIN; -- test_parameters_.channels = 2; -+ test_parameters_.ch_layout.nb_channels = 2; - test_parameters_.extradata = extradata_header_; - test_parameters_.extradata_size = sizeof(extradata_header_); - } -diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc -index 6a56c675f7d..4615fdeb3fb 100644 ---- a/media/filters/ffmpeg_audio_decoder.cc -+++ b/media/filters/ffmpeg_audio_decoder.cc -@@ -28,7 +28,7 @@ namespace media { - - // Return the number of channels from the data in |frame|. - static inline int DetermineChannels(AVFrame* frame) { -- return frame->channels; -+ return frame->ch_layout.nb_channels; - } - - // Called by FFmpeg's allocation routine to allocate a buffer. Uses -@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, - // Translate unsupported into discrete layouts for discrete configurations; - // ffmpeg does not have a labeled discrete configuration internally. - ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( -- codec_context_->channel_layout, codec_context_->channels); -+ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); - if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && - config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { - channel_layout = CHANNEL_LAYOUT_DISCRETE; -@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { - // Success! - av_sample_format_ = codec_context_->sample_fmt; - -- if (codec_context_->channels != config.channels()) { -+ if (codec_context_->ch_layout.nb_channels != config.channels()) { - MEDIA_LOG(ERROR, media_log_) - << "Audio configuration specified " << config.channels() - << " channels, but FFmpeg thinks the file contains " -- << codec_context_->channels << " channels"; -+ << codec_context_->ch_layout.nb_channels << " channels"; - ReleaseFFmpegResources(); - state_ = DecoderState::kUninitialized; - return false; -@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, - if (frame->nb_samples <= 0) - return AVERROR(EINVAL); - -- if (s->channels != channels) { -+ if (s->ch_layout.nb_channels != channels) { - DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; - return AVERROR(EINVAL); - } -@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, - ChannelLayout channel_layout = - config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE - ? CHANNEL_LAYOUT_DISCRETE -- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); -+ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, -+ s->ch_layout.nb_channels); - - if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { - DLOG(ERROR) << "Unsupported channel layout."; Copied: electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m102.patch (from rev 1399969, electron21/trunk/REVERT-roll-src-third_party-ffmpeg-m102.patch) =================================================================== --- REVERT-roll-src-third_party-ffmpeg-m102.patch (rev 0) +++ REVERT-roll-src-third_party-ffmpeg-m102.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,333 @@ +From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 +From: Dale Curtis <dalecur...@chromium.org> +Date: Sat, 2 Apr 2022 05:13:53 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 + +Created with: + roll-dep src/third_party/ffmpeg + +Fixed: 1293918 +Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng +Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 +Auto-Submit: Dale Curtis <dalecur...@chromium.org> +Reviewed-by: Dan Sanders <sande...@chromium.org> +Commit-Queue: Dale Curtis <dalecur...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#988253} +--- + .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- + media/ffmpeg/ffmpeg_common.cc | 11 +++---- + media/filters/audio_file_reader.cc | 9 +++--- + media/filters/audio_file_reader_unittest.cc | 6 ++-- + .../filters/audio_video_metadata_extractor.cc | 11 +++++-- + .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- + ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- + media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- + 8 files changed, 51 insertions(+), 37 deletions(-) + +diff --git 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 +index e4fc3f460e2..9b1ad9f7675 100644 +--- 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 @@ void CdmAudioDecoderConfigToAVCodecContext( + codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; + } + +- codec_context->channels = config.channel_count; ++ codec_context->ch_layout.nb_channels = config.channel_count; + codec_context->sample_rate = config.samples_per_second; + + if (config.extra_data) { +@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, + case cdm::kAudioFormatPlanarS16: + case cdm::kAudioFormatPlanarF32: { + const int decoded_size_per_channel = +- decoded_audio_size / av_frame.channels; +- for (int i = 0; i < av_frame.channels; ++i) { ++ decoded_audio_size / av_frame.ch_layout.nb_channels; ++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { + memcpy(output_buffer, av_frame.extended_data[i], + decoded_size_per_channel); + output_buffer += decoded_size_per_channel; +@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( + // Success! + decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get()); + samples_per_second_ = config.samples_per_second; +- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; ++ bytes_per_frame_ = ++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; + output_timestamp_helper_ = + std::make_unique<AudioTimestampHelper>(config.samples_per_second); + is_initialized_ = true; + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + av_sample_format_ = codec_context_->sample_fmt; + + return true; +@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( + for (auto& frame : audio_frames) { + int decoded_audio_size = 0; + if (frame->sample_rate != samples_per_second_ || +- frame->channels != channels_ || frame->format != av_sample_format_) { ++ frame->ch_layout.nb_channels != channels_ || ++ frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" + << " Sample Rate: " << frame->sample_rate << " vs " +- << samples_per_second_ << ", Channels: " << frame->channels +- << " vs " << channels_ << ", Sample Format: " << frame->format +- << " vs " << av_sample_format_; ++ << samples_per_second_ ++ << ", Channels: " << frame->ch_layout.nb_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_->channels, frame->nb_samples, ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, + codec_context_->sample_fmt, 1); + if (!decoded_audio_size) + continue; +@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( + size_t* total_size, + std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames, + AVFrame* frame) { +- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, +- frame->nb_samples, +- codec_context_->sample_fmt, 1); ++ *total_size += av_samples_get_buffer_size( ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, ++ codec_context_->sample_fmt, 1); + audio_frames->emplace_back(av_frame_clone(frame)); + return true; + } +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 87ca8969626..76f03d6608e 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + codec_context->sample_fmt, codec_context->codec_id); + + ChannelLayout channel_layout = +- codec_context->channels > 8 ++ codec_context->ch_layout.nb_channels > 8 + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, +- codec_context->channels); ++ : ChannelLayoutToChromeChannelLayout( ++ codec_context->ch_layout.u.mask, ++ codec_context->ch_layout.nb_channels); + + int sample_rate = codec_context->sample_rate; + switch (codec) { +@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + extra_data, encryption_scheme, seek_preroll, + codec_context->delay); + if (channel_layout == CHANNEL_LAYOUT_DISCRETE) +- config->SetChannelsForDiscrete(codec_context->channels); ++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); + + #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) + // These are bitstream formats unknown to ffmpeg, so they don't have +@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + + // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses + // said information to decode. +- codec_context->channels = config.channels(); ++ codec_context->ch_layout.nb_channels = config.channels(); + codec_context->sample_rate = config.samples_per_second(); + + if (config.extra_data().empty()) { +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index 5f257bdfaa6..e1be5aa9a5b 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { + + // 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_->channel_layout, +- codec_context_->channels) == ++ if (ChannelLayoutToChromeChannelLayout( ++ codec_context_->ch_layout.u.mask, ++ codec_context_->ch_layout.nb_channels) == + CHANNEL_LAYOUT_UNSUPPORTED) { + return false; + } + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); + sample_rate_ = codec_context_->sample_rate; + av_sample_format_ = codec_context_->sample_fmt; +@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( + if (frames_read < 0) + return false; + +- const int channels = frame->channels; ++ const int channels = frame->ch_layout.nb_channels; + if (frame->sample_rate != sample_rate_ || channels != channels_ || + frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" +diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc +index 2aba7927a31..1f45a50cace 100644 +--- a/media/filters/audio_file_reader_unittest.cc ++++ b/media/filters/audio_file_reader_unittest.cc +@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test { + EXPECT_FALSE(reader_->Open()); + } + +- void RunTestFailingDecode(const char* fn) { ++ void RunTestFailingDecode(const char* fn, int expect_read = 0) { + Initialize(fn); + EXPECT_TRUE(reader_->Open()); + std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets; +- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); ++ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); + } + + void RunTestPartialDecode(const char* fn) { +@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { + } + + TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { +- RunTestFailingDecode("midstream_config_change.mp3"); ++ RunTestFailingDecode("midstream_config_change.mp3", 42624); + } + #endif + +diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc +index 185819eb936..69ff508c221 100644 +--- a/media/filters/audio_video_metadata_extractor.cc ++++ b/media/filters/audio_video_metadata_extractor.cc +@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source, + 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<int32_t*>(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); +@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata, + 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_)) +diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc +index 6f231c85729..ca5e5fb927d 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc +@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + 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_->channels || ++ channel_configuration_ != ++ stream_codec_parameters_->ch_layout.nb_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_->channels, ++ stream_codec_parameters_->ch_layout.nb_channels, + 0, // originality + 0, // home + 0, // copyrighted_stream +@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + codec_ = stream_codec_parameters_->codec_id; + audio_profile_ = stream_codec_parameters_->profile; + sample_rate_index_ = sample_rate_index; +- channel_configuration_ = stream_codec_parameters_->channels; ++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; + frame_length_ = header_plus_packet_size; + } + +diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +index 1fd4c5ccd7d..f59bcd8fdaf 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { + memset(&test_parameters_, 0, sizeof(AVCodecParameters)); + test_parameters_.codec_id = AV_CODEC_ID_AAC; + test_parameters_.profile = FF_PROFILE_AAC_MAIN; +- test_parameters_.channels = 2; ++ test_parameters_.ch_layout.nb_channels = 2; + test_parameters_.extradata = extradata_header_; + test_parameters_.extradata_size = sizeof(extradata_header_); + } +diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc +index 6a56c675f7d..4615fdeb3fb 100644 +--- a/media/filters/ffmpeg_audio_decoder.cc ++++ b/media/filters/ffmpeg_audio_decoder.cc +@@ -28,7 +28,7 @@ namespace media { + + // Return the number of channels from the data in |frame|. + static inline int DetermineChannels(AVFrame* frame) { +- return frame->channels; ++ return frame->ch_layout.nb_channels; + } + + // Called by FFmpeg's allocation routine to allocate a buffer. Uses +@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, + // Translate unsupported into discrete layouts for discrete configurations; + // ffmpeg does not have a labeled discrete configuration internally. + ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( +- codec_context_->channel_layout, codec_context_->channels); ++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { + channel_layout = CHANNEL_LAYOUT_DISCRETE; +@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { + // Success! + av_sample_format_ = codec_context_->sample_fmt; + +- if (codec_context_->channels != config.channels()) { ++ if (codec_context_->ch_layout.nb_channels != config.channels()) { + MEDIA_LOG(ERROR, media_log_) + << "Audio configuration specified " << config.channels() + << " channels, but FFmpeg thinks the file contains " +- << codec_context_->channels << " channels"; ++ << codec_context_->ch_layout.nb_channels << " channels"; + ReleaseFFmpegResources(); + state_ = DecoderState::kUninitialized; + return false; +@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + if (frame->nb_samples <= 0) + return AVERROR(EINVAL); + +- if (s->channels != channels) { ++ if (s->ch_layout.nb_channels != channels) { + DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; + return AVERROR(EINVAL); + } +@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + ChannelLayout channel_layout = + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); ++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, ++ s->ch_layout.nb_channels); + + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { + DLOG(ERROR) << "Unsupported channel layout."; Deleted: REVERT-roll-src-third_party-ffmpeg-m106.patch =================================================================== --- REVERT-roll-src-third_party-ffmpeg-m106.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ REVERT-roll-src-third_party-ffmpeg-m106.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,55 +0,0 @@ -From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001 -From: Eugene Zemtsov <eug...@chromium.org> -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 <cas...@chromium.org> -Commit-Queue: Eugene Zemtsov <eug...@chromium.org> -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<int64_t>(0), frame->pts)); -+ frame->duration + std::min(static_cast<int64_t>(0), frame->pts)); - const base::TimeDelta frame_duration = - base::Seconds(frames_read / static_cast<double>(sample_rate_)); - Copied: electron21/repos/community-x86_64/REVERT-roll-src-third_party-ffmpeg-m106.patch (from rev 1399969, electron21/trunk/REVERT-roll-src-third_party-ffmpeg-m106.patch) =================================================================== --- REVERT-roll-src-third_party-ffmpeg-m106.patch (rev 0) +++ REVERT-roll-src-third_party-ffmpeg-m106.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,55 @@ +From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001 +From: Eugene Zemtsov <eug...@chromium.org> +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 <cas...@chromium.org> +Commit-Queue: Eugene Zemtsov <eug...@chromium.org> +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<int64_t>(0), frame->pts)); ++ frame->duration + std::min(static_cast<int64_t>(0), frame->pts)); + const base::TimeDelta frame_duration = + base::Seconds(frames_read / static_cast<double>(sample_rate_)); + Deleted: angle-wayland-include-protocol.patch =================================================================== --- angle-wayland-include-protocol.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ angle-wayland-include-protocol.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,38 +0,0 @@ -diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn ---- third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000 -+++ third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000 -@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") { - if (angle_enable_vulkan && angle_use_wayland && - defined(vulkan_wayland_include_dirs)) { - include_dirs = vulkan_wayland_include_dirs -+ } else if (angle_enable_vulkan && angle_use_wayland) { -+ include_dirs = [ -+ "$wayland_gn_dir/src/src", -+ "$wayland_gn_dir/include/src", -+ "$wayland_gn_dir/include/protocol", -+ ] - } - } - -@@ -1073,6 +1079,7 @@ if (angle_use_wayland) { - include_dirs = [ - "$wayland_dir/egl", - "$wayland_dir/src", -+ "$wayland_gn_dir/include/protocol", - ] - } - -diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn ---- third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000 -+++ third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000 -@@ -21,6 +21,9 @@ source_set("volk") { - configs += [ "$angle_root:angle_no_cfi_icall" ] - public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] - if (angle_use_wayland) { -- include_dirs = [ "$wayland_dir/src" ] -+ include_dirs = [ -+ "$wayland_dir/src", -+ "$wayland_gn_dir/include/protocol", -+ ] - } - } Copied: electron21/repos/community-x86_64/angle-wayland-include-protocol.patch (from rev 1399969, electron21/trunk/angle-wayland-include-protocol.patch) =================================================================== --- angle-wayland-include-protocol.patch (rev 0) +++ angle-wayland-include-protocol.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,38 @@ +diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn +--- third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000 ++++ third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000 +@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") { + if (angle_enable_vulkan && angle_use_wayland && + defined(vulkan_wayland_include_dirs)) { + include_dirs = vulkan_wayland_include_dirs ++ } else if (angle_enable_vulkan && angle_use_wayland) { ++ include_dirs = [ ++ "$wayland_gn_dir/src/src", ++ "$wayland_gn_dir/include/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } + +@@ -1073,6 +1079,7 @@ if (angle_use_wayland) { + include_dirs = [ + "$wayland_dir/egl", + "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", + ] + } + +diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn +--- third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000 ++++ third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000 +@@ -21,6 +21,9 @@ source_set("volk") { + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] + if (angle_use_wayland) { +- include_dirs = [ "$wayland_dir/src" ] ++ include_dirs = [ ++ "$wayland_dir/src", ++ "$wayland_gn_dir/include/protocol", ++ ] + } + } Deleted: default_app-icon.patch =================================================================== --- default_app-icon.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ default_app-icon.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,21 +0,0 @@ ---- a/electron/default_app/default_app.ts -+++ b/electron/default_app/default_app.ts -@@ -60,7 +60,7 @@ - }; - - if (process.platform === 'linux') { -- options.icon = path.join(__dirname, 'icon.png'); -+ options.icon = '/usr/share/pixmaps/electron.png'; - } - - mainWindow = new BrowserWindow(options); ---- a/electron/filenames.gni -+++ b/electron/filenames.gni -@@ -6,7 +6,6 @@ - ] - - default_app_static_sources = [ -- "default_app/icon.png", - "default_app/index.html", - "default_app/package.json", - "default_app/styles.css", Copied: electron21/repos/community-x86_64/default_app-icon.patch (from rev 1399969, electron21/trunk/default_app-icon.patch) =================================================================== --- default_app-icon.patch (rev 0) +++ default_app-icon.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,21 @@ +--- a/electron/default_app/default_app.ts ++++ b/electron/default_app/default_app.ts +@@ -60,7 +60,7 @@ + }; + + if (process.platform === 'linux') { +- options.icon = path.join(__dirname, 'icon.png'); ++ options.icon = '/usr/share/pixmaps/electron.png'; + } + + mainWindow = new BrowserWindow(options); +--- a/electron/filenames.gni ++++ b/electron/filenames.gni +@@ -6,7 +6,6 @@ + ] + + default_app_static_sources = [ +- "default_app/icon.png", + "default_app/index.html", + "default_app/package.json", + "default_app/styles.css", Deleted: electron-launcher.sh =================================================================== --- electron-launcher.sh 2023-02-12 09:49:57 UTC (rev 1399970) +++ electron-launcher.sh 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,20 +0,0 @@ -#!/usr/bin/bash - -set -euo pipefail - -name=@ELECTRON@ -flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" - -declare -a flags - -if [[ -f "${flags_file}" ]]; then - mapfile -t < "${flags_file}" -fi - -for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then - flags+=("${line}") - fi -done - -exec /usr/lib/${name}/electron "${flags[@]}" "$@" Copied: electron21/repos/community-x86_64/electron-launcher.sh (from rev 1399969, electron21/trunk/electron-launcher.sh) =================================================================== --- electron-launcher.sh (rev 0) +++ electron-launcher.sh 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,20 @@ +#!/usr/bin/bash + +set -euo pipefail + +name=@ELECTRON@ +flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" + +declare -a flags + +if [[ -f "${flags_file}" ]]; then + mapfile -t < "${flags_file}" +fi + +for line in "${MAPFILE[@]}"; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + flags+=("${line}") + fi +done + +exec /usr/lib/${name}/electron "${flags[@]}" "$@" Deleted: electron.desktop =================================================================== --- electron.desktop 2023-02-12 09:49:57 UTC (rev 1399970) +++ electron.desktop 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=@ELECTRON_NAME@ -Icon=@ELECTRON@ -Exec=@ELECTRON@ %u -Categories=Development;GTK; -StartupNotify=true Copied: electron21/repos/community-x86_64/electron.desktop (from rev 1399970, electron21/trunk/electron.desktop) =================================================================== --- electron.desktop (rev 0) +++ electron.desktop 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=@ELECTRON_NAME@ +Icon=@ELECTRON@ +Exec=@ELECTRON@ %u +Categories=Development;GTK; +StartupNotify=true Deleted: jinja-python-3.10.patch =================================================================== --- jinja-python-3.10.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ jinja-python-3.10.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,22 +0,0 @@ ---- a/runtime.py -+++ b/runtime.py -@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta - - # register the context as mapping if possible - try: -- from collections import Mapping -+ from collections.abc import Mapping - Mapping.register(Context) - except ImportError: - pass ---- a/sandbox.py -+++ b/sandbox.py -@@ -14,7 +14,7 @@ - """ - import types - import operator --from collections import Mapping -+from collections.abc import Mapping - from jinja2.environment import Environment - from jinja2.exceptions import SecurityError - from jinja2._compat import string_types, PY2 Copied: electron21/repos/community-x86_64/jinja-python-3.10.patch (from rev 1399970, electron21/trunk/jinja-python-3.10.patch) =================================================================== --- jinja-python-3.10.patch (rev 0) +++ jinja-python-3.10.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,22 @@ +--- a/runtime.py ++++ b/runtime.py +@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta + + # register the context as mapping if possible + try: +- from collections import Mapping ++ from collections.abc import Mapping + Mapping.register(Context) + except ImportError: + pass +--- a/sandbox.py ++++ b/sandbox.py +@@ -14,7 +14,7 @@ + """ + import types + import operator +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.environment import Environment + from jinja2.exceptions import SecurityError + from jinja2._compat import string_types, PY2 Deleted: std-vector-non-const.patch =================================================================== --- std-vector-non-const.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ std-vector-non-const.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,109 +0,0 @@ ---- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch -+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch -@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359 - - const base::FilePath& current_directory)>; - + base::RepeatingCallback<bool(const base::CommandLine& command_line, - + const base::FilePath& current_directory, --+ const std::vector<const uint8_t> additional_data)>; -++ const std::vector<uint8_t> additional_data)>; - - #if BUILDFLAG(IS_WIN) - ProcessSingleton(const std::string& program_name, -@@ -72,7 +72,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 - // |reader| is for sending back ACK message. - void HandleMessage(const std::string& current_dir, - const std::vector<std::string>& argv, --+ const std::vector<const uint8_t> additional_data, -++ const std::vector<uint8_t> additional_data, - SocketReader* reader); - - private: -@@ -83,7 +83,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 - - const std::string& current_dir, const std::vector<std::string>& argv, - + const std::string& current_dir, - + const std::vector<std::string>& argv, --+ const std::vector<const uint8_t> additional_data, -++ const std::vector<uint8_t> additional_data, - SocketReader* reader) { - DCHECK(ui_task_runner_->BelongsToCurrentThread()); - DCHECK(reader); -@@ -113,7 +113,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 - + base::StringToSizeT(tokens[0], &num_args); - + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); - + --+ std::vector<const uint8_t> additional_data; -++ std::vector<uint8_t> additional_data; - + if (tokens.size() >= 3 + num_args) { - + size_t additional_data_size; - + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); -@@ -122,7 +122,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 - + std::string(1, kTokenDelimiter)); - + const uint8_t* additional_data_bits = - + reinterpret_cast<const uint8_t*>(remaining_args.c_str()); --+ additional_data = std::vector<const uint8_t>( -++ additional_data = std::vector<uint8_t>( - + additional_data_bits, additional_data_bits + additional_data_size); - + } - + -@@ -188,7 +188,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f - base::CommandLine* parsed_command_line, - - base::FilePath* current_directory) { - + base::FilePath* current_directory, --+ std::vector<const uint8_t>* parsed_additional_data) { -++ std::vector<uint8_t>* parsed_additional_data) { - // We should have enough room for the shortest command (min_message_size) - // and also be a multiple of wchar_t bytes. The shortest command - - // possible is L"START\0\0" (empty current directory and command line). -@@ -229,7 +229,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f - + msg.substr(fourth_null + 1, fifth_null - fourth_null); - + const uint8_t* additional_data_bytes = - + reinterpret_cast<const uint8_t*>(additional_data.c_str()); --+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes, -++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes, - + additional_data_bytes + additional_data_length); - + - return true; -@@ -240,7 +240,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f - base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); - base::FilePath current_directory; - - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { --+ std::vector<const uint8_t> additional_data; -++ std::vector<uint8_t> additional_data; - + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { - *result = TRUE; - return true; ---- a/shell/browser/api/electron_api_app.cc -+++ b/shell/browser/api/electron_api_app.cc -@@ -522,10 +522,10 @@ bool NotificationCallbackWrapper( - const base::RepeatingCallback< - void(const base::CommandLine& command_line, - const base::FilePath& current_directory, -- const std::vector<const uint8_t> additional_data)>& callback, -+ const std::vector<uint8_t> additional_data)>& callback, - const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data) { -+ const std::vector<uint8_t> additional_data) { - // Make sure the callback is called after app gets ready. - if (Browser::Get()->is_ready()) { - callback.Run(cmd, cwd, std::move(additional_data)); -@@ -1094,7 +1094,7 @@ std::string App::GetLocaleCountryCode() { - - void App::OnSecondInstance(const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data) { -+ const std::vector<uint8_t> additional_data) { - v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); - v8::HandleScope handle_scope(isolate); - v8::Local<v8::Value> data_value = ---- a/shell/browser/api/electron_api_app.h -+++ b/shell/browser/api/electron_api_app.h -@@ -194,7 +194,7 @@ class App : public ElectronBrowserClient::Delegate, - std::string GetSystemLocale(gin_helper::ErrorThrower thrower) const; - void OnSecondInstance(const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data); -+ const std::vector<uint8_t> additional_data); - bool HasSingleInstanceLock() const; - bool RequestSingleInstanceLock(gin::Arguments* args); - void ReleaseSingleInstanceLock(); Copied: electron21/repos/community-x86_64/std-vector-non-const.patch (from rev 1399970, electron21/trunk/std-vector-non-const.patch) =================================================================== --- std-vector-non-const.patch (rev 0) +++ std-vector-non-const.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,109 @@ +--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch ++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359 + - const base::FilePath& current_directory)>; + + base::RepeatingCallback<bool(const base::CommandLine& command_line, + + const base::FilePath& current_directory, +-+ const std::vector<const uint8_t> additional_data)>; +++ const std::vector<uint8_t> additional_data)>; + + #if BUILDFLAG(IS_WIN) + ProcessSingleton(const std::string& program_name, +@@ -72,7 +72,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + // |reader| is for sending back ACK message. + void HandleMessage(const std::string& current_dir, + const std::vector<std::string>& argv, +-+ const std::vector<const uint8_t> additional_data, +++ const std::vector<uint8_t> additional_data, + SocketReader* reader); + + private: +@@ -83,7 +83,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + - const std::string& current_dir, const std::vector<std::string>& argv, + + const std::string& current_dir, + + const std::vector<std::string>& argv, +-+ const std::vector<const uint8_t> additional_data, +++ const std::vector<uint8_t> additional_data, + SocketReader* reader) { + DCHECK(ui_task_runner_->BelongsToCurrentThread()); + DCHECK(reader); +@@ -113,7 +113,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + + base::StringToSizeT(tokens[0], &num_args); + + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); + + +-+ std::vector<const uint8_t> additional_data; +++ std::vector<uint8_t> additional_data; + + if (tokens.size() >= 3 + num_args) { + + size_t additional_data_size; + + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); +@@ -122,7 +122,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768 + + std::string(1, kTokenDelimiter)); + + const uint8_t* additional_data_bits = + + reinterpret_cast<const uint8_t*>(remaining_args.c_str()); +-+ additional_data = std::vector<const uint8_t>( +++ additional_data = std::vector<uint8_t>( + + additional_data_bits, additional_data_bits + additional_data_size); + + } + + +@@ -188,7 +188,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + base::CommandLine* parsed_command_line, + - base::FilePath* current_directory) { + + base::FilePath* current_directory, +-+ std::vector<const uint8_t>* parsed_additional_data) { +++ std::vector<uint8_t>* parsed_additional_data) { + // We should have enough room for the shortest command (min_message_size) + // and also be a multiple of wchar_t bytes. The shortest command + - // possible is L"START\0\0" (empty current directory and command line). +@@ -229,7 +229,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + + msg.substr(fourth_null + 1, fifth_null - fourth_null); + + const uint8_t* additional_data_bytes = + + reinterpret_cast<const uint8_t*>(additional_data.c_str()); +-+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes, +++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes, + + additional_data_bytes + additional_data_length); + + + return true; +@@ -240,7 +240,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f + base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); + base::FilePath current_directory; + - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { +-+ std::vector<const uint8_t> additional_data; +++ std::vector<uint8_t> additional_data; + + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { + *result = TRUE; + return true; +--- a/shell/browser/api/electron_api_app.cc ++++ b/shell/browser/api/electron_api_app.cc +@@ -522,10 +522,10 @@ bool NotificationCallbackWrapper( + const base::RepeatingCallback< + void(const base::CommandLine& command_line, + const base::FilePath& current_directory, +- const std::vector<const uint8_t> additional_data)>& callback, ++ const std::vector<uint8_t> additional_data)>& callback, + const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { + // Make sure the callback is called after app gets ready. + if (Browser::Get()->is_ready()) { + callback.Run(cmd, cwd, std::move(additional_data)); +@@ -1094,7 +1094,7 @@ std::string App::GetLocaleCountryCode() { + + void App::OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { + v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); + v8::HandleScope handle_scope(isolate); + v8::Local<v8::Value> data_value = +--- a/shell/browser/api/electron_api_app.h ++++ b/shell/browser/api/electron_api_app.h +@@ -194,7 +194,7 @@ class App : public ElectronBrowserClient::Delegate, + std::string GetSystemLocale(gin_helper::ErrorThrower thrower) const; + void OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data); ++ const std::vector<uint8_t> additional_data); + bool HasSingleInstanceLock() const; + bool RequestSingleInstanceLock(gin::Arguments* args); + void ReleaseSingleInstanceLock(); Deleted: unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch =================================================================== --- unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,38 +0,0 @@ -From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Tue, 27 Sep 2022 22:20:41 +0000 -Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true - -Ensure jsoncpp symbols have public visibility and are thus excluded from -CFI checks and whole-program optimization. This is achieved by defining -JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as -__attribute__((visibility("default"))). The latter macro is used to tag -jsoncpp classes and namespace functions throughout jsoncpp's headers. - -BUG=1365218 - -Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652 -Reviewed-by: Thomas Anderson <thomasander...@chromium.org> -Commit-Queue: Thomas Anderson <thomasander...@chromium.org> -Cr-Commit-Position: refs/heads/main@{#1052077} ---- - build/linux/unbundle/jsoncpp.gn | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn -index 544f9d13c9..e84a0ef27a 100644 ---- a/build/linux/unbundle/jsoncpp.gn -+++ b/build/linux/unbundle/jsoncpp.gn -@@ -3,6 +3,11 @@ import("//build/shim_headers.gni") - - pkg_config("jsoncpp_config") { - packages = [ "jsoncpp" ] -+ -+ # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes -+ # thus deactivating CFI checks for them. This avoids CFI violations in -+ # virtual calls to system jsoncpp library (https://crbug.com/1365218). -+ defines = [ "JSON_DLL_BUILD" ] - } - - shim_headers("jsoncpp_shim") { Copied: electron21/repos/community-x86_64/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch (from rev 1399970, electron21/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch) =================================================================== --- unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch (rev 0) +++ unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,38 @@ +From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Tue, 27 Sep 2022 22:20:41 +0000 +Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true + +Ensure jsoncpp symbols have public visibility and are thus excluded from +CFI checks and whole-program optimization. This is achieved by defining +JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as +__attribute__((visibility("default"))). The latter macro is used to tag +jsoncpp classes and namespace functions throughout jsoncpp's headers. + +BUG=1365218 + +Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652 +Reviewed-by: Thomas Anderson <thomasander...@chromium.org> +Commit-Queue: Thomas Anderson <thomasander...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1052077} +--- + build/linux/unbundle/jsoncpp.gn | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn +index 544f9d13c9..e84a0ef27a 100644 +--- a/build/linux/unbundle/jsoncpp.gn ++++ b/build/linux/unbundle/jsoncpp.gn +@@ -3,6 +3,11 @@ import("//build/shim_headers.gni") + + pkg_config("jsoncpp_config") { + packages = [ "jsoncpp" ] ++ ++ # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes ++ # thus deactivating CFI checks for them. This avoids CFI violations in ++ # virtual calls to system jsoncpp library (https://crbug.com/1365218). ++ defines = [ "JSON_DLL_BUILD" ] + } + + shim_headers("jsoncpp_shim") { Deleted: use-system-libraries-in-node.patch =================================================================== --- use-system-libraries-in-node.patch 2023-02-12 09:49:57 UTC (rev 1399970) +++ use-system-libraries-in-node.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -1,53 +0,0 @@ ---- a/third_party/electron_node/BUILD.gn -+++ b/third_party/electron_node/BUILD.gn -@@ -42,6 +42,18 @@ - node_module_version = "" - } - -+if (is_linux) { -+ import("//build/config/linux/pkg_config.gni") -+ -+ pkg_config("cares") { -+ packages = [ "libcares" ] -+ } -+ -+ pkg_config("nghttp2") { -+ packages = [ "libnghttp2" ] -+ } -+} -+ - assert(!node_use_dtrace, "node_use_dtrace not supported in GN") - assert(!node_use_etw, "node_use_etw not supported in GN") - -@@ -182,11 +194,9 @@ - component("node_lib") { - deps = [ - ":node_js2c", -- "deps/cares", - "deps/histogram", - "deps/googletest:gtest", - "deps/llhttp", -- "deps/nghttp2", - "deps/uvwasi", - "//third_party/zlib", - "//third_party/brotli:dec", -@@ -202,6 +212,19 @@ - public_configs = [ ":node_lib_config" ] - include_dirs = [ "src" ] - libs = [] -+ if (is_linux) { -+ configs += [ -+ ":cares", -+ ":nghttp2", -+ ] -+ libs += [ "http_parser" ] -+ } else { -+ deps += [ -+ "deps/cares", -+ "deps/http_parser", -+ "deps/nghttp2", -+ ] -+ } - frameworks = [] - cflags_cc = [ - "-Wno-deprecated-declarations", Copied: electron21/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 1399970, electron21/trunk/use-system-libraries-in-node.patch) =================================================================== --- use-system-libraries-in-node.patch (rev 0) +++ use-system-libraries-in-node.patch 2023-02-12 09:50:03 UTC (rev 1399971) @@ -0,0 +1,53 @@ +--- a/third_party/electron_node/BUILD.gn ++++ b/third_party/electron_node/BUILD.gn +@@ -42,6 +42,18 @@ + node_module_version = "" + } + ++if (is_linux) { ++ import("//build/config/linux/pkg_config.gni") ++ ++ pkg_config("cares") { ++ packages = [ "libcares" ] ++ } ++ ++ pkg_config("nghttp2") { ++ packages = [ "libnghttp2" ] ++ } ++} ++ + assert(!node_use_dtrace, "node_use_dtrace not supported in GN") + assert(!node_use_etw, "node_use_etw not supported in GN") + +@@ -182,11 +194,9 @@ + component("node_lib") { + deps = [ + ":node_js2c", +- "deps/cares", + "deps/histogram", + "deps/googletest:gtest", + "deps/llhttp", +- "deps/nghttp2", + "deps/uvwasi", + "//third_party/zlib", + "//third_party/brotli:dec", +@@ -202,6 +212,19 @@ + public_configs = [ ":node_lib_config" ] + include_dirs = [ "src" ] + libs = [] ++ if (is_linux) { ++ configs += [ ++ ":cares", ++ ":nghttp2", ++ ] ++ libs += [ "http_parser" ] ++ } else { ++ deps += [ ++ "deps/cares", ++ "deps/http_parser", ++ "deps/nghttp2", ++ ] ++ } + frameworks = [] + cflags_cc = [ + "-Wno-deprecated-declarations",