automatic version update by autodist [release 98.0.4758.102-1mamba;Sun Feb 27 2022]
This commit is contained in:
parent
e740a21485
commit
e03fd156cf
62
chromium-98.0.4758.102-libdrm-2.4.110.patch
Normal file
62
chromium-98.0.4758.102-libdrm-2.4.110.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001
|
||||
From: "Steinar H. Gunderson" <sesse@chromium.org>
|
||||
Date: Tue, 25 Jan 2022 19:14:53 +0000
|
||||
Subject: [PATCH] Fix build break with system libdrm.
|
||||
|
||||
This patch is submitted on behalf of Andres Salomon
|
||||
<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS
|
||||
per policy, as he has signed the CLA.
|
||||
|
||||
Original patch:
|
||||
https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302
|
||||
|
||||
Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704
|
||||
Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
|
||||
Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
|
||||
Auto-Submit: Steinar H Gunderson <sesse@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#963119}
|
||||
---
|
||||
AUTHORS | 1 +
|
||||
media/gpu/chromeos/BUILD.gn | 1 +
|
||||
media/gpu/chromeos/video_decoder_pipeline.cc | 2 +-
|
||||
3 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/AUTHORS b/AUTHORS
|
||||
index 0eba3de5065..50edd3f6b38 100644
|
||||
--- a/AUTHORS
|
||||
+++ b/AUTHORS
|
||||
@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com>
|
||||
Andrei Borza <andrei.borza@gmail.com>
|
||||
Andrei Parvu <andrei.prv@gmail.com>
|
||||
Andrei Parvu <parvu@adobe.com>
|
||||
+Andres Salomon <dilinger@queued.net>
|
||||
Andreu Botella <andreu@andreubotella.com>
|
||||
Andrew Boyarshin <andrew.boyarshin@gmail.com>
|
||||
Andrew Brampton <me@bramp.net>
|
||||
diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
|
||||
index 7cb4c3ea39a..6fe21c15ecc 100644
|
||||
--- a/media/gpu/chromeos/BUILD.gn
|
||||
+++ b/media/gpu/chromeos/BUILD.gn
|
||||
@@ -25,6 +25,7 @@ source_set("chromeos") {
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
+ "//build/config/linux/libdrm",
|
||||
"//media",
|
||||
"//media/gpu:buildflags",
|
||||
"//media/gpu:command_buffer_helper",
|
||||
diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
|
||||
index d2f154ea0d8..416b9434a8d 100644
|
||||
--- a/media/gpu/chromeos/video_decoder_pipeline.cc
|
||||
+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
|
||||
@@ -28,8 +28,8 @@
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
#if BUILDFLAG(USE_VAAPI)
|
||||
+#include <drm_fourcc.h>
|
||||
#include "media/gpu/vaapi/vaapi_video_decoder.h"
|
||||
-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
|
||||
#elif BUILDFLAG(USE_V4L2_CODEC)
|
||||
#include "media/gpu/v4l2/v4l2_video_decoder.h"
|
||||
#else
|
@ -2,7 +2,7 @@
|
||||
%define gcc_patchset 4
|
||||
Name: chromium
|
||||
Epoch: 3
|
||||
Version: 97.0.4692.99
|
||||
Version: 98.0.4758.102
|
||||
Release: 1mamba
|
||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||
Group: Graphical Desktop/Applications/Internet
|
||||
@ -45,6 +45,7 @@ Patch26: chromium-96.0.4664.45-gcc-2.34.patch
|
||||
Patch27: chromium-97.0.4692.71-unbundle-ffmpeg-av_stream_get_first_dts.patch
|
||||
Patch28: chromium-97.0.4692.71-fix-tag-dragging-in-KWin.patch
|
||||
Patch29: chromium-97.0.4692.71-fix-tag-dragging-in-Mutter.patch
|
||||
Patch30: chromium-98.0.4758.102-libdrm-2.4.110.patch
|
||||
License: BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -152,17 +153,18 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||
%endif
|
||||
%patch6 -p1 -b .clang-11-nomerge
|
||||
%patch7 -p1 -b .use-oauth2-client-switches-as-default
|
||||
%patch19 -p1 -b .ffmpeg-4.4
|
||||
%patch20 -Rp1 -b .ffmpeg-roll
|
||||
#%patch19 -p1 -b .ffmpeg-4.4
|
||||
#%patch20 -Rp1 -b .ffmpeg-roll
|
||||
%patch21 -p0 -b .unexpire-accelerated-video-decode-flag
|
||||
#%patch17 -Rp1 -b .replace-blacklist-with-ignorelist
|
||||
%patch22 -Rp1 -b .add-a-TODO-about-a-missing-pnacl-flag
|
||||
%patch18 -Rp1 -b .use-ffile-compilation-dir
|
||||
%patch12 -p1 -b .sql-make-VirtualCursor-standard-layout-type
|
||||
%patch26 -p1 -b .gcc-2.34
|
||||
%patch27 -p1 -b .unbundle-ffmpeg-av_stream_get_first_dts
|
||||
#%patch27 -p1 -b .unbundle-ffmpeg-av_stream_get_first_dts
|
||||
#%patch28 -p1 -b .fix-tag-dragging-in-KWin
|
||||
#%patch29 -p1 -b .fix-tag-dragging-in-Mutter
|
||||
%patch30 -p1 -b .libdrm-2.4.110
|
||||
|
||||
# Fixes for building with libstdc++ instead of libc++
|
||||
#patch -Np1 -i patches/chromium-96-CommandLine-include.patch
|
||||
@ -432,6 +434,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
||||
%{_mandir}/man1/chromium.1*
|
||||
|
||||
%changelog
|
||||
* Sun Feb 27 2022 Automatic Build System <autodist@mambasoft.it> 98.0.4758.102-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Jan 22 2022 Automatic Build System <autodist@mambasoft.it> 97.0.4692.99-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user