Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2021-10-04 18:39:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Mon Oct 4 18:39:11 2021 rev:305 rq:922845 version:94.0.4606.71
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2021-09-21
21:12:53.786621928 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.2443/chromium.changes
2021-10-04 18:40:05.202069388 +0200
@@ -1,0 +2,56 @@
+Sun Oct 3 09:38:33 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Chromium 94.0.4606.54 (boo#1190765):
+ * CVE-2021-37956: Use after free in Offline use
+ * CVE-2021-37957: Use after free in WebGPU
+ * CVE-2021-37958: Inappropriate implementation in Navigation
+ * CVE-2021-37959: Use after free in Task Manager
+ * CVE-2021-37960: Inappropriate implementation in Blink graphics
+ * CVE-2021-37961: Use after free in Tab Strip
+ * CVE-2021-37962: Use after free in Performance Manager
+ * CVE-2021-37963: Side-channel information leakage in DevTools
+ * CVE-2021-37964: Inappropriate implementation in ChromeOS Networking
+ * CVE-2021-37965: Inappropriate implementation in Background Fetch API
+ * CVE-2021-37966: Inappropriate implementation in Compositing
+ * CVE-2021-37967: Inappropriate implementation in Background Fetch API
+ * CVE-2021-37968: Inappropriate implementation in Background Fetch API
+ * CVE-2021-37969: Inappropriate implementation in Google Updater
+ * CVE-2021-37970: Use after free in File System API
+ * CVE-2021-37971: Incorrect security UI in Web Browser UI
+ * CVE-2021-37972: Out of bounds read in libjpeg-turbo
+- Chromium 94.0.4606.61 (boo#1191166):
+ * CVE-2021-37973: Use after free in Portals
+- Chromium 94.0.4606.71 (boo#1191204):
+ * CVE-2021-37974 : Use after free in Safe Browsing
+ * CVE-2021-37975 : Use after free in V8
+ * CVE-2021-37976 : Information leak in core
+- Added patches:
+ * chromium-94-CustomSpaces-include.patch
+ * chromium-94-sql-no-assert.patch
+ * chromium-older-harfbuzz.patch
+ * chromium-94-ffmpeg-roll.patch
+ * chromium-94-compiler.patch
+- Removed patches:
+ * chromium-freetype-2.11.patch
+ * chromium-93-ContextSet-permissive.patch
+ * chromium-93-ClassProperty-include.patch
+ * chromium-93-BluetoothLowEnergyScanFilter-include.patch
+ * chromium-93-HashPasswordManager-include.patch
+ * chromium-93-pdfium-include.patch
+ * chromium-93-DevToolsEmbedderMessageDispatcher-include.patch
+ * chromium-93-FormForest-constexpr.patch
+ * chromium-93-ScopedTestDialogAutoConfirm-include.patch
+ * chromium-93-InkDropHost-crash.patch
+ * chromium-91-compiler.patch
+ * chromium-glibc-2.33.patch
+ * chromium-shim_headers.patch
+
+-------------------------------------------------------------------
+Sat Sep 18 12:47:15 UTC 2021 - Callum Farmer <gm...@opensuse.org>
+
+- Add patch to fix Leap 15.2 build:
+ * chromium-ffmpeg-lp152.patch
+- Change system-libdrm.patch: add to unbundle instead of changing
+ header path
+
+-------------------------------------------------------------------
@@ -3105 +3161 @@
-------------------------------------------------------------------
+-------------------------------------------------------------------
Old:
----
chromium-91-compiler.patch
chromium-93-BluetoothLowEnergyScanFilter-include.patch
chromium-93-ClassProperty-include.patch
chromium-93-ContextSet-permissive.patch
chromium-93-DevToolsEmbedderMessageDispatcher-include.patch
chromium-93-FormForest-constexpr.patch
chromium-93-HashPasswordManager-include.patch
chromium-93-InkDropHost-crash.patch
chromium-93-ScopedTestDialogAutoConfirm-include.patch
chromium-93-pdfium-include.patch
chromium-93.0.4577.82.tar.xz
chromium-freetype-2.11.patch
chromium-glibc-2.33.patch
chromium-shim_headers.patch
New:
----
chromium-94-CustomSpaces-include.patch
chromium-94-compiler.patch
chromium-94-ffmpeg-roll.patch
chromium-94-sql-no-assert.patch
chromium-94.0.4606.71.tar.xz
chromium-ffmpeg-lp152.patch
chromium-older-harfbuzz.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.VRjGz5/_old 2021-10-04 18:40:16.334087471 +0200
+++ /var/tmp/diff_new_pack.VRjGz5/_new 2021-10-04 18:40:16.338087477 +0200
@@ -33,11 +33,8 @@
%bcond_with system_harfbuzz
%bcond_with pipewire
%endif
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
%bcond_without system_ffmpeg
-%else
-%bcond_with system_ffmpeg
-%endif
+%bcond_with system_freetype
%ifarch %{arm} aarch64
%bcond_with swiftshader
%else
@@ -46,7 +43,7 @@
%bcond_with lto
%bcond_without clang
Name: chromium
-Version: 93.0.4577.82
+Version: 94.0.4606.71
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -57,7 +54,7 @@
# Toolchain definitions
Source30: master_preferences
Source104: chromium-symbolic.svg
-#
https://github.com/chromium/chromium/tree/%{version}/chrome/installer/linux/common/installer.include
+#
https://github.com/chromium/chromium/tree/%%{version}/chrome/installer/linux/common/installer.include
Source105: INSTALL.sh
#
Patch0: chromium-libusb_interrupt_event_handler.patch
@@ -80,34 +77,27 @@
# gentoo/fedora/arch patchset
Patch12: chromium-78-protobuf-RepeatedPtrField-export.patch
Patch13: chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
-Patch15: chromium-91-compiler.patch
+Patch15: chromium-94-compiler.patch
Patch17: chromium-86-ImageMemoryBarrierData-init.patch
Patch18: chromium-86-nearby-explicit.patch
Patch19: chromium-86-nearby-include.patch
Patch20: chromium-86-f_seal.patch
Patch21: chromium-gcc11.patch
-Patch23: chromium-glibc-2.33.patch
Patch25: chromium-90-fseal.patch
Patch29: chromium-93-EnumTable-crash.patch
-Patch30: chromium-shim_headers.patch
Patch31: chromium-89-missing-cstring-header.patch
Patch36: chromium-90-ruy-include.patch
Patch40: chromium-91-java-only-allowed-in-android-builds.patch
Patch44: chromium-91-libyuv-aarch64.patch
Patch46: chromium-91-sql-standard-layout-type.patch
-Patch49: chromium-freetype-2.11.patch
Patch50: chromium-clang-nomerge.patch
Patch51: chromium-glibc-2.34.patch
-Patch53: chromium-93-ContextSet-permissive.patch
-Patch54: chromium-93-ClassProperty-include.patch
-Patch55: chromium-93-BluetoothLowEnergyScanFilter-include.patch
-Patch56: chromium-93-HashPasswordManager-include.patch
-Patch57: chromium-93-pdfium-include.patch
-Patch58: chromium-93-DevToolsEmbedderMessageDispatcher-include.patch
-Patch59: chromium-93-FormForest-constexpr.patch
-Patch60: chromium-93-ScopedTestDialogAutoConfirm-include.patch
-Patch61: chromium-93-InkDropHost-crash.patch
Patch62: chromium-93-ffmpeg-4.4.patch
+Patch63: chromium-ffmpeg-lp152.patch
+Patch64: chromium-94-CustomSpaces-include.patch
+Patch65: chromium-94-sql-no-assert.patch
+Patch67: chromium-older-harfbuzz.patch
+Patch68: chromium-94-ffmpeg-roll.patch
# Google seem not too keen on merging this but GPU accel is quite important
# https://chromium-review.googlesource.com/c/chromium/src/+/532294
#
https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches
@@ -158,7 +148,6 @@
BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(flac++)
-BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -261,6 +250,9 @@
%if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.8.2
%endif
+%if %{with system_freetype}
+BuildRequires: pkgconfig(freetype2)
+%endif
%if %{with clang}
BuildRequires: clang
BuildRequires: lld
@@ -375,6 +367,8 @@
third_party/cros_system_api
third_party/dav1d
third_party/dawn
+ third_party/dawn/third_party
+ third_party/dawn/third_party/tint/src/ast
third_party/depot_tools
third_party/depot_tools/third_party/six
third_party/devscripts
@@ -393,6 +387,7 @@
third_party/devtools-frontend/src/front_end/third_party/puppeteer
third_party/devtools-frontend/src/front_end/third_party/wasmparser
third_party/devtools-frontend/src/third_party
+ third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
third_party/dom_distiller_js
third_party/eigen3
third_party/emoji-segmenter
@@ -537,10 +532,14 @@
)
%if !%{with system_harfbuzz}
keeplibs+=(
- third_party/freetype
third_party/harfbuzz-ng
)
%endif
+%if !%{with system_freetype}
+keeplibs+=(
+ third_party/freetype
+)
+%endif
%if !%{with system_icu}
keeplibs+=( third_party/icu )
%endif
@@ -649,6 +648,10 @@
%if %{with system_harfbuzz}
gn_system_libraries+=(
harfbuzz-ng
+)
+%endif
+%if %{with system_freetype}
+gn_system_libraries+=(
freetype
)
%endif
@@ -697,7 +700,7 @@
myconf_gn+=" use_allocator=\"partition\""
myconf_gn+=" use_allocator_shim=true"
myconf_gn+=" use_partition_alloc=true"
-myconf_gn+=" fieldtrial_testing_like_official_build=true"
+myconf_gn+=" disable_fieldtrial_testing_config=true"
myconf_gn+=" use_gnome_keyring=false"
myconf_gn+=" use_unofficial_version_number=false"
myconf_gn+=" use_vaapi=true"
@@ -712,6 +715,8 @@
# See dependency logic in third_party/BUILD.gn
%if %{with system_harfbuzz}
myconf_gn+=" use_system_harfbuzz=true"
+%endif
+%if %{with system_freetype}
myconf_gn+=" use_system_freetype=true"
%endif
myconf_gn+=" enable_hangout_services_extension=true"
++++++ INSTALL.sh ++++++
--- /var/tmp/diff_new_pack.VRjGz5/_old 2021-10-04 18:40:16.366087523 +0200
+++ /var/tmp/diff_new_pack.VRjGz5/_new 2021-10-04 18:40:16.366087523 +0200
@@ -28,8 +28,8 @@
install -m 755 "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}"
# crashpad
-buildfile="${OUTPUTDIR}/crashpad_handler"
-install -m 755 "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/crashpad_handler"
+buildfile="${OUTPUTDIR}/chrome_crashpad_handler"
+install -m 755 "${buildfile}"
"${STAGEDIR}/${INSTALLDIR}/chrome_crashpad_handler"
# resources
install -m 644 "${OUTPUTDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
@@ -109,9 +109,9 @@
sed \
-e "s#@@PROGNAME@@#${PROGNAME}#g" \
-e "s#@@CHANNEL@@#${CHANNEL}#g" \
- "chrome/installer/linux/common/wrapper" >
"${STAGEDIR}/${INSTALLDIR}/${PACKAGE}"
-chmod 755 "${STAGEDIR}/${INSTALLDIR}/${PACKAGE}"
-ln -s "${INSTALLDIR}/${PACKAGE}" "${STAGEDIR}/usr/bin/${PACKAGE}"
+ "chrome/installer/linux/common/wrapper" >
"${STAGEDIR}/${INSTALLDIR}/chrome-wrapper"
+chmod 755 "${STAGEDIR}/${INSTALLDIR}/chrome-wrapper"
+ln -s "${INSTALLDIR}/chrome-wrapper" "${STAGEDIR}/usr/bin/${PACKAGE}"
# app icons
for size in 16 32;
++++++ chromium-91-sql-standard-layout-type.patch ++++++
--- /var/tmp/diff_new_pack.VRjGz5/_old 2021-10-04 18:40:16.434087633 +0200
+++ /var/tmp/diff_new_pack.VRjGz5/_new 2021-10-04 18:40:16.434087633 +0200
@@ -217,7 +217,7 @@
+#include <array>
#include <cstdint>
#include <memory>
-
+ #include <ostream>
@@ -70,7 +71,7 @@ class DatabasePageReader {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_NE(page_id_, kInvalidPageId)
++++++ chromium-94-CustomSpaces-include.patch ++++++
>From 4eeacdaa57b29a079fe09315eb22557c06aa522e Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <sth...@googlemail.com>
Date: Fri, 13 Aug 2021 12:57:42 +0000
Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
---
.../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h | 1 +
1 file changed, 1 insertion(+)
diff --git
a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
index df0465a..640cb33 100644
--- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
+++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
@@ -5,6 +5,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
+#include <memory>
#include <vector>
#include "third_party/blink/renderer/platform/platform_export.h"
--
2.31.1
++++++ chromium-91-compiler.patch -> chromium-94-compiler.patch ++++++
--- /work/SRC/openSUSE:Factory/chromium/chromium-91-compiler.patch
2021-08-04 22:28:36.629822187 +0200
+++ /work/SRC/openSUSE:Factory/.chromium.new.2443/chromium-94-compiler.patch
2021-10-04 18:39:46.882039629 +0200
@@ -1,17 +1,17 @@
From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <flop...@gentoo.org>
-Date: Wed, 7 Apr 2021 08:50:04 +0000
+Date: Sun, 8 Aug 2021 08:50:00 +0000
Subject: [PATCH] Disable various compiler configs
---
- build/config/compiler/BUILD.gn | 59 ++++++++++------------------------
- 1 file changed, 17 insertions(+), 42 deletions(-)
+ build/config/compiler/BUILD.gn | 105 ++++++---------------------------
+ 1 file changed, 17 insertions(+), 88 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 72ea590..539672d 100644
+index 0bb155a..e95c023 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -273,8 +273,6 @@ config("compiler") {
+@@ -291,8 +291,6 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -20,7 +20,7 @@
":compiler_codegen",
":compiler_deterministic",
]
-@@ -518,24 +516,6 @@ config("compiler") {
+@@ -530,31 +528,6 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -40,12 +40,65 @@
- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
- }
- }
+-
+- # TODO(crbug.com/1235145): Investigate why/if this should be needed.
+- if (is_win) {
+- cflags += [ "/clang:-ffp-contract=off" ]
+- } else {
+- cflags += [ "-ffp-contract=off" ]
+- }
- }
-
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1643,7 +1623,7 @@ config("chromium_code") {
+@@ -1216,45 +1189,6 @@ config("compiler_deterministic") {
+ }
+ }
+
+- # Makes builds independent of absolute file path.
+- if (is_clang && strip_absolute_paths_from_debug_symbols) {
+- # If debug option is given, clang includes $cwd in debug info by default.
+- # For such build, this flag generates reproducible obj files even we use
+- # different build directory like "out/feature_a" and "out/feature_b" if
+- # we build same files with same compile flag.
+- # Other paths are already given in relative, no need to normalize them.
+- if (is_nacl) {
+- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+- cflags += [
+- "-Xclang",
+- "-fdebug-compilation-dir",
+- "-Xclang",
+- ".",
+- ]
+- } else {
+- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+- # and -fcoverage-compilation-dir=.
+- cflags += [ "-ffile-compilation-dir=." ]
+- }
+- if (!is_win) {
+- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+- asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+- }
+-
+- if (is_win && use_lld) {
+- if (symbol_level == 2 || (is_clang && using_sanitizer)) {
+- # Absolutize source file paths for PDB. Pass the real build directory
+- # if the pdb contains source-level debug information and if linker
+- # reproducibility is not critical.
+- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
+- } else {
+- # Use a fake fixed base directory for paths in the pdb to make the pdb
+- # output fully deterministic and independent of the build directory.
+- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
+- }
+- }
+- }
+-
+ # Tells the compiler not to use absolute paths when passing the default
+ # paths to the tools it invokes. We don't want this because we don't
+ # really need it and it can mess up the goma cache entries.
+@@ -1658,7 +1592,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -54,7 +107,7 @@
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1652,10 +1632,6 @@ config("chromium_code") {
+@@ -1667,10 +1601,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -65,7 +118,7 @@
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1664,15 +1640,6 @@ config("chromium_code") {
+@@ -1679,15 +1609,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -81,7 +134,7 @@
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2068,7 +2035,8 @@ config("default_stack_frames") {
+@@ -2077,7 +1998,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -91,7 +144,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2103,7 +2071,8 @@ config("optimize") {
+@@ -2112,7 +2034,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -101,7 +154,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2143,7 +2112,8 @@ config("no_optimize") {
+@@ -2152,7 +2075,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and
should
# be used sparingly.
@@ -111,7 +164,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2175,7 +2145,8 @@ config("optimize_max") {
+@@ -2184,7 +2108,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -121,7 +174,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2200,7 +2171,8 @@ config("optimize_speed") {
+@@ -2209,7 +2134,8 @@ config("optimize_speed") {
}
}
@@ -131,7 +184,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
ldflags = common_optimize_on_ldflags
visibility = [ ":default_optimization" ]
-@@ -2319,7 +2291,8 @@ config("win_pdbaltpath") {
+@@ -2328,7 +2254,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -141,7 +194,7 @@
if (is_win) {
if (is_clang) {
cflags = [ "/Z7" ] # Debug information in the .obj files.
-@@ -2422,7 +2395,8 @@ config("symbols") {
+@@ -2431,7 +2358,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to
user
# when crash happens in unittests running on buildbot.
@@ -151,7 +204,7 @@
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2481,7 +2455,8 @@ config("minimal_symbols") {
+@@ -2496,7 +2424,8 @@ config("minimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts
function
# names in the final debug information.
@@ -162,4 +215,4 @@
ldflags = [ "/DEBUG" ]
--
-2.26.3
+2.31.1
++++++ chromium-94-ffmpeg-roll.patch ++++++
>From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
From: "liber...@chromium.org" <liber...@chromium.org>
Date: Fri, 6 Aug 2021 04:25:31 +0000
Subject: [PATCH] FFmpeg M94 roll.
Contains DEPS update + chromium-side fixes.
Bug: 1227259
Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
Reviewed-by: Thomas Guilbert <tguilb...@chromium.org>
Commit-Queue: Frank Liberato <liber...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#909174}
---
media/ffmpeg/ffmpeg_common.h | 1 +
media/filters/ffmpeg_demuxer.cc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index cede8ac5a7..97d6307e28 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -29,7 +29,6 @@ extern "C" {
#include <libavformat/avformat.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
-#include <libavutil/channel_layout.h>
#include <libavutil/imgutils.h>
#include <libavutil/log.h>
#include <libavutil/mastering_display_metadata.h>
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index ac4713b072..605001d935 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream)
{
// Next try to use the first DTS value, for codecs where we know PTS == DTS
// (excludes all H26x codecs). The start time must be returned in PTS.
+ if (stream->first_dts != kNoFFmpegTimestamp &&
- if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
const base::TimeDelta first_pts =
+ ConvertFromTimeBase(stream->time_base, stream->first_dts);
- ConvertFromTimeBase(stream->time_base,
av_stream_get_first_dts(stream));
if (first_pts < start_time)
start_time = first_pts;
}
++++++ chromium-94-sql-no-assert.patch ++++++
--- a/sql/recover_module/cursor.h
+++ b/sql/recover_module/cursor.h
@@ -62,10 +62,12 @@
// |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
static inline VirtualCursor* FromSqliteCursor(
sqlite3_vtab_cursor* sqlite_cursor) {
+#ifndef NDEBUG
static_assert(std::is_standard_layout<VirtualCursor>::value,
"needed for the reinterpret_cast below");
static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
"sqlite_cursor_ must be the first member of the class");
+#endif
VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
return result;
++++++ chromium-93.0.4577.82.tar.xz -> chromium-94.0.4606.71.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-93.0.4577.82.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.2443/chromium-94.0.4606.71.tar.xz
differ: char 27, line 1
++++++ chromium-ffmpeg-lp152.patch ++++++
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -50,7 +50,13 @@
#include "media/formats/webm/webm_crypto_helpers.h"
#include "media/media_buildflags.h"
#include "third_party/ffmpeg/ffmpeg_features.h"
+#include <libavcodec/version.h>
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 78, 100)
#include "third_party/ffmpeg/libavcodec/packet.h"
+#else
+#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#endif
+
#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
#include "media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.h"
++++++ chromium-older-harfbuzz.patch ++++++
From: Fabian Vogt <fv...@suse.com>
Subject: Fix build with harfbuzz < 2.9.0
Index:
qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
===================================================================
--- a/components/paint_preview/common/subset_font.cc
+++ b/components/paint_preview/common/subset_font.cc
@@ -71,11 +71,18 @@ sk_sp<SkData> SubsetFont(SkTypeface* typ
hb_set_t* glyphs =
hb_subset_input_glyph_set(input.get()); // Owned by |input|.
usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+#if HB_VERSION_ATLEAST(2,9,0)
hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
if (!subset_face)
return nullptr;
+#else
+ hb_subset_input_set_retain_gids(input.get(), true);
+
+ HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
+#endif
+
HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
if (!subset_blob)
return nullptr;
++++++ system-libdrm.patch ++++++
--- /var/tmp/diff_new_pack.VRjGz5/_old 2021-10-04 18:40:16.574087861 +0200
+++ /var/tmp/diff_new_pack.VRjGz5/_new 2021-10-04 18:40:16.574087861 +0200
@@ -1,20 +1,13 @@
-Index:
chromium-90.0.4430.72/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
-===================================================================
----
chromium-90.0.4430.72.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
-+++
chromium-90.0.4430.72/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
-@@ -5,6 +5,7 @@
- #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
-
- #include <drm.h>
-+#include <drm_fourcc.h>
- #include <string.h>
- #include <xf86drm.h>
- #include <memory>
-@@ -14,7 +15,6 @@
- #include "base/logging.h"
- #include "base/stl_util.h"
- #include "base/trace_event/trace_event.h"
--#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
- #include "third_party/skia/include/core/SkCanvas.h"
- #include "third_party/skia/include/core/SkImage.h"
- #include "ui/gfx/geometry/point.h"
+--- a/build/linux/unbundle/libdrm.gn
++++ b/build/linux/unbundle/libdrm.gn
+@@ -12,6 +12,9 @@
+ shim_headers("libdrm_shim") {
+ root_path = "src/include"
+- headers = [ "drm.h" ]
++ headers = [
++ "drm.h",
++ "drm_fourcc.h",
++ ]
+ }
+
+ source_set("libdrm") {
