From 9abc2d11fbedaa9806cb16744e7765696ad6b29d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 31 Aug 2020 09:42:21 -0400 Subject: [PATCH] work around ancient libdrm in el7 --- chromium-85.0.4183.83-el7-old-libdrm.patch | 15 +++++++++++++++ chromium.spec | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 chromium-85.0.4183.83-el7-old-libdrm.patch diff --git a/chromium-85.0.4183.83-el7-old-libdrm.patch b/chromium-85.0.4183.83-el7-old-libdrm.patch new file mode 100644 index 00000000..d7d7f6e6 --- /dev/null +++ b/chromium-85.0.4183.83-el7-old-libdrm.patch @@ -0,0 +1,15 @@ +diff -up chromium-85.0.4183.83/ui/gfx/linux/drm_util_linux.cc.el7-old-libdrm chromium-85.0.4183.83/ui/gfx/linux/drm_util_linux.cc +--- chromium-85.0.4183.83/ui/gfx/linux/drm_util_linux.cc.el7-old-libdrm 2020-08-31 09:38:46.043993882 -0400 ++++ chromium-85.0.4183.83/ui/gfx/linux/drm_util_linux.cc 2020-08-31 09:39:21.599906318 -0400 +@@ -6,6 +6,11 @@ + + #include + ++// the libdrm in EL-7 is too old to have this define ++#ifndef DRM_FORMAT_P010 ++#define DRM_FORMAT_P010 DRM_FORMAT_INVALID ++#endif ++ + #include "base/notreached.h" + + namespace ui { diff --git a/chromium.spec b/chromium.spec index 127428f4..41268c23 100644 --- a/chromium.spec +++ b/chromium.spec @@ -297,6 +297,9 @@ Patch106: chromium-77-clang.patch # error: incompatible types when initializing type 'int64_t' {aka 'long int'} using type 'int64x1_t' # note: expected 'int8x16_t' but argument is of type 'uint8x16_t' Patch107: chromium-84.0.4147.89-el8-arm-incompatible-ints.patch +# libdrm on EL7 is rather old and chromium assumes newer +# This gets us by for now +Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch # Enable VAAPI support on Linux # NOTE: This patch will never land upstream @@ -910,6 +913,7 @@ udev. # %%patch102 -p1 -b .el7-noexcept %patch103 -p1 -b .epel7-kcmp %patch104 -p1 -b .el7cups +%patch108 -p1 -b .el7-old-libdrm %endif %if 0%{?rhel} == 7 || 0%{?rhel} == 8