From ee64066a7c78c6f095071102d5172cabb750fd88 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 10 Jun 2019 14:51:10 -0400 Subject: [PATCH] fix i686 fpermissive --- ...-73.0.3683.75-vaapi-i686-fpermissive.patch | 23 ------------------- ...-75.0.3770.80-vaapi-i686-fpermissive.patch | 23 +++++++++++++++++++ chromium.spec | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 chromium-73.0.3683.75-vaapi-i686-fpermissive.patch create mode 100644 chromium-75.0.3770.80-vaapi-i686-fpermissive.patch diff --git a/chromium-73.0.3683.75-vaapi-i686-fpermissive.patch b/chromium-73.0.3683.75-vaapi-i686-fpermissive.patch deleted file mode 100644 index aeee8180..00000000 --- a/chromium-73.0.3683.75-vaapi-i686-fpermissive.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn.i686permissive chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn ---- chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn.i686permissive 2019-03-15 10:10:18.689287815 +0100 -+++ chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn 2019-03-15 10:11:56.943294101 +0100 -@@ -11,6 +11,10 @@ import("//ui/ozone/ozone.gni") - - assert(use_vaapi) - -+config("vaapi_permissive") { -+ cflags = [ "-fpermissive" ] -+} -+ - generate_stubs("libva_stubs") { - extra_header = "va_stub_header.fragment" - sigs = [ "va.sigs" ] -@@ -79,6 +83,8 @@ source_set("vaapi") { - configs += [ "//build/config/linux/libva" ] - } - -+ configs += [ ":vaapi_permissive" ] -+ - if (use_x11) { - configs += [ "//build/config/linux:x11" ] - deps += [ "//ui/gfx/x" ] diff --git a/chromium-75.0.3770.80-vaapi-i686-fpermissive.patch b/chromium-75.0.3770.80-vaapi-i686-fpermissive.patch new file mode 100644 index 00000000..c44473db --- /dev/null +++ b/chromium-75.0.3770.80-vaapi-i686-fpermissive.patch @@ -0,0 +1,23 @@ +diff -up chromium-75.0.3770.80/media/gpu/vaapi/BUILD.gn.i686permissive chromium-75.0.3770.80/media/gpu/vaapi/BUILD.gn +--- chromium-75.0.3770.80/media/gpu/vaapi/BUILD.gn.i686permissive 2019-06-10 14:47:37.315515026 -0400 ++++ chromium-75.0.3770.80/media/gpu/vaapi/BUILD.gn 2019-06-10 14:48:25.250604888 -0400 +@@ -11,6 +11,10 @@ import("//ui/ozone/ozone.gni") + + assert(use_vaapi) + ++config("vaapi_permissive") { ++ cflags = [ "-fpermissive" ] ++} ++ + generate_stubs("libva_stubs") { + extra_header = "va_stub_header.fragment" + sigs = [ "va.sigs" ] +@@ -89,6 +93,8 @@ source_set("vaapi") { + deps += [ "//media/gpu/linux" ] + } + ++ configs += [ ":vaapi_permissive" ] ++ + if (use_x11) { + configs += [ "//build/config/linux:x11" ] + deps += [ "//ui/gfx/x" ] diff --git a/chromium.spec b/chromium.spec index 7dd7d6d4..cc6fbd74 100644 --- a/chromium.spec +++ b/chromium.spec @@ -306,7 +306,7 @@ Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch # Enable VAAPI support on Linux # NOTE: This patch will never land upstream Patch121: enable-vaapi.patch -Patch122: chromium-73.0.3683.75-vaapi-i686-fpermissive.patch +Patch122: chromium-75.0.3770.80-vaapi-i686-fpermissive.patch # Fix compatibility with VA-API library (libva) version 1 Patch124: chromium-75.0.3770.80-vaapi-libva1-compatibility.patch # drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)