Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2022-04-01 21:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium" Fri Apr 1 21:36:20 2022 rev:328 rq:966432 version:100.0.4896.60 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2022-03-29 18:16:01.923169764 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.1900/chromium.changes 2022-04-01 21:38:05.740187706 +0200 @@ -1,0 +2,37 @@ +Wed Mar 30 16:25:44 UTC 2022 - Callum Farmer <gm...@opensuse.org> + +- Chromium 100.0.4896.60 (boo#1197680) + * CVE-2022-1125: Use after free in Portals + * CVE-2022-1127: Use after free in QR Code Generator + * CVE-2022-1128: Inappropriate implementation in Web Share API + * CVE-2022-1129: Inappropriate implementation in Full Screen Mode + * CVE-2022-1130: Insufficient validation of untrusted input in WebOTP + * CVE-2022-1131: Use after free in Cast UI + * CVE-2022-1132: Inappropriate implementation in Virtual Keyboard + * CVE-2022-1133: Use after free in WebRTC + * CVE-2022-1134: Type Confusion in V8 + * CVE-2022-1135: Use after free in Shopping Cart + * CVE-2022-1136: Use after free in Tab Strip + * CVE-2022-1137: Inappropriate implementation in Extensions + * CVE-2022-1138: Inappropriate implementation in Web Cursor + * CVE-2022-1139: Inappropriate implementation in Background Fetch API + * CVE-2022-1141: Use after free in File Manager + * CVE-2022-1142: Heap buffer overflow in WebUI + * CVE-2022-1143: Heap buffer overflow in WebUI + * CVE-2022-1144: Use after free in WebUI + * CVE-2022-1145: Use after free in Extensions + * CVE-2022-1146: Inappropriate implementation in Resource Timing +- Added patches: + * chromium-100-compiler.patch + * chromium-100-GLImplementationParts-constexpr.patch + * chromium-100-InMilliseconds-constexpr.patch + * chromium-100-SCTHashdanceMetadata-move.patch + * chromium-100-macro-typo.patch +- Removed patches: + * chromium-98-compiler.patch + * chromium-86-nearby-explicit.patch + * chromium-glibc-2.34.patch + * chromium-v8-missing-utility-include.patch + * chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch + +------------------------------------------------------------------- Old: ---- chromium-86-nearby-explicit.patch chromium-98-compiler.patch chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch chromium-99.0.4844.84.tar.xz chromium-glibc-2.34.patch chromium-v8-missing-utility-include.patch New: ---- chromium-100-GLImplementationParts-constexpr.patch chromium-100-InMilliseconds-constexpr.patch chromium-100-SCTHashdanceMetadata-move.patch chromium-100-compiler.patch chromium-100-macro-typo.patch chromium-100.0.4896.60.tar.xz esbuild.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.PVPiRY/_old 2022-04-01 21:38:13.092107072 +0200 +++ /var/tmp/diff_new_pack.PVPiRY/_new 2022-04-01 21:38:13.096107028 +0200 @@ -49,13 +49,14 @@ # Chromium built with GCC 11 and LTO enabled crashes (boo#1194055) %bcond_with lto Name: chromium -Version: 99.0.4844.84 +Version: 100.0.4896.60 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause AND LGPL-2.1-or-later URL: https://www.chromium.org/ Source0: https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz -Source1: README.SUSE +Source1: esbuild.tar.gz +Source3: README.SUSE # Toolchain definitions Source30: master_preferences Source104: chromium-symbolic.svg @@ -83,14 +84,12 @@ # gentoo/fedora/arch patchset Patch12: chromium-78-protobuf-RepeatedPtrField-export.patch Patch13: chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch -Patch15: chromium-98-compiler.patch +Patch15: chromium-100-compiler.patch Patch17: chromium-86-ImageMemoryBarrierData-init.patch -Patch18: chromium-86-nearby-explicit.patch Patch21: chromium-gcc11.patch Patch40: chromium-91-java-only-allowed-in-android-builds.patch Patch46: chromium-91-sql-standard-layout-type.patch Patch50: chromium-clang-nomerge.patch -Patch51: chromium-glibc-2.34.patch Patch62: chromium-93-ffmpeg-4.4.patch Patch63: chromium-ffmpeg-lp152.patch Patch65: chromium-94-sql-no-assert.patch @@ -100,10 +99,12 @@ Patch78: chromium-98-EnumTable-crash.patch Patch80: chromium-97-ScrollView-reference.patch Patch84: chromium-third_party-symbolize-missing-include.patch -Patch85: chromium-v8-missing-utility-include.patch Patch86: chromium-97-arm-tflite-cast.patch Patch87: chromium-98-gtk4-build.patch -Patch88: chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch +Patch89: chromium-100-GLImplementationParts-constexpr.patch +Patch90: chromium-100-InMilliseconds-constexpr.patch +Patch91: chromium-100-SCTHashdanceMetadata-move.patch +Patch92: chromium-100-macro-typo.patch Patch101: chromium-86-fix-vaapi-on-intel.patch # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding Patch102: chromium-prop-codecs.patch @@ -117,6 +118,7 @@ BuildRequires: gn >= 0.1807 BuildRequires: gperf BuildRequires: hicolor-icon-theme +BuildRequires: golang(API) # Java used during build BuildRequires: java-openjdk-headless BuildRequires: libcap-devel @@ -206,7 +208,7 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon) >= 1.0.0 BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xscrnsaver) @@ -301,6 +303,14 @@ %endif %build +# esbuild +rm third_party/devtools-frontend/src/third_party/esbuild/esbuild +tar -xf %{SOURCE1} +pushd esbuild +GO_FLAGS="-mod=vendor" make +cp -a esbuild ../third_party/devtools-frontend/src/third_party/esbuild/esbuild +popd + # Fix the path to nodejs binary mkdir -p third_party/node/linux/node-linux-x64/bin ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node @@ -802,6 +812,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies mkdir %{buildroot}%{_sysconfdir}/chromium/policies/managed mkdir %{buildroot}%{_sysconfdir}/chromium/policies/recommended +chmod -w %{buildroot}%{_sysconfdir}/chromium/policies/managed # SVG install -Dm 0644 %{SOURCE104} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/chromium-browser.svg ++++++ chromium-100-GLImplementationParts-constexpr.patch ++++++ >From d32156fd3773330eca99e9cba5e18db57aaa1a53 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <sth...@googlemail.com> Date: Sat, 19 Feb 2022 10:14:24 +0000 Subject: [PATCH] GCC: make GLImplementationParts constructors constexpr Fix build error in GCC, as the constexpr operator== requires its invocations to be also constexpr. --- ui/gl/gl_implementation.cc | 23 ----------------------- ui/gl/gl_implementation.h | 25 +++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc index e4e5456..3e4a47c 100644 --- a/ui/gl/gl_implementation.cc +++ b/ui/gl/gl_implementation.cc @@ -26,29 +26,6 @@ namespace gl { -ANGLEImplementation MakeANGLEImplementation( - const GLImplementation gl_impl, - const ANGLEImplementation angle_impl) { - if (gl_impl == kGLImplementationEGLANGLE) { - if (angle_impl == ANGLEImplementation::kNone) { - return ANGLEImplementation::kDefault; - } else { - return angle_impl; - } - } else { - return ANGLEImplementation::kNone; - } -} - -GLImplementationParts::GLImplementationParts( - const ANGLEImplementation angle_impl) - : gl(kGLImplementationEGLANGLE), - angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} - -GLImplementationParts::GLImplementationParts(const GLImplementation gl_impl) - : gl(gl_impl), - angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {} - bool GLImplementationParts::IsValid() const { if (angle == ANGLEImplementation::kNone) { return (gl != kGLImplementationEGLANGLE); diff --git a/ui/gl/gl_implementation.h b/ui/gl/gl_implementation.h index 376ed58..a2513ea 100644 --- a/ui/gl/gl_implementation.h +++ b/ui/gl/gl_implementation.h @@ -59,8 +59,14 @@ enum class ANGLEImplementation { }; struct GL_EXPORT GLImplementationParts { - explicit GLImplementationParts(const ANGLEImplementation angle_impl); - explicit GLImplementationParts(const GLImplementation gl_impl); + constexpr explicit GLImplementationParts(const ANGLEImplementation angle_impl) + : gl(kGLImplementationEGLANGLE), + angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} + + constexpr explicit GLImplementationParts(const GLImplementation gl_impl) + : gl(gl_impl), + angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) { + } GLImplementation gl = kGLImplementationNone; ANGLEImplementation angle = ANGLEImplementation::kNone; @@ -80,6 +86,21 @@ struct GL_EXPORT GLImplementationParts { bool IsValid() const; bool IsAllowed(const std::vector<GLImplementationParts>& allowed_impls) const; std::string ToString() const; + + private: + constexpr ANGLEImplementation MakeANGLEImplementation( + const GLImplementation gl_impl, + const ANGLEImplementation angle_impl) { + if (gl_impl == kGLImplementationEGLANGLE) { + if (angle_impl == ANGLEImplementation::kNone) { + return ANGLEImplementation::kDefault; + } else { + return angle_impl; + } + } else { + return ANGLEImplementation::kNone; + } + } }; struct GL_EXPORT GLWindowSystemBindingInfo { -- 2.34.1 ++++++ chromium-100-InMilliseconds-constexpr.patch ++++++ >From da6e3f6071fdabeb96c0805626418414b4a4cea8 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <sth...@googlemail.com> Date: Wed, 9 Feb 2022 17:56:21 +0000 Subject: [PATCH] GCC: make base::InMilliseconds(F,RoundedUp) constexpr media::DecodeTimestamp uses it in several constexpr methods. --- base/time/time.cc | 24 ------------------------ base/time/time.h | 30 +++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/base/time/time.cc b/base/time/time.cc index 0de273e..e0acda2 100644 --- a/base/time/time.cc +++ b/base/time/time.cc @@ -74,30 +74,6 @@ int TimeDelta::InDaysFloored() const { : std::numeric_limits<int>::max(); } -double TimeDelta::InMillisecondsF() const { - if (!is_inf()) - return static_cast<double>(delta_) / Time::kMicrosecondsPerMillisecond; - return (delta_ < 0) ? -std::numeric_limits<double>::infinity() - : std::numeric_limits<double>::infinity(); -} - -int64_t TimeDelta::InMilliseconds() const { - if (!is_inf()) - return delta_ / Time::kMicrosecondsPerMillisecond; - return (delta_ < 0) ? std::numeric_limits<int64_t>::min() - : std::numeric_limits<int64_t>::max(); -} - -int64_t TimeDelta::InMillisecondsRoundedUp() const { - if (!is_inf()) { - const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond; - // Convert |result| from truncating to ceiling. - return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1) - : result; - } - return delta_; -} - double TimeDelta::InMicrosecondsF() const { if (!is_inf()) return static_cast<double>(delta_); diff --git a/base/time/time.h b/base/time/time.h index c027aab..fb1d78d 100644 --- a/base/time/time.h +++ b/base/time/time.h @@ -216,9 +216,9 @@ class BASE_EXPORT TimeDelta { constexpr int InMinutes() const; constexpr double InSecondsF() const; constexpr int64_t InSeconds() const; - double InMillisecondsF() const; - int64_t InMilliseconds() const; - int64_t InMillisecondsRoundedUp() const; + constexpr double InMillisecondsF() const; + constexpr int64_t InMilliseconds() const; + constexpr int64_t InMillisecondsRoundedUp() const; constexpr int64_t InMicroseconds() const { return delta_; } double InMicrosecondsF() const; constexpr int64_t InNanoseconds() const; @@ -889,6 +889,30 @@ constexpr int64_t TimeDelta::InSeconds() const { return is_inf() ? delta_ : (delta_ / Time::kMicrosecondsPerSecond); } +constexpr double TimeDelta::InMillisecondsF() const { + if (!is_inf()) + return static_cast<double>(delta_) / Time::kMicrosecondsPerMillisecond; + return (delta_ < 0) ? -std::numeric_limits<double>::infinity() + : std::numeric_limits<double>::infinity(); +} + +constexpr int64_t TimeDelta::InMilliseconds() const { + if (!is_inf()) + return delta_ / Time::kMicrosecondsPerMillisecond; + return (delta_ < 0) ? std::numeric_limits<int64_t>::min() + : std::numeric_limits<int64_t>::max(); +} + +constexpr int64_t TimeDelta::InMillisecondsRoundedUp() const { + if (!is_inf()) { + const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond; + // Convert |result| from truncating to ceiling. + return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1) + : result; + } + return delta_; +} + constexpr int64_t TimeDelta::InNanoseconds() const { return base::ClampMul(delta_, Time::kNanosecondsPerMicrosecond); } -- 2.34.1 ++++++ chromium-100-SCTHashdanceMetadata-move.patch ++++++ >From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz <jdap...@igalia.com> Date: Wed, 23 Feb 2022 12:18:57 +0100 Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue GCC rejects to do Return Value Optimization in SCTHashdanceMetadata::ToValue, because the copy constructor is deleted, and in that scenario RVO is rejected in GCC: ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ???base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const???: ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ???base::Value::Value(const base::Value&)??? 191 | return value; | ^~~~~ In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14, from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5: ../../base/values.h:254:3: note: declared here 254 | Value(const Value&) = delete; | ^~~~~ Bug: 819294 Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166 --- diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc index a057e8e..365527b 100644 --- a/services/network/sct_auditing/sct_auditing_reporter.cc +++ b/services/network/sct_auditing/sct_auditing_reporter.cc @@ -188,7 +188,7 @@ kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id)))); value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd)); value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry)); - return value; + return std::move(value); } // static ++++++ chromium-98-compiler.patch -> chromium-100-compiler.patch ++++++ --- /work/SRC/openSUSE:Factory/chromium/chromium-98-compiler.patch 2022-02-05 23:23:18.439873753 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new.1900/chromium-100-compiler.patch 2022-04-01 21:37:42.592441585 +0200 @@ -1,6 +1,6 @@ From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001 From: Mike Gilbert <flop...@gentoo.org> -Date: Fri, 3 Dec 2021 09:50:31 +0000 +Date: Thu, 3 Feb 2022 16:26:20 +0000 Subject: [PATCH] Disable various compiler configs --- @@ -8,7 +8,7 @@ 1 file changed, 17 insertions(+), 88 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 5365544..e6d9b56 100644 +index 61ceb0d..7392018 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -291,9 +291,7 @@ config("compiler") { @@ -50,10 +50,10 @@ - } - } - - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || -@@ -1231,45 +1204,6 @@ config("compiler_deterministic") { + # Rust compiler setup (for either clang or rustc). + if (enable_rust) { + defines += [ "RUST_ENABLED" ] +@@ -1235,45 +1208,6 @@ config("compiler_deterministic") { } } @@ -99,7 +99,7 @@ # 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. -@@ -1556,7 +1490,7 @@ config("chromium_code") { +@@ -1594,7 +1528,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -108,7 +108,7 @@ if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1565,10 +1499,6 @@ config("chromium_code") { +@@ -1603,10 +1537,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -119,7 +119,7 @@ # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -1577,15 +1507,6 @@ config("chromium_code") { +@@ -1615,15 +1545,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -135,7 +135,7 @@ if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1988,7 +1909,8 @@ config("default_stack_frames") { +@@ -2026,7 +1947,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -145,7 +145,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -2026,7 +1948,8 @@ config("optimize") { +@@ -2064,7 +1986,8 @@ config("optimize") { } # Turn off optimizations. @@ -155,7 +155,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2066,7 +1989,8 @@ config("no_optimize") { +@@ -2104,7 +2027,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. @@ -165,7 +165,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2099,7 +2023,8 @@ config("optimize_max") { +@@ -2137,7 +2061,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -175,7 +175,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2125,7 +2050,8 @@ config("optimize_speed") { +@@ -2163,7 +2088,8 @@ config("optimize_speed") { } } @@ -185,7 +185,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2245,7 +2171,8 @@ config("win_pdbaltpath") { +@@ -2283,7 +2209,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -195,7 +195,7 @@ if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2369,7 +2296,8 @@ config("symbols") { +@@ -2411,7 +2338,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. @@ -205,7 +205,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2438,7 +2366,8 @@ config("minimal_symbols") { +@@ -2480,7 +2408,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. @@ -216,5 +216,5 @@ ldflags = [ "/DEBUG" ] -- -2.32.0 +2.34.1 ++++++ chromium-100-macro-typo.patch ++++++ >From 1183b14db8bd08d731ff3433c436887de00be3aa Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz <jdap...@igalia.com> Date: Fri, 18 Feb 2022 16:28:25 +0000 Subject: [PATCH] Fix typo in non-clang GSL_OWNER macro GCC build fails because GSL_OWNER is not defined (GSL_OWNER_ was the one actually declared). Bug: 819294 Change-Id: I1c3d17cb1c08b9bc0e8a888452da9868c308ddb5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3472080 Reviewed-by: Daniel Cheng <dch...@chromium.org> Commit-Queue: Daniel Cheng <dch...@chromium.org> Cr-Commit-Position: refs/heads/main@{#972974} --- diff --git a/base/compiler_specific.h b/base/compiler_specific.h index eec5810..1ee8074 100644 --- a/base/compiler_specific.h +++ b/base/compiler_specific.h @@ -386,7 +386,7 @@ #define GSL_OWNER [[gsl::Owner]] #define GSL_POINTER [[gsl::Pointer]] #else -#define GSL_OWNER_ +#define GSL_OWNER #define GSL_POINTER #endif ++++++ chromium-99.0.4844.84.tar.xz -> chromium-100.0.4896.60.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-99.0.4844.84.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.1900/chromium-100.0.4896.60.tar.xz differ: char 27, line 1 ++++++ system-libdrm.patch ++++++ --- /var/tmp/diff_new_pack.PVPiRY/_old 2022-04-01 21:38:13.352104220 +0200 +++ /var/tmp/diff_new_pack.PVPiRY/_new 2022-04-01 21:38:13.356104176 +0200 @@ -14,19 +14,6 @@ } source_set("libdrm") { -Index: chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline.cc -=================================================================== ---- chromium-98.0.4758.80.orig/media/gpu/chromeos/video_decoder_pipeline.cc -+++ chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -28,7 +28,7 @@ - - #if BUILDFLAG(USE_VAAPI) - #include "media/gpu/vaapi/vaapi_video_decoder.h" --#include "third_party/libdrm/src/include/drm/drm_fourcc.h" -+#include <drm_fourcc.h> - #elif BUILDFLAG(USE_V4L2_CODEC) - #include "media/gpu/v4l2/v4l2_video_decoder.h" - #else Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h =================================================================== --- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/crtc_controller.h
