work around ancient libdrm in el7

epel8
Tom Callaway 4 years ago
parent 7eee9fa900
commit 9abc2d11fb

@ -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 <drm_fourcc.h>
+// 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 {

@ -297,6 +297,9 @@ Patch106: chromium-77-clang.patch
# error: incompatible types when initializing type 'int64_t' {aka 'long int'} using type 'int64x1_t' # 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' # note: expected 'int8x16_t' but argument is of type 'uint8x16_t'
Patch107: chromium-84.0.4147.89-el8-arm-incompatible-ints.patch 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 # Enable VAAPI support on Linux
# NOTE: This patch will never land upstream # NOTE: This patch will never land upstream
@ -910,6 +913,7 @@ udev.
# %%patch102 -p1 -b .el7-noexcept # %%patch102 -p1 -b .el7-noexcept
%patch103 -p1 -b .epel7-kcmp %patch103 -p1 -b .epel7-kcmp
%patch104 -p1 -b .el7cups %patch104 -p1 -b .el7cups
%patch108 -p1 -b .el7-old-libdrm
%endif %endif
%if 0%{?rhel} == 7 || 0%{?rhel} == 8 %if 0%{?rhel} == 7 || 0%{?rhel} == 8

Loading…
Cancel
Save