rpmfusion-commits
September 2019
rpmfusion-commits@lists.rpmfusion.org
- 20 participants
- 726 discussions
[chromium-libs-media-freeworld: 166/259] okay, lets try this
by Nicolas Chauvet
commit e9829bbce48a38ec1c97cdbcd180f4edf546b90f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Dec 20 09:53:41 2018 -0500
okay, lets try this
chromium-71.0.3578.98-el7-fix-noexcept.patch | 12 ++++++++++++
chromium.spec | 5 +++++
2 files changed, 17 insertions(+)
---
diff --git a/chromium-71.0.3578.98-el7-fix-noexcept.patch b/chromium-71.0.3578.98-el7-fix-noexcept.patch
new file mode 100644
index 0000000..ba1268b
--- /dev/null
+++ b/chromium-71.0.3578.98-el7-fix-noexcept.patch
@@ -0,0 +1,12 @@
+diff -up chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept chromium-71.0.3578.98/gpu/config/gpu_info.cc
+--- chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept 2018-12-20 09:50:03.320449807 -0500
++++ chromium-71.0.3578.98/gpu/config/gpu_info.cc 2018-12-20 09:50:25.768849091 -0500
+@@ -116,7 +116,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice::
+ const GPUInfo::GPUDevice& other) = default;
+
+ GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
+- GPUInfo::GPUDevice&& other) noexcept = default;
++ GPUInfo::GPUDevice&& other) = default;
+
+ GPUInfo::GPUInfo()
+ : optimus(false),
diff --git a/chromium.spec b/chromium.spec
index cb71e2c..a050d5e 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -309,6 +309,8 @@ Patch123: relax-libva-version.patch
Patch124: chromium-71.0.3578.98-vaapi-libva1-compatibility.patch
# From gentoo
Patch125: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files...
+# For el7: error: function 'gpu::GPUInfo::GPUDevice& gpu::GPUInfo::GPUDevice::operator=(gpu::GPUInfo::GPUDevice&&)' defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ''
+Patch126: chromium-71.0.3578.98-el7-fix-noexcept.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -864,6 +866,9 @@ udev.
%patch123 -p1 -b .relaxva
%patch124 -p1 -b .va1compat
%patch125 -p1 -b .gcc-overloaded
+%if 0%{?rhel} == 7
+%patch126 -p1 -b .fix-noexcept
+%endif
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 165/259] Use a variable for the DTS version
by Nicolas Chauvet
commit e708c75686b8e4601eedb1826d4d4d2edde4f307
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Thu Dec 20 07:25:26 2018 +0100
Use a variable for the DTS version
chromium.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 9554ff5..cb71e2c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -97,6 +97,8 @@ BuildRequires: libicu-devel >= 5.4
%global gtk3 1
%if 0%{?rhel} == 7
+%global dts_version 8
+
%global bundleopus 1
%global bundlelibusbx 1
%global bundleharfbuzz 1
@@ -541,7 +543,7 @@ BuildRequires: google-noto-sans-khmer-fonts
BuildRequires: ninja-build
%if 0%{?rhel} == 7
-BuildRequires: devtoolset-8-toolchain, devtoolset-8-libatomic-devel
+BuildRequires: devtoolset-%{dts_version}-toolchain, devtoolset-%{dts_version}-libatomic-devel
%endif
# There is a hardcoded check for nss 3.26 in the chromium code (crypto/nss_util.cc)
@@ -1352,7 +1354,7 @@ sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tool
sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|g' ../depot_tools/ninja
%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-8/enable
+. /opt/rh/devtoolset-%{dts_version}/enable
%endif
# Check that there is no system 'google' module, shadowing bundled ones:
@@ -1387,7 +1389,7 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
%build
%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-8/enable
+. /opt/rh/devtoolset-%{dts_version}/enable
%endif
# Now do the full browser
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 164/259] more hardcoded devtoolset versions
by Nicolas Chauvet
commit 8e01649bacefd87c9a046d8a6915ca25953bda25
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Dec 19 15:59:47 2018 -0500
more hardcoded devtoolset versions
chromium.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index fbedfad..9554ff5 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1352,7 +1352,7 @@ sed -i '/aarch64)/ a \ exec "/usr/bin/ninja-build" "$@";;\' ../depot_tool
sed -i 's|exec "${THIS_DIR}/ninja-linux${LONG_BIT}"|exec "/usr/bin/ninja-build"|g' ../depot_tools/ninja
%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+. /opt/rh/devtoolset-8/enable
%endif
# Check that there is no system 'google' module, shadowing bundled ones:
@@ -1387,7 +1387,7 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE
%build
%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+. /opt/rh/devtoolset-8/enable
%endif
# Now do the full browser
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 163/259] need to use devtoolset-8-*. I love hardcoded versions in package names.
by Nicolas Chauvet
commit 39f814854d291cb71ad9e98652ab7ad1f70f9c40
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Dec 19 15:43:49 2018 -0500
need to use devtoolset-8-*. I love hardcoded versions in package names.
chromium.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index d5a1ed9..fbedfad 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -150,7 +150,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3578.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -541,7 +541,7 @@ BuildRequires: google-noto-sans-khmer-fonts
BuildRequires: ninja-build
%if 0%{?rhel} == 7
-BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
+BuildRequires: devtoolset-8-toolchain, devtoolset-8-libatomic-devel
%endif
# There is a hardcoded check for nss 3.26 in the chromium code (crypto/nss_util.cc)
@@ -1831,6 +1831,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Wed Dec 19 2018 Tom Callaway <spot(a)fedoraproject.org> - 71.0.3578.98-2
+- need to use devtoolset-8-*. I love hardcoded versions in package names.
+
* Fri Dec 14 2018 Tom Callaway <spot(a)fedoraproject.org> - 71.0.3578.98-1
- update to 71.0.3578.98
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 162/259] 71.0.3578.98
by Nicolas Chauvet
commit b2e427f04b59f9c1f1812dea1b85f17d9efcc9f5
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Dec 18 15:12:33 2018 -0500
71.0.3578.98
.gitignore | 1 +
chromium-71-gcc-0.patch | 57 ++++++++++++++++
chromium-71.0.3578.98-norar.patch | 79 ++++++++++++++++++++++
chromium-71.0.3578.98-py2-bootstrap.patch | 33 +++++++++
chromium-71.0.3578.98-remove-sysroot-options.patch | 23 +++++++
chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 21 ++++++
...m-71.0.3578.98-vaapi-libva1-compatibility.patch | 14 ++++
chromium-71.0.3578.98-widevine-r3.patch | 11 +++
chromium.spec | 56 +++++++++------
sources | 3 +-
10 files changed, 274 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba0ef80..4a49cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
/chromium-69.0.3497.100-clean.tar.xz
/chromium-70.0.3538.77-clean.tar.xz
/chromium-70.0.3538.110-clean.tar.xz
+/chromium-71.0.3578.98-clean.tar.xz
diff --git a/chromium-71-gcc-0.patch b/chromium-71-gcc-0.patch
new file mode 100644
index 0000000..711b827
--- /dev/null
+++ b/chromium-71-gcc-0.patch
@@ -0,0 +1,57 @@
+From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Date: Mon, 15 Oct 2018 20:26:10 +0000
+Subject: [PATCH] google_util: Explicitly use std::initializer_list with
+ base::NoDestructor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components").
+Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
+base::NoDestructor<T<U>> and passing an initializer list of Us does not
+work if this is not done explicitly, as GCC incorrectly fails to determine
+which constructor overload to use:
+
+ ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’:
+ ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous
+ {GOOGLE_TLD_LIST});
+
+See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905
+
+Bug: 819294
+Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c
+Reviewed-on: https://chromium-review.googlesource.com/c/1275854
+Reviewed-by: Peter Kasting <pkasting(a)chromium.org>
+Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.costa(a)intel.com>
+Cr-Commit-Position: refs/heads/master@{#599733}
+---
+ components/google/core/common/google_util.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
+index a44c84393820..7733848a0443 100644
+--- a/components/google/core/common/google_util.cc
++++ b/components/google/core/common/google_util.cc
+@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+ StripTrailingDot(&tld);
+
+ static base::NoDestructor<std::set<std::string>> google_tlds(
+- {GOOGLE_TLD_LIST});
++ std::initializer_list<std::string>({GOOGLE_TLD_LIST}));
+ return base::ContainsKey(*google_tlds, tld.as_string());
+ }
+
+@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+ StripTrailingDot(&host);
+
+ static base::NoDestructor<std::set<std::string>> google_subdomains(
+- {"ipv4.google.com", "ipv6.google.com"});
++ std::initializer_list<std::string>(
++ {"ipv4.google.com", "ipv6.google.com"}));
+
+ return base::ContainsKey(*google_subdomains, host.as_string());
+ }
+--
+2.19.1
+
diff --git a/chromium-71.0.3578.98-norar.patch b/chromium-71.0.3578.98-norar.patch
new file mode 100644
index 0000000..1259088
--- /dev/null
+++ b/chromium-71.0.3578.98-norar.patch
@@ -0,0 +1,79 @@
+diff -up chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn
+--- chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn.nounrar 2018-12-12 16:56:04.000000000 -0500
++++ chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn 2018-12-14 11:44:52.172805635 -0500
+@@ -56,40 +56,6 @@ if (safe_browsing_mode == 1) {
+ ]
+ }
+
+- source_set("rar_analyzer") {
+- sources = [
+- "rar_analyzer.cc",
+- "rar_analyzer.h",
+- ]
+-
+- deps = [
+- ":archive_analyzer_results",
+- ":download_protection_util",
+- ":file_type_policies",
+- "//base",
+- "//base:i18n",
+- "//third_party/unrar:unrar",
+- ]
+-
+- defines = [
+- "_FILE_OFFSET_BITS=64",
+- "LARGEFILE_SOURCE",
+- "RAR_SMP",
+- "SILENT",
+-
+- # The following is set to disable certain macro definitions in the unrar
+- # source code.
+- "CHROMIUM_UNRAR",
+-
+- # Disables exceptions in unrar, replaces them with process termination.
+- "UNRAR_NO_EXCEPTIONS",
+- ]
+-
+- public_deps = [
+- "//components/safe_browsing:csd_proto",
+- ]
+- }
+-
+ source_set("disk_image_type_sniffer_mac") {
+ sources = [
+ "disk_image_type_sniffer_mac.cc",
+@@ -136,7 +102,6 @@ source_set("safe_browsing") {
+ deps += [
+ ":archive_analyzer_results",
+ ":download_protection_util",
+- ":rar_analyzer",
+ "//components/safe_browsing:features",
+ ]
+
+diff -up chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS.nounrar chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS
+--- chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS.nounrar 2018-12-12 16:56:04.000000000 -0500
++++ chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS 2018-12-14 11:23:58.628142952 -0500
+@@ -1,6 +1,5 @@
+ include_rules = [
+ "+components/safe_browsing",
+ "+third_party/protobuf",
+- "+third_party/unrar",
+ "+third_party/zlib",
+ ]
+diff -up chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2018-12-12 16:56:04.000000000 -0500
++++ chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc 2018-12-14 11:23:58.628142952 -0500
+@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
+
+ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+ AnalyzeRarFileCallback callback) {
++#if 0
+ DCHECK(rar_file.IsValid());
+
+ safe_browsing::ArchiveAnalyzerResults results;
+ safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results);
+ std::move(callback).Run(results);
++#else
++ NOTREACHED();
++#endif
+ }
diff --git a/chromium-71.0.3578.98-py2-bootstrap.patch b/chromium-71.0.3578.98-py2-bootstrap.patch
new file mode 100644
index 0000000..d575dff
--- /dev/null
+++ b/chromium-71.0.3578.98-py2-bootstrap.patch
@@ -0,0 +1,33 @@
+diff -up chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+--- chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-12-12 17:02:58.000000000 -0500
++++ chromium-71.0.3578.98/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-12-14 11:48:22.150229631 -0500
+@@ -58,7 +58,7 @@ def _MinifyJS(input_js):
+
+ with tempfile.NamedTemporaryFile() as _:
+ args = [
+- 'python',
++ 'python2',
+ rjsmin_path
+ ]
+ p = subprocess.Popen(args,
+@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
+ os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
+
+ with tempfile.NamedTemporaryFile() as _:
+- rcssmin_args = ['python', rcssmin_path]
++ rcssmin_args = ['python2', rcssmin_path]
+ p = subprocess.Popen(rcssmin_args,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+diff -up chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.py2 chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py
+--- chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.py2 2018-12-14 11:48:22.155229522 -0500
++++ chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py 2018-12-14 11:49:31.043728244 -0500
+@@ -93,7 +93,7 @@ def main(argv):
+ if not options.debug:
+ gn_gen_args += ' is_debug=false'
+ subprocess.check_call([
+- gn_path, 'gen', out_dir,
++ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2',
+ '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
+ ])
+
diff --git a/chromium-71.0.3578.98-remove-sysroot-options.patch b/chromium-71.0.3578.98-remove-sysroot-options.patch
new file mode 100644
index 0000000..a9af73b
--- /dev/null
+++ b/chromium-71.0.3578.98-remove-sysroot-options.patch
@@ -0,0 +1,23 @@
+diff -up chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py
+--- chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-12-14 12:52:04.144860836 -0500
++++ chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py 2018-12-14 12:57:54.791539599 -0500
+@@ -46,10 +46,6 @@ def main(argv):
+ '--build-path',
+ help='The directory in which to build gn, '
+ 'relative to the src directory. (eg. out/Release)')
+- parser.add_option(
+- '--with-sysroot',
+- action='store_true',
+- help='Download and build with the Debian sysroot.')
+ parser.add_option('-v', '--verbose', help='ignored')
+ parser.add_option(
+ '--skip-generate-buildfiles',
+@@ -76,8 +72,6 @@ def main(argv):
+ '--no-last-commit-position',
+ '--out-path=' + gn_build_dir,
+ ]
+- if not options.with_sysroot:
+- cmd.append('--no-sysroot')
+ if options.debug:
+ cmd.append('--debug')
+ subprocess.check_call(cmd)
diff --git a/chromium-71.0.3578.98-skia-aarch64-buildfix.patch b/chromium-71.0.3578.98-skia-aarch64-buildfix.patch
new file mode 100644
index 0000000..5da1674
--- /dev/null
+++ b/chromium-71.0.3578.98-skia-aarch64-buildfix.patch
@@ -0,0 +1,21 @@
+diff -up chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-12-14 11:17:43.249121756 -0500
++++ chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-14 11:20:07.770030234 -0500
+@@ -658,7 +658,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -678,7 +678,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
diff --git a/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch b/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch
new file mode 100644
index 0000000..5b51e3d
--- /dev/null
+++ b/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch
@@ -0,0 +1,14 @@
+diff -up chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc.va1compat chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc
+--- chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc.va1compat 2018-12-17 15:07:48.158717055 -0500
++++ chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc 2018-12-17 15:09:49.780316983 -0500
+@@ -38,6 +38,10 @@ enum VAJDADecoderFailure {
+ VAJDA_DECODER_FAILURES_MAX,
+ };
+
++#ifndef VA_FOURCC_I420
++#define VA_FOURCC_I420 VA_FOURCC('I', '4', '2', '0')
++#endif
++
+ static void ReportToUMA(VAJDADecoderFailure failure) {
+ UMA_HISTOGRAM_ENUMERATION("Media.VAJDA.DecoderFailure", failure,
+ VAJDA_DECODER_FAILURES_MAX + 1);
diff --git a/chromium-71.0.3578.98-widevine-r3.patch b/chromium-71.0.3578.98-widevine-r3.patch
new file mode 100644
index 0000000..a8deaf0
--- /dev/null
+++ b/chromium-71.0.3578.98-widevine-r3.patch
@@ -0,0 +1,11 @@
+diff -up chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn.wvhack chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn
+diff -up chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack 2018-12-14 11:58:37.918972853 -0500
++++ chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-14 11:58:57.327554078 -0500
+@@ -11,5 +11,6 @@
+ // If the Widevine CDM is available define the following:
+ // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ // as a string, e.g., "1.0.123.456").
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+
+ #endif // WIDEVINE_CDM_VERSION_H_
diff --git a/chromium.spec b/chromium.spec
index 0e7c20a..d5a1ed9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -41,9 +41,9 @@
%global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.*
%if 0%{?rhel} == 7
-%global privlibs libEGL|libGLESv2|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libandroid_mojo_bindings_shared|libanimation|libapdu|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libbindings_base|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_core_mojo_bindings_shared|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcdm_manager|libchrome_features|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_com
mon_mojo_bindings_shared|libcontent_service_cpp|libcontent_service_mojom|libcontent_service_mojom_shared|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevice_vr|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libembedder_switches|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_shared_typemap_traits|libgcm|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2|libg
les2_implementation|libgles2_utils|libgpu|libgpu_ipc_service|libgtkui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|liblive_tab_count_metrics|libmanager|libmedia|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia_session_cpp|libmedia_session_public_mojom|libmedia_session_public_mojom_shared|libmedia_webrtc|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient.so.9|libmirroring_service|libmojo_base_lib|libmojo_base_mojom|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_shared_typemap_traits|libmojo_core_embedder|libmojo_core_embedder_internal|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojo_mojom_bindings|libmojo_mojom_bindings_shared|libmojo_public_system|libmojo_public_system_cpp|libmojom_core_shared|libmojom_platform_shared|libnative_theme|libnet|libnet_
with_v8|libnetwork_cpp|libnetwork_cpp_base|libnetwork_service|libnetwork_session_configurator|libonc|libos_crypt|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp|libresource_coordinator_cpp_base|libresource_coordinator_public_mojom|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libsandbox|libsandbox_services|libscheduling_metrics|libseccomp_bpf|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client
|libsurface|libtracing|libtracing_cpp|libtracing_mojom|libtracing_mojom_shared|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libusb_shared|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format_utils|libvr_common|libvr_ui|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libweb_dialogs|libwebdata_common|libwebgpu|libwebview|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window|libzygote|libfontconfig
+%global privlibs libaccessibility|libandroid_mojo_bindings_shared|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcc|libcdm_manager|libchrome_features|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent_service_cpp|libcontent_service_mojom_shared|libcontent_service_mojom|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_even
t_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libextras|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_mojom|libgamepad_shared_typemap_traits|libgcm|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgtkui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mo
jom_shared|libipc_mojom|libipc|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|liblive_tab_count_metrics|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia_session_cpp|libmedia_session_public_mojom_shared|libmedia_session_public_mojom|libmedia|libmedia_webrtc|libmemory_instrumentation|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirroring_service|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_core_embedder_internal|libmojo_core_embedder|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libos_crypt|libperfetto|libplat
form|libplatform_window_handler_libs|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp_features|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libscheduling_metrics|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_m
ojom|libtracing|libui_base_ime_linux|libui_base_ime|libui_base_ime_types|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libusb_shared|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format_utils|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libvr_common|libvr_ui|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libwebdata_common|libweb_dialogs|libwebgpu|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libzygote|libfontconfig
%else
-%global privlibs libEGL|libGLESv2|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libaccessibility|libandroid_mojo_bindings_shared|libanimation|libapdu|libaura|libaura_extra|libbase|libbase_i18n|libbindings|libbindings_base|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core|libblink_core_mojo_bindings_shared|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcdm_manager|libchrome_features|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_com
mon_mojo_bindings_shared|libcontent_service_cpp|libcontent_service_mojom|libcontent_service_mojom_shared|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevice_vr|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevices|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libembedder|libembedder_switches|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_shared_typemap_traits|libgcm|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgl_in_process_context|libgl_init|libgl_wrapper|libgles2|libg
les2_implementation|libgles2_utils|libgpu|libgpu_ipc_service|libgtkui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|liblive_tab_count_metrics|libmanager|libmedia|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia_session_cpp|libmedia_session_public_mojom|libmedia_session_public_mojom_shared|libmedia_webrtc|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirclient.so.9|libmirroring_service|libmojo_base_lib|libmojo_base_mojom|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_shared_typemap_traits|libmojo_core_embedder|libmojo_core_embedder_internal|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojo_mojom_bindings|libmojo_mojom_bindings_shared|libmojo_public_system|libmojo_public_system_cpp|libmojom_core_shared|libmojom_platform_shared|libnative_theme|libnet|libnet_
with_v8|libnetwork_cpp|libnetwork_cpp_base|libnetwork_service|libnetwork_session_configurator|libonc|libos_crypt|libperfetto|libplatform|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp|libresource_coordinator_cpp_base|libresource_coordinator_public_mojom|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libsandbox|libsandbox_services|libscheduling_metrics|libseccomp_bpf|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client
|libsurface|libtracing|libtracing_cpp|libtracing_mojom|libtracing_mojom_shared|libui_base|libui_base_ime|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl|liburl_ipc|liburl_matcher|libusb_shared|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format_utils|libvr_common|libvr_ui|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libweb_dialogs|libwebdata_common|libwebgpu|libwebview|libwm|libwm_public|libwtf|libx11_events_platform|libx11_window|libzygote
+%global privlibs libaccessibility|libandroid_mojo_bindings_shared|libanimation|libapdu|libaura_extra|libaura|libbase_i18n|libbase|libbindings_base|libbindings|libblink_android_mojo_bindings_shared|libblink_common|libblink_controller|libblink_core_mojo_bindings_shared|libblink_core|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_modules|libblink_mojo_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcatalog_lib|libcbor|libcc_animation|libcc_base|libcc_debug|libcc_mojo_embedder|libcc_paint|libcc|libcdm_manager|libchrome_features|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcommon|libcompositor|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent_service_cpp|libcontent_service_mojom_shared|libcontent_service_mojom|libcontent|libcrash_key|libcrcrypto|libdbus|libdevice_base|libdevice_even
t_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_mojo_bindings|libdevice_vr|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libembedder|libembedder_switches|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents|libevents_x|libextras|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_mojom|libgamepad_shared_typemap_traits|libgcm|libgeometry_skia|libgeometry|libgesture_detection|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_switches|libgfx_x11|libgin|libgles2_implementation|libgles2|libgles2_utils|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu_ipc_service|libgpu|libgtkui|libheadless|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc_mo
jom_shared|libipc_mojom|libipc|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libleveldatabase|liblive_tab_count_metrics|libmanager|libmedia_blink|libmedia_devices_mojo_bindings_shared|libmedia_gpu|libmedia_mojo_services|libmedia_session_cpp|libmedia_session_public_mojom_shared|libmedia_session_public_mojom|libmedia|libmedia_webrtc|libmemory_instrumentation|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirroring_service|libmojo_base_lib|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_mojom|libmojo_base_shared_typemap_traits|libmojo_core_embedder_internal|libmojo_core_embedder|libmojo_core_ports|libmojo_cpp_platform|libmojo_ime_lib|libmojom_core_shared|libmojo_mojom_bindings_shared|libmojo_mojom_bindings|libmojom_platform_shared|libmojo_public_system_cpp|libmojo_public_system|libnative_theme|libnet|libnet_with_v8|libnetwork_cpp_base|libnetwork_cpp|libnetwork_service|libnetwork_session_configurator|libonc|libos_crypt|libperfetto|libplat
form|libplatform_window_handler_libs|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_cpp_base|libresource_coordinator_cpp_features|libresource_coordinator_cpp|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libresource_coordinator_public_mojom|libsandbox_services|libsandbox|libscheduling_metrics|libseccomp_bpf|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom_blink|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_constants|libservice_manager_mojom_shared|libservice_manager_mojom|libservice|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing_cpp|libtracing_mojom_shared|libtracing_m
ojom|libtracing|libui_base_ime_linux|libui_base_ime|libui_base_ime_types|libui_base|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libusb_shared|libuser_manager|libuser_prefs|libv8_libbase|libv8_libplatform|libv8|libviews|libviz_common|libviz_resource_format_utils|libVkICD_mock_icd|libVkLayer_core_validation|libVkLayer_object_tracker|libVkLayer_parameter_validation|libVkLayer_threading|libVkLayer_unique_objects|libvr_common|libvr_ui|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libwebdata_common|libweb_dialogs|libwebgpu|libwebview|libwm_public|libwm|libwtf|libx11_events_platform|libx11_window|libzygote
%endif
%global __requires_exclude ^(%{privlibs})\\.so*
@@ -142,15 +142,15 @@ BuildRequires: libicu-devel >= 5.4
%global chromoting_client_id %nil
%endif
-%global majorversion 70
+%global majorversion 71
%if %{freeworld}
Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3538.110
-Release: 2%{?dist}
+Version: %{majorversion}.0.3578.98
+Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -237,7 +237,7 @@ Patch67: chromium-65.0.3325.146-memcpy-fix.patch
# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return
Patch85: chromium-68.0.3440.106-boolfix.patch
# From Debian
-Patch86: chromium-67.0.3396.62-skia-aarch64-buildfix.patch
+Patch86: chromium-71.0.3578.98-skia-aarch64-buildfix.patch
# Use lstdc++ on EPEL7 only
Patch87: chromium-65.0.3325.162-epel7-stdc++.patch
# Missing files in tarball
@@ -249,7 +249,7 @@ Patch88: chromium-66.0.3359.117-missing-files.patch
# https://bugs.chromium.org/p/chromium/issues/detail?id=816952
# Patch91: chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch
# Do not use unrar code, it is non-free
-Patch92: chromium-69.0.3497.81-norar.patch
+Patch92: chromium-71.0.3578.98-norar.patch
# Upstream GCC fixes
Patch93: chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch
Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch
@@ -269,22 +269,22 @@ Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
Patch101: chromium-68.0.3440.106-fedora-user-agent.patch
# Try to fix version.py for Rawhide
Patch102: chromium-67.0.3396.99-py3fix.patch
-Patch103: chromium-69.0.3497.81-py2-bootstrap.patch
+Patch103: chromium-71.0.3578.98-py2-bootstrap.patch
# Fix default on redeclaration error
# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c...
Patch110: chromium-68.0.3440.106-fix-default-on-redeclaration.patch
# Use Gentoo's Widevine hack
-# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
-Patch111: chromium-69.0.3497.81-widevine-r2.patch
+# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/...
+Patch111: chromium-71.0.3578.98-widevine-r3.patch
# Do not require sysroot
# Forget about trying to make libc++
# BUILD SANELY PLEASE
Patch112: chromium-69.0.3497.81-build-sanely-please.patch
# Still moar GCC cleanups from upstream
-Patch113: chromium-gcc8-r588316.patch
-Patch114: chromium-gcc8-r588547.patch
-Patch115: chromium-gcc8-r589614.patch
-Patch116: chromium-gcc8-r591015.patch
+# Patch113: chromium-gcc8-r588316.patch
+# Patch114: chromium-gcc8-r588547.patch
+# Patch115: chromium-gcc8-r589614.patch
+# Patch116: chromium-gcc8-r591015.patch
# Disable fontconfig cache magic that breaks remoting
Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
# Fix build against harfbuzz2
@@ -292,7 +292,7 @@ Patch118: chromium-70.0.3538.77-harfbuzz2-fix.patch
# Fix aarch64 build against latest linux kernel headers
Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
# https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc1...
-Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
+Patch120: chromium-71.0.3578.98-remove-sysroot-options.patch
# Enable VAAPI support on Linux
# NOTE: This patch will never land upstream
Patch121: enable-vaapi.patch
@@ -302,7 +302,12 @@ Patch122: chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
# libva is merged and picked by the builds. Thus ensuring that hardware accleration is not broken while updating the libva.
# Taken and rebased from https://chromium-review.googlesource.com/c/chromium/src/+/1352519
# The patch might land somewhere in the future and will be removed.
-Patch123: relax-libva-version.patch
+Patch123: relax-libva-version.patch
+# Fix compatibility with VA-API library (libva) version 1
+Patch124: chromium-71.0.3578.98-vaapi-libva1-compatibility.patch
+# From gentoo
+Patch125: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files...
+
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -840,10 +845,10 @@ udev.
%patch110 -p1 -b .fix-default-redeclaration
%patch111 -p1 -b .wvhack
%patch112 -p1 -b .sanebuild
-%patch113 -p1 -b .r588316
-%patch114 -p1 -b .r588547
-%patch115 -p1 -b .r589614
-%patch116 -p1 -b .r591015
+# %%patch113 -p1 -b .r588316
+# %%patch114 -p1 -b .r588547
+# %%patch115 -p1 -b .r589614
+# %%patch116 -p1 -b .r591015
%patch117 -p1 -b .nofc
%if 0%{?fedora} >= 30
%patch118 -p1 -b .harfbuzz2
@@ -855,6 +860,8 @@ udev.
%patch122 -p1 -b .i686permissive
%endif
%patch123 -p1 -b .relaxva
+%patch124 -p1 -b .va1compat
+%patch125 -p1 -b .gcc-overloaded
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@@ -1064,8 +1071,6 @@ ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
# Remove most of the bundled libraries. Libraries specified below (taken from
# Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
build/linux/unbundle/remove_bundled_libraries.py \
- 'buildtools/third_party/libc++' \
- 'buildtools/third_party/libc++abi' \
'base/third_party/dmg_fp' \
'base/third_party/dynamic_annotations' \
'base/third_party/icu' \
@@ -1076,6 +1081,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'base/third_party/valgrind' \
'base/third_party/xdg_mime' \
'base/third_party/xdg_user_dirs' \
+ 'buildtools/third_party/libc++' \
+ 'buildtools/third_party/libc++abi' \
'chrome/third_party/mozilla_security_manager' \
'courgette/third_party' \
'net/third_party/http2' \
@@ -1150,6 +1157,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/icu' \
'third_party/inspector_protocol' \
'third_party/jinja2' \
+ 'third_party/jsoncpp' \
'third_party/jstemplate' \
'third_party/khronos' \
'third_party/leveldatabase' \
@@ -1229,6 +1237,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/snappy' \
'third_party/speech-dispatcher' \
'third_party/spirv-headers' \
+ 'third_party/SPIRV-Tools' \
'third_party/spirv-tools-angle' \
'third_party/sqlite' \
'third_party/swiftshader' \
@@ -1822,6 +1831,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Fri Dec 14 2018 Tom Callaway <spot(a)fedoraproject.org> - 71.0.3578.98-1
+- update to 71.0.3578.98
+
* Tue Nov 27 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.110-2
- enable vaapi support (thanks to Akarshan Biswas for doing the hard work here)
diff --git a/sources b/sources
index 7941afe..4b6d47b 100644
--- a/sources
+++ b/sources
@@ -15,6 +15,5 @@ SHA512 (Tinos-BoldItalic.ttf) = 2574de2add94ef976b731fac688951fab49574c9b0ccd259
SHA512 (Tinos-Bold.ttf) = 54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
-SHA512 (chromium-68.0.3440.106-clean.tar.xz) = a609975c96674f3a84a33bb3d57271535671e11d0775efeceff4f8a965851216038cf491281aaab0cc64c6e99af033f9c8a93f759f232e8c686408dbc09c8dd5
SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
-SHA512 (chromium-70.0.3538.110-clean.tar.xz) = 3c251137d56373820b8ec175b31947a9dccb8e7bb53a54c45afdd26747dc8ba23b1f2bd71b2e44f419e2ec74fa2fc10ae0501c6e47093b04e05f5547d0a123ee
+SHA512 (chromium-71.0.3578.98-clean.tar.xz) = 8e92cefb1079944a742cd99ef4b50baa71a4517420b7e30bd9cba556df9a032f1dd08acd421e0ad28b40c4d93367529029edebd8c2e6c25ccec2ab231c81828c
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 161/259] Add relax libva version check patch
by Nicolas Chauvet
commit f97ba1b6eddf61436aaaa5d3f7e1c347df64928d
Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org>
Date: Tue Dec 11 12:42:50 2018 +0530
Add relax libva version check patch
relax-libva-version.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
---
diff --git a/relax-libva-version.patch b/relax-libva-version.patch
new file mode 100644
index 0000000..e297fd6
--- /dev/null
+++ b/relax-libva-version.patch
@@ -0,0 +1,56 @@
+From 6f1309ef8fe10965e4d0018b4f1b80ac6deccdaa Mon Sep 17 00:00:00 2001
+From: Azhar Shaikh <azhar.shaikh(a)intel.com>
+Date: Fri, 30 Nov 2018 23:11:57 +0000
+Subject: [PATCH] media/gpu/vaapi: Relax the version check for VA-API
+
+Since the newer versions of VA-API are ABI compatible, relax the
+version checks for VA-API, by using VA_CHECK_VERSION().
+This will help in updating the libva to the latest releases,
+while still supporting the old versions, till the new version of
+libva is merged and picked by the builds. Thus ensuring that
+hardware accleration is not broken while updating the libva.
+
+Bug: 905814
+TEST=libva-2.3.0 and libva-2.1.0 are able to do hardware acceleration.
+
+Suggested-by: Alexandre Courbot <acourbot(a)chromium.org>
+Signed-off-by: Azhar Shaikh <azhar.shaikh(a)intel.com>
+Change-Id: I510549f72290d20676927eeeeb89a87199c062af
+Reviewed-on: https://chromium-review.googlesource.com/c/1352519
+Reviewed-by: Alexandre Courbot <acourbot(a)chromium.org>
+Reviewed-by: Hirokazu Honda <hiroh(a)chromium.org>
+Commit-Queue: Miguel Casas <mcasas(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#612832}
+---
+
+diff --git a/AUTHORS b/AUTHORS
+index 567fe15..ff42fc5 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -103,6 +103,7 @@
+ Attila Dusnoki <dati91(a)gmail.com>
+ Avinaash Doreswamy <avi.nitk(a)samsung.com>
+ Ayush Khandelwal <k.ayush(a)samsung.com>
++Azhar Shaikh <azhar.shaikh(a)intel.com>
+ Balazs Kelemen <b.kelemen(a)samsung.com>
+ Baul Eun <baul.eun(a)samsung.com>
+ Behara Mani Shyam Patro <behara.ms(a)samsung.com>
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index b415642..053384d 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -333,7 +333,13 @@
+ DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " "
+ << va_vendor_string_;
+
+- if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION) {
++ // The VAAPI version is determined from what is loaded on the system by
++ // calling vaInitialize(). We want a runtime evaluation of libva version,
++ // of what is loaded on the system, with, what browser is compiled with.
++ // Also since the libva is now ABI-compatible, relax the version check
++ // which helps in upgrading the libva, without breaking any existing
++ // functionality.
++ if (!VA_CHECK_VERSION(major_version, minor_version, 0)) {
+ LOG(ERROR) << "This build of Chromium requires VA-API version "
+ << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION
+ << ", system version: " << major_version << "." << minor_version;
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 160/259] Update vaapi patch for 71 and add to patch to relax the version check for vaapi
by Nicolas Chauvet
commit 62238334785614a72eac9fffebbf2d91916b1dc6
Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org>
Date: Tue Dec 11 12:40:16 2018 +0530
Update vaapi patch for 71 and add to patch to relax the version check for vaapi
chromium.spec | 9 +++++++--
enable-vaapi.patch | 56 +++++++++++++++++++++++++++---------------------------
2 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 6b0cd20..0e7c20a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -297,7 +297,12 @@ Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
# NOTE: This patch will never land upstream
Patch121: enable-vaapi.patch
Patch122: chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
-
+# Since the newer versions of VA-API are ABI compatible, relax the version checks for VA-API, by using VA_CHECK_VERSION().
+# This will help in updating the libva to the latest releases,while still supporting the old versions, till the new version of
+# libva is merged and picked by the builds. Thus ensuring that hardware accleration is not broken while updating the libva.
+# Taken and rebased from https://chromium-review.googlesource.com/c/chromium/src/+/1352519
+# The patch might land somewhere in the future and will be removed.
+Patch123: relax-libva-version.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -849,7 +854,7 @@ udev.
%ifarch i686
%patch122 -p1 -b .i686permissive
%endif
-
+%patch123 -p1 -b .relaxva
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 6211000..1997af3 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,4 +1,4 @@
-From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From efdd5bdf093e9074c9eba73650ff5ad95b280ec8 Mon Sep 17 00:00:00 2001
From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Sun, 4 Nov 2018 20:26:54 +0530
Subject: [PATCH] Enable vaapi on Linux
@@ -17,10 +17,10 @@ Subject: [PATCH] Enable vaapi on Linux
10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..39df8d6cf 100644
+index db54ccb61..f32075fb8 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1797,7 +1797,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -29,9 +29,9 @@ index d029d0648..39df8d6cf 100644
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(features::kOpenVR)},
- #endif // ENABLE_OPENVR
+@@ -2456,12 +2456,12 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
+ #endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
@@ -45,7 +45,7 @@ index d029d0648..39df8d6cf 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4371,12 +4371,14 @@ const FeatureEntry kFeatureEntries[] = {
"AutofillDropdownLayout")},
#endif // OS_ANDROID
@@ -63,10 +63,10 @@ index d029d0648..39df8d6cf 100644
flag_descriptions::kEnableHomeLauncherGesturesName,
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..df8ecb24e 100644
+index 6cc51bbfb..3c4babe3d 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
+@@ -2996,9 +2996,9 @@ const char kTextSuggestionsTouchBarDescription[] =
#endif
@@ -78,7 +78,7 @@ index 0cb812619..df8ecb24e 100644
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+@@ -3006,6 +3006,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -97,7 +97,7 @@ index 0cb812619..df8ecb24e 100644
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
-@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+@@ -3524,12 +3536,6 @@ const char kUseMonitorColorSpaceDescription[] =
"Enables Chrome to use the color space information provided by the monitor"
" instead of the default sRGB color space.";
@@ -111,10 +111,10 @@ index 0cb812619..df8ecb24e 100644
"Experimental Chromecast support for Video Player";
const char kVideoPlayerChromecastSupportDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..14d7e33e9 100644
+index 944695782..38d8fe144 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1824,13 +1824,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
@@ -139,7 +139,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+@@ -2145,9 +2154,6 @@ extern const char kUseMashDescription[];
extern const char kUseMonitorColorSpaceName[];
extern const char kUseMonitorColorSpaceDescription[];
@@ -150,7 +150,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kVideoPlayerChromecastSupportDescription[];
diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
-index 2196abef4..b4e0a1ae1 100644
+index 6f5f55de7..b90db3738 100644
--- a/components/viz/service/main/viz_main_impl.cc
+++ b/components/viz/service/main/viz_main_impl.cc
@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
@@ -185,10 +185,10 @@ index 8974e441d..d7eba85a9 100644
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index f589d015d..03fd1b44a 100644
+index 8397889b6..188d960a4 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrGpuMain");
@@ -197,7 +197,7 @@ index f589d015d..03fd1b44a 100644
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& parameters) {
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -207,10 +207,10 @@ index f589d015d..03fd1b44a 100644
#endif
diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 445953a64..0aac9ddb6 100644
+index cb6118b6a..7b8ea0f75 100644
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
-@@ -373,17 +373,6 @@
+@@ -369,17 +369,6 @@
"all"
]
},
@@ -229,10 +229,10 @@ index 445953a64..0aac9ddb6 100644
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 684c1d5cf..e887e60bb 100644
+index 41bfa9172..30ca4f40a 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+@@ -495,7 +495,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -242,7 +242,7 @@ index 684c1d5cf..e887e60bb 100644
#endif
return false;
diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index ab6215152..b8d1ee896 100644
+index d558b537a..9ad090e07 100644
--- a/media/filters/BUILD.gn
+++ b/media/filters/BUILD.gn
@@ -5,6 +5,7 @@
@@ -253,7 +253,7 @@ index ab6215152..b8d1ee896 100644
jumbo_source_set("filters") {
# Do not expand the visibility here without double-checking with OWNERS, this
-@@ -198,7 +199,7 @@ jumbo_source_set("filters") {
+@@ -200,7 +201,7 @@ jumbo_source_set("filters") {
deps += [ "//media/base/android" ]
}
@@ -263,10 +263,10 @@ index ab6215152..b8d1ee896 100644
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index 9ef4730a4..0c3a06c24 100644
+index 07bfdefda..7e33cd747 100644
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
-@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
+@@ -508,6 +508,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
}
}
@@ -279,7 +279,7 @@ index 9ef4730a4..0c3a06c24 100644
if (use_vaapi) {
test("jpeg_encode_accelerator_unittest") {
deps = [
-@@ -571,6 +577,7 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -578,6 +584,7 @@ if (is_chromeos || is_linux) {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -288,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.19.1
+2.19.2
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 159/259] use fpermissive on vaapi code on i686
by Nicolas Chauvet
commit 20998a3addbc35bfe1ebda7759cec1d13fa616cf
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Nov 29 09:32:34 2018 -0500
use fpermissive on vaapi code on i686
...mium-70.0.3538.110-vaapi-i686-fpermissive.patch | 24 ++++++++++++++++++++++
chromium.spec | 4 ++++
2 files changed, 28 insertions(+)
---
diff --git a/chromium-70.0.3538.110-vaapi-i686-fpermissive.patch b/chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
new file mode 100644
index 0000000..9678488
--- /dev/null
+++ b/chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
@@ -0,0 +1,24 @@
+diff -up chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn.i686permissive chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn
+--- chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn.i686permissive 2018-11-29 09:27:02.405909871 -0500
++++ chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn 2018-11-29 09:29:50.648259696 -0500
+@@ -10,6 +10,11 @@ import("//ui/ozone/ozone.gni")
+
+ assert(use_vaapi)
+
++config("vaapi_permissive") {
++ cflags = [ "-fpermissive" ]
++}
++
++
+ action("libva_generate_stubs") {
+ extra_header = "va_stub_header.fragment"
+
+@@ -98,6 +103,8 @@ source_set("vaapi") {
+ "//third_party/libyuv",
+ ]
+
++ configs += [ ":vaapi_permissive" ]
++
+ if (use_x11) {
+ configs += [ "//build/config/linux:x11" ]
+ deps += [ "//ui/gfx/x" ]
diff --git a/chromium.spec b/chromium.spec
index 268e8f6..6b0cd20 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -296,6 +296,7 @@ Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
# Enable VAAPI support on Linux
# NOTE: This patch will never land upstream
Patch121: enable-vaapi.patch
+Patch122: chromium-70.0.3538.110-vaapi-i686-fpermissive.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -845,6 +846,9 @@ udev.
%patch119 -p1 -b .aarch64-new-stat
%patch120 -p1 -b .sysrootfix
%patch121 -p1 -b .vaapi
+%ifarch i686
+%patch122 -p1 -b .i686permissive
+%endif
# Change shebang in all relevant files in this directory and all subdirectories
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 158/259] use clean vaapi patch, add BR: libva-devel
by Nicolas Chauvet
commit 0d5fe2e2776b35f5d48b00a1a72f935d69ec7a64
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Nov 28 12:36:25 2018 -0500
use clean vaapi patch, add BR: libva-devel
chromium.spec | 1 +
enable-vaapi.patch | 127 +++++++++++++++++++++++++++++++++--------------------
2 files changed, 80 insertions(+), 48 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index c189130..268e8f6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -441,6 +441,7 @@ BuildRequires: libudev-devel
Requires: libusbx >= 1.0.21-0.1.git448584a
BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
%endif
+BuildRequires: libva-devel
# We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things
# ... so we just use the bundled libvpx.
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 16aa3b0..6211000 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,7 +1,26 @@
-diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi chromium-70.0.3538.110/chrome/browser/about_flags.cc
---- chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi 2018-11-19 13:55:02.000000000 -0500
-+++ chromium-70.0.3538.110/chrome/browser/about_flags.cc 2018-11-27 16:32:03.917049560 -0500
-@@ -1776,7 +1776,7 @@ const FeatureEntry kFeatureEntries[] = {
+From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Sun, 4 Nov 2018 20:26:54 +0530
+Subject: [PATCH] Enable vaapi on Linux
+
+---
+ chrome/browser/about_flags.cc | 14 +++++++------
+ chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
+ chrome/browser/flag_descriptions.h | 16 +++++++++-----
+ components/viz/service/main/viz_main_impl.cc | 2 +-
+ content/gpu/BUILD.gn | 6 ++++++
+ content/gpu/gpu_main.cc | 4 ++--
+ gpu/config/software_rendering_list.json | 11 ----------
+ media/base/media_switches.cc | 2 +-
+ media/filters/BUILD.gn | 3 ++-
+ media/gpu/BUILD.gn | 7 +++++++
+ 10 files changed, 52 insertions(+), 35 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+index d029d0648..39df8d6cf 100644
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -10,7 +29,7 @@ diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi chromium-70.
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2458,12 +2458,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
@@ -26,7 +45,7 @@ diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi chromium-70.
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4449,12 +4449,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
"AutofillDropdownLayout")},
#endif // OS_ANDROID
@@ -43,10 +62,11 @@ diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi chromium-70.
{"enable-home-launcher-gestures",
flag_descriptions::kEnableHomeLauncherGesturesName,
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
-diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc
---- chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi 2018-11-19 13:55:03.000000000 -0500
-+++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc 2018-11-27 16:32:03.917049560 -0500
-@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescr
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+index 0cb812619..df8ecb24e 100644
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
#endif
@@ -58,7 +78,7 @@ diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi chromi
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescri
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -77,7 +97,7 @@ diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi chromi
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
-@@ -3570,12 +3582,6 @@ const char kUseMonitorColorSpaceDescript
+@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
"Enables Chrome to use the color space information provided by the monitor"
" instead of the default sRGB color space.";
@@ -90,10 +110,11 @@ diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi chromi
const char kVideoPlayerChromecastSupportName[] =
"Experimental Chromecast support for Video Player";
const char kVideoPlayerChromecastSupportDescription[] =
-diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi chromium-70.0.3538.110/chrome/browser/flag_descriptions.h
---- chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi 2018-11-19 13:55:03.000000000 -0500
-+++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.h 2018-11-27 16:32:03.918049538 -0500
-@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersi
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+index b3c5e5691..14d7e33e9 100644
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
@@ -118,7 +139,7 @@ diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi chromiu
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-@@ -2161,9 +2170,6 @@ extern const char kUseMashDescription[];
+@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
extern const char kUseMonitorColorSpaceName[];
extern const char kUseMonitorColorSpaceDescription[];
@@ -128,10 +149,11 @@ diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi chromiu
extern const char kVideoPlayerChromecastSupportName[];
extern const char kVideoPlayerChromecastSupportDescription[];
-diff -up chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc
---- chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi 2018-11-19 13:55:07.000000000 -0500
-+++ chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc 2018-11-27 16:32:03.918049538 -0500
-@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndS
+diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
+index 2196abef4..b4e0a1ae1 100644
+--- a/components/viz/service/main/viz_main_impl.cc
++++ b/components/viz/service/main/viz_main_impl.cc
+@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
// It should be possible to use |main_task_runner_| for doing IO tasks.
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
thread_options.priority = base::ThreadPriority::NORMAL;
@@ -140,9 +162,10 @@ diff -up chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaa
// TODO(reveman): Remove this in favor of setting it explicitly for each
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
-diff -up chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi chromium-70.0.3538.110/content/gpu/BUILD.gn
---- chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi 2018-11-19 13:55:07.000000000 -0500
-+++ chromium-70.0.3538.110/content/gpu/BUILD.gn 2018-11-27 16:32:03.926049365 -0500
+diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
+index 8974e441d..d7eba85a9 100644
+--- a/content/gpu/BUILD.gn
++++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
@@ -151,7 +174,7 @@ diff -up chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi chromium-70.0.3538.11
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources")
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
@@ -161,10 +184,11 @@ diff -up chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi chromium-70.0.3538.11
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
-diff -up chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi chromium-70.0.3538.110/content/gpu/gpu_main.cc
---- chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi 2018-11-19 13:55:07.000000000 -0500
-+++ chromium-70.0.3538.110/content/gpu/gpu_main.cc 2018-11-27 16:33:26.059266401 -0500
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
+diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
+index f589d015d..03fd1b44a 100644
+--- a/content/gpu/gpu_main.cc
++++ b/content/gpu/gpu_main.cc
+@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrGpuMain");
@@ -173,7 +197,7 @@ diff -up chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi chromium-70.0.3538
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -182,13 +206,15 @@ diff -up chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi chromium-70.0.3538
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
-diff -up chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi chromium-70.0.3538.110/gpu/config/software_rendering_list.json
---- chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi 2018-11-19 13:55:08.000000000 -0500
-+++ chromium-70.0.3538.110/gpu/config/software_rendering_list.json 2018-11-27 16:32:03.936049148 -0500
-@@ -374,17 +374,6 @@
+diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
+index 445953a64..0aac9ddb6 100644
+--- a/gpu/config/software_rendering_list.json
++++ b/gpu/config/software_rendering_list.json
+@@ -373,17 +373,6 @@
+ "all"
]
},
- {
+- {
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247],
@@ -199,14 +225,14 @@ diff -up chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi ch
- "accelerated_video_decode"
- ]
- },
-- {
+ {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
- "cr_bugs": [145531, 332596, 571899, 629434],
-diff -up chromium-70.0.3538.110/media/base/media_switches.cc.vaapi chromium-70.0.3538.110/media/base/media_switches.cc
---- chromium-70.0.3538.110/media/base/media_switches.cc.vaapi 2018-11-19 13:55:09.000000000 -0500
-+++ chromium-70.0.3538.110/media/base/media_switches.cc 2018-11-27 16:32:03.937049127 -0500
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+index 684c1d5cf..e887e60bb 100644
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -215,9 +241,10 @@ diff -up chromium-70.0.3538.110/media/base/media_switches.cc.vaapi chromium-70.0
return true;
#endif
return false;
-diff -up chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi chromium-70.0.3538.110/media/filters/BUILD.gn
---- chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000 -0500
-+++ chromium-70.0.3538.110/media/filters/BUILD.gn 2018-11-27 16:34:43.272581693 -0500
+diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
+index ab6215152..b8d1ee896 100644
+--- a/media/filters/BUILD.gn
++++ b/media/filters/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
@@ -235,10 +262,11 @@ diff -up chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi chromium-70.0.3538.
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
-diff -up chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi chromium-70.0.3538.110/media/gpu/BUILD.gn
---- chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000 -0500
-+++ chromium-70.0.3538.110/media/gpu/BUILD.gn 2018-11-27 16:32:03.937049127 -0500
-@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
+diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
+index 9ef4730a4..0c3a06c24 100644
+--- a/media/gpu/BUILD.gn
++++ b/media/gpu/BUILD.gn
+@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
}
}
@@ -259,3 +287,6 @@ diff -up chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi chromium-70.0.3538.110/
}
}
+--
+2.19.1
+
5 years, 6 months
- 1
- 0
[chromium-libs-media-freeworld: 157/259] fix patch
by Nicolas Chauvet
commit 8529bb834b687bf54b36f9038884eb5d26dca226
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Nov 27 16:40:18 2018 -0500
fix patch
enable-vaapi.patch | 492 ++++++-----------------------------------------------
1 file changed, 54 insertions(+), 438 deletions(-)
---
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 4f94214..16aa3b0 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,373 +1,7 @@
-<!DOCTYPE html>
-<html lang='en'>
-<head>
-<title>enable-vaapi.patch - free/chromium-vaapi.git - chromium-vaapi</title>
-<meta name='generator' content='cgit v1.1'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='https://pkgs.rpmfusion.org/cgit/free/chromium-vaapi.git/atom/enable-vaapi...' type='application/atom+xml'/>
-<link rel='vcs-git' href='ssh://pkgs.rpmfusion.org/free/chromium-vaapi.git' title='free/chromium-vaapi.git Git repository'/>
-<link rel='vcs-git' href='https://pkgs.rpmfusion.org/git/free/chromium-vaapi.git' title='free/chromium-vaapi.git Git repository'/>
-</head>
-<body>
-<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
-<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
-
-<script>
- var base = 'https://apps.fedoraproject.org/';
- var tokens = window.location.href.split('/');
- var repo = null;
- if (tokens.length > 4 && tokens[4] != '') {
- repo = tokens[4].split('.')[0];
- }
- fedmenu({
- 'url': base + 'js/data.js',
- 'mimeType': 'application/javascript',
- 'position': 'bottom-right',
- 'package': repo,
- });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='free/chromium-vaapi.git' href='/cgit/free/chromium-vaapi.git/'>free/chromium-vaapi.git</a></td><td class='form'><form method='get'>
-<select name='h' onchange='this.form.submit();'>
-<option value='f28'>f28</option>
-<option value='f29'>f29</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' value='switch'/></form></td></tr>
-<tr><td class='sub'>chromium-vaapi</td><td class='sub right'>Leigh Scott</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/free/chromium-vaapi.git/'>summary</a><a href='/cgit/free/chromium-vaapi.git/refs/'>refs</a><a href='/cgit/free/chromium-vaapi.git/log/enable-vaapi.patch'>log</a><a class='active' href='/cgit/free/chromium-vaapi.git/tree/enable-vaapi.patch'>tree</a><a href='/cgit/free/chromium-vaapi.git/commit/enable-vaapi.patch'>commit</a><a href='/cgit/free/chromium-vaapi.git/diff/enable-vaapi.patch'>diff</a><a href='/cgit/free/chromium-vaapi.git/stats/enable-vaapi.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/free/chromium-vaapi.git/log/enable-vaapi.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/free/chromium-vaapi.git/tree/'>root</a>/<a href='/cgit/free/chromium-vaapi.git/tree/enable-vaapi.patch'>enable-vaapi.patch</a></div><div class='content'>blob: 6211000401f259d82599ee2bef4f255dabf0cd32 (<a href='/cgit/free/chromium-vaapi.git/plain/enable-vaapi.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-<a id='n18' href='#n18'>18</a>
-<a id='n19' href='#n19'>19</a>
-<a id='n20' href='#n20'>20</a>
-<a id='n21' href='#n21'>21</a>
-<a id='n22' href='#n22'>22</a>
-<a id='n23' href='#n23'>23</a>
-<a id='n24' href='#n24'>24</a>
-<a id='n25' href='#n25'>25</a>
-<a id='n26' href='#n26'>26</a>
-<a id='n27' href='#n27'>27</a>
-<a id='n28' href='#n28'>28</a>
-<a id='n29' href='#n29'>29</a>
-<a id='n30' href='#n30'>30</a>
-<a id='n31' href='#n31'>31</a>
-<a id='n32' href='#n32'>32</a>
-<a id='n33' href='#n33'>33</a>
-<a id='n34' href='#n34'>34</a>
-<a id='n35' href='#n35'>35</a>
-<a id='n36' href='#n36'>36</a>
-<a id='n37' href='#n37'>37</a>
-<a id='n38' href='#n38'>38</a>
-<a id='n39' href='#n39'>39</a>
-<a id='n40' href='#n40'>40</a>
-<a id='n41' href='#n41'>41</a>
-<a id='n42' href='#n42'>42</a>
-<a id='n43' href='#n43'>43</a>
-<a id='n44' href='#n44'>44</a>
-<a id='n45' href='#n45'>45</a>
-<a id='n46' href='#n46'>46</a>
-<a id='n47' href='#n47'>47</a>
-<a id='n48' href='#n48'>48</a>
-<a id='n49' href='#n49'>49</a>
-<a id='n50' href='#n50'>50</a>
-<a id='n51' href='#n51'>51</a>
-<a id='n52' href='#n52'>52</a>
-<a id='n53' href='#n53'>53</a>
-<a id='n54' href='#n54'>54</a>
-<a id='n55' href='#n55'>55</a>
-<a id='n56' href='#n56'>56</a>
-<a id='n57' href='#n57'>57</a>
-<a id='n58' href='#n58'>58</a>
-<a id='n59' href='#n59'>59</a>
-<a id='n60' href='#n60'>60</a>
-<a id='n61' href='#n61'>61</a>
-<a id='n62' href='#n62'>62</a>
-<a id='n63' href='#n63'>63</a>
-<a id='n64' href='#n64'>64</a>
-<a id='n65' href='#n65'>65</a>
-<a id='n66' href='#n66'>66</a>
-<a id='n67' href='#n67'>67</a>
-<a id='n68' href='#n68'>68</a>
-<a id='n69' href='#n69'>69</a>
-<a id='n70' href='#n70'>70</a>
-<a id='n71' href='#n71'>71</a>
-<a id='n72' href='#n72'>72</a>
-<a id='n73' href='#n73'>73</a>
-<a id='n74' href='#n74'>74</a>
-<a id='n75' href='#n75'>75</a>
-<a id='n76' href='#n76'>76</a>
-<a id='n77' href='#n77'>77</a>
-<a id='n78' href='#n78'>78</a>
-<a id='n79' href='#n79'>79</a>
-<a id='n80' href='#n80'>80</a>
-<a id='n81' href='#n81'>81</a>
-<a id='n82' href='#n82'>82</a>
-<a id='n83' href='#n83'>83</a>
-<a id='n84' href='#n84'>84</a>
-<a id='n85' href='#n85'>85</a>
-<a id='n86' href='#n86'>86</a>
-<a id='n87' href='#n87'>87</a>
-<a id='n88' href='#n88'>88</a>
-<a id='n89' href='#n89'>89</a>
-<a id='n90' href='#n90'>90</a>
-<a id='n91' href='#n91'>91</a>
-<a id='n92' href='#n92'>92</a>
-<a id='n93' href='#n93'>93</a>
-<a id='n94' href='#n94'>94</a>
-<a id='n95' href='#n95'>95</a>
-<a id='n96' href='#n96'>96</a>
-<a id='n97' href='#n97'>97</a>
-<a id='n98' href='#n98'>98</a>
-<a id='n99' href='#n99'>99</a>
-<a id='n100' href='#n100'>100</a>
-<a id='n101' href='#n101'>101</a>
-<a id='n102' href='#n102'>102</a>
-<a id='n103' href='#n103'>103</a>
-<a id='n104' href='#n104'>104</a>
-<a id='n105' href='#n105'>105</a>
-<a id='n106' href='#n106'>106</a>
-<a id='n107' href='#n107'>107</a>
-<a id='n108' href='#n108'>108</a>
-<a id='n109' href='#n109'>109</a>
-<a id='n110' href='#n110'>110</a>
-<a id='n111' href='#n111'>111</a>
-<a id='n112' href='#n112'>112</a>
-<a id='n113' href='#n113'>113</a>
-<a id='n114' href='#n114'>114</a>
-<a id='n115' href='#n115'>115</a>
-<a id='n116' href='#n116'>116</a>
-<a id='n117' href='#n117'>117</a>
-<a id='n118' href='#n118'>118</a>
-<a id='n119' href='#n119'>119</a>
-<a id='n120' href='#n120'>120</a>
-<a id='n121' href='#n121'>121</a>
-<a id='n122' href='#n122'>122</a>
-<a id='n123' href='#n123'>123</a>
-<a id='n124' href='#n124'>124</a>
-<a id='n125' href='#n125'>125</a>
-<a id='n126' href='#n126'>126</a>
-<a id='n127' href='#n127'>127</a>
-<a id='n128' href='#n128'>128</a>
-<a id='n129' href='#n129'>129</a>
-<a id='n130' href='#n130'>130</a>
-<a id='n131' href='#n131'>131</a>
-<a id='n132' href='#n132'>132</a>
-<a id='n133' href='#n133'>133</a>
-<a id='n134' href='#n134'>134</a>
-<a id='n135' href='#n135'>135</a>
-<a id='n136' href='#n136'>136</a>
-<a id='n137' href='#n137'>137</a>
-<a id='n138' href='#n138'>138</a>
-<a id='n139' href='#n139'>139</a>
-<a id='n140' href='#n140'>140</a>
-<a id='n141' href='#n141'>141</a>
-<a id='n142' href='#n142'>142</a>
-<a id='n143' href='#n143'>143</a>
-<a id='n144' href='#n144'>144</a>
-<a id='n145' href='#n145'>145</a>
-<a id='n146' href='#n146'>146</a>
-<a id='n147' href='#n147'>147</a>
-<a id='n148' href='#n148'>148</a>
-<a id='n149' href='#n149'>149</a>
-<a id='n150' href='#n150'>150</a>
-<a id='n151' href='#n151'>151</a>
-<a id='n152' href='#n152'>152</a>
-<a id='n153' href='#n153'>153</a>
-<a id='n154' href='#n154'>154</a>
-<a id='n155' href='#n155'>155</a>
-<a id='n156' href='#n156'>156</a>
-<a id='n157' href='#n157'>157</a>
-<a id='n158' href='#n158'>158</a>
-<a id='n159' href='#n159'>159</a>
-<a id='n160' href='#n160'>160</a>
-<a id='n161' href='#n161'>161</a>
-<a id='n162' href='#n162'>162</a>
-<a id='n163' href='#n163'>163</a>
-<a id='n164' href='#n164'>164</a>
-<a id='n165' href='#n165'>165</a>
-<a id='n166' href='#n166'>166</a>
-<a id='n167' href='#n167'>167</a>
-<a id='n168' href='#n168'>168</a>
-<a id='n169' href='#n169'>169</a>
-<a id='n170' href='#n170'>170</a>
-<a id='n171' href='#n171'>171</a>
-<a id='n172' href='#n172'>172</a>
-<a id='n173' href='#n173'>173</a>
-<a id='n174' href='#n174'>174</a>
-<a id='n175' href='#n175'>175</a>
-<a id='n176' href='#n176'>176</a>
-<a id='n177' href='#n177'>177</a>
-<a id='n178' href='#n178'>178</a>
-<a id='n179' href='#n179'>179</a>
-<a id='n180' href='#n180'>180</a>
-<a id='n181' href='#n181'>181</a>
-<a id='n182' href='#n182'>182</a>
-<a id='n183' href='#n183'>183</a>
-<a id='n184' href='#n184'>184</a>
-<a id='n185' href='#n185'>185</a>
-<a id='n186' href='#n186'>186</a>
-<a id='n187' href='#n187'>187</a>
-<a id='n188' href='#n188'>188</a>
-<a id='n189' href='#n189'>189</a>
-<a id='n190' href='#n190'>190</a>
-<a id='n191' href='#n191'>191</a>
-<a id='n192' href='#n192'>192</a>
-<a id='n193' href='#n193'>193</a>
-<a id='n194' href='#n194'>194</a>
-<a id='n195' href='#n195'>195</a>
-<a id='n196' href='#n196'>196</a>
-<a id='n197' href='#n197'>197</a>
-<a id='n198' href='#n198'>198</a>
-<a id='n199' href='#n199'>199</a>
-<a id='n200' href='#n200'>200</a>
-<a id='n201' href='#n201'>201</a>
-<a id='n202' href='#n202'>202</a>
-<a id='n203' href='#n203'>203</a>
-<a id='n204' href='#n204'>204</a>
-<a id='n205' href='#n205'>205</a>
-<a id='n206' href='#n206'>206</a>
-<a id='n207' href='#n207'>207</a>
-<a id='n208' href='#n208'>208</a>
-<a id='n209' href='#n209'>209</a>
-<a id='n210' href='#n210'>210</a>
-<a id='n211' href='#n211'>211</a>
-<a id='n212' href='#n212'>212</a>
-<a id='n213' href='#n213'>213</a>
-<a id='n214' href='#n214'>214</a>
-<a id='n215' href='#n215'>215</a>
-<a id='n216' href='#n216'>216</a>
-<a id='n217' href='#n217'>217</a>
-<a id='n218' href='#n218'>218</a>
-<a id='n219' href='#n219'>219</a>
-<a id='n220' href='#n220'>220</a>
-<a id='n221' href='#n221'>221</a>
-<a id='n222' href='#n222'>222</a>
-<a id='n223' href='#n223'>223</a>
-<a id='n224' href='#n224'>224</a>
-<a id='n225' href='#n225'>225</a>
-<a id='n226' href='#n226'>226</a>
-<a id='n227' href='#n227'>227</a>
-<a id='n228' href='#n228'>228</a>
-<a id='n229' href='#n229'>229</a>
-<a id='n230' href='#n230'>230</a>
-<a id='n231' href='#n231'>231</a>
-<a id='n232' href='#n232'>232</a>
-<a id='n233' href='#n233'>233</a>
-<a id='n234' href='#n234'>234</a>
-<a id='n235' href='#n235'>235</a>
-<a id='n236' href='#n236'>236</a>
-<a id='n237' href='#n237'>237</a>
-<a id='n238' href='#n238'>238</a>
-<a id='n239' href='#n239'>239</a>
-<a id='n240' href='#n240'>240</a>
-<a id='n241' href='#n241'>241</a>
-<a id='n242' href='#n242'>242</a>
-<a id='n243' href='#n243'>243</a>
-<a id='n244' href='#n244'>244</a>
-<a id='n245' href='#n245'>245</a>
-<a id='n246' href='#n246'>246</a>
-<a id='n247' href='#n247'>247</a>
-<a id='n248' href='#n248'>248</a>
-<a id='n249' href='#n249'>249</a>
-<a id='n250' href='#n250'>250</a>
-<a id='n251' href='#n251'>251</a>
-<a id='n252' href='#n252'>252</a>
-<a id='n253' href='#n253'>253</a>
-<a id='n254' href='#n254'>254</a>
-<a id='n255' href='#n255'>255</a>
-<a id='n256' href='#n256'>256</a>
-<a id='n257' href='#n257'>257</a>
-<a id='n258' href='#n258'>258</a>
-<a id='n259' href='#n259'>259</a>
-<a id='n260' href='#n260'>260</a>
-<a id='n261' href='#n261'>261</a>
-<a id='n262' href='#n262'>262</a>
-<a id='n263' href='#n263'>263</a>
-<a id='n264' href='#n264'>264</a>
-<a id='n265' href='#n265'>265</a>
-<a id='n266' href='#n266'>266</a>
-<a id='n267' href='#n267'>267</a>
-<a id='n268' href='#n268'>268</a>
-<a id='n269' href='#n269'>269</a>
-<a id='n270' href='#n270'>270</a>
-<a id='n271' href='#n271'>271</a>
-<a id='n272' href='#n272'>272</a>
-<a id='n273' href='#n273'>273</a>
-<a id='n274' href='#n274'>274</a>
-<a id='n275' href='#n275'>275</a>
-<a id='n276' href='#n276'>276</a>
-<a id='n277' href='#n277'>277</a>
-<a id='n278' href='#n278'>278</a>
-<a id='n279' href='#n279'>279</a>
-<a id='n280' href='#n280'>280</a>
-<a id='n281' href='#n281'>281</a>
-<a id='n282' href='#n282'>282</a>
-<a id='n283' href='#n283'>283</a>
-<a id='n284' href='#n284'>284</a>
-<a id='n285' href='#n285'>285</a>
-<a id='n286' href='#n286'>286</a>
-<a id='n287' href='#n287'>287</a>
-<a id='n288' href='#n288'>288</a>
-<a id='n289' href='#n289'>289</a>
-<a id='n290' href='#n290'>290</a>
-<a id='n291' href='#n291'>291</a>
-<a id='n292' href='#n292'>292</a>
-</pre></td>
-<td class='lines'><pre><code>From 9eef10b939b9eee6e7bb58c4ca3a8e119df518c1 Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
-Date: Sun, 4 Nov 2018 20:26:54 +0530
-Subject: [PATCH] Enable vaapi on Linux
-
----
- chrome/browser/about_flags.cc | 14 +++++++------
- chrome/browser/flag_descriptions.cc | 22 +++++++++++++-------
- chrome/browser/flag_descriptions.h | 16 +++++++++-----
- components/viz/service/main/viz_main_impl.cc | 2 +-
- content/gpu/BUILD.gn | 6 ++++++
- content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 ----------
- media/base/media_switches.cc | 2 +-
- media/filters/BUILD.gn | 3 ++-
- media/gpu/BUILD.gn | 7 +++++++
- 10 files changed, 52 insertions(+), 35 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..39df8d6cf 100644
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
+diff -up chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi chromium-70.0.3538.110/chrome/browser/about_flags.cc
+--- chromium-70.0.3538.110/chrome/browser/about_flags.cc.vaapi 2018-11-19 13:55:02.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/about_flags.cc 2018-11-27 16:32:03.917049560 -0500
+@@ -1776,7 +1776,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -376,7 +10,7 @@ index d029d0648..39df8d6cf 100644
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
#if defined(OS_WIN)
-@@ -2457,12 +2457,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2458,12 +2458,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
@@ -392,7 +26,7 @@ index d029d0648..39df8d6cf 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4449,12 +4449,14 @@ const FeatureEntry kFeatureEntries[] = {
"AutofillDropdownLayout")},
#endif // OS_ANDROID
@@ -409,11 +43,10 @@ index d029d0648..39df8d6cf 100644
{"enable-home-launcher-gestures",
flag_descriptions::kEnableHomeLauncherGesturesName,
flag_descriptions::kEnableHomeLauncherGesturesDescription, kOsCrOS,
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 0cb812619..df8ecb24e 100644
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
+diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc
+--- chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc.vaapi 2018-11-19 13:55:03.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.cc 2018-11-27 16:32:03.917049560 -0500
+@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescr
#endif
@@ -421,11 +54,11 @@ index 0cb812619..df8ecb24e 100644
+// Chrome OS and Linux -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -444,7 +77,7 @@ index 0cb812619..df8ecb24e 100644
const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
const char kAllowTouchpadThreeFingerClickDescription[] =
"Enables touchpad three-finger-click as middle button.";
-@@ -3564,12 +3576,6 @@ const char kUseMonitorColorSpaceDescription[] =
+@@ -3570,12 +3582,6 @@ const char kUseMonitorColorSpaceDescript
"Enables Chrome to use the color space information provided by the monitor"
" instead of the default sRGB color space.";
@@ -457,11 +90,10 @@ index 0cb812619..df8ecb24e 100644
const char kVideoPlayerChromecastSupportName[] =
"Experimental Chromecast support for Video Player";
const char kVideoPlayerChromecastSupportDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index b3c5e5691..14d7e33e9 100644
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+diff -up chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi chromium-70.0.3538.110/chrome/browser/flag_descriptions.h
+--- chromium-70.0.3538.110/chrome/browser/flag_descriptions.h.vaapi 2018-11-19 13:55:03.000000000 -0500
++++ chromium-70.0.3538.110/chrome/browser/flag_descriptions.h 2018-11-27 16:32:03.918049538 -0500
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -469,7 +101,7 @@ index b3c5e5691..14d7e33e9 100644
+// Chrome OS and Linux ------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
@@ -486,7 +118,7 @@ index b3c5e5691..14d7e33e9 100644
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
-@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+@@ -2161,9 +2170,6 @@ extern const char kUseMashDescription[];
extern const char kUseMonitorColorSpaceName[];
extern const char kUseMonitorColorSpaceDescription[];
@@ -496,11 +128,10 @@ index b3c5e5691..14d7e33e9 100644
extern const char kVideoPlayerChromecastSupportName[];
extern const char kVideoPlayerChromecastSupportDescription[];
-diff --git a/components/viz/service/main/viz_main_impl.cc b/components/viz/service/main/viz_main_impl.cc
-index 2196abef4..b4e0a1ae1 100644
---- a/components/viz/service/main/viz_main_impl.cc
-+++ b/components/viz/service/main/viz_main_impl.cc
-@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndStartIOThread() {
+diff -up chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc
+--- chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc.vaapi 2018-11-19 13:55:07.000000000 -0500
++++ chromium-70.0.3538.110/components/viz/service/main/viz_main_impl.cc 2018-11-27 16:32:03.918049538 -0500
+@@ -41,7 +41,7 @@ std::unique_ptr<base::Thread> CreateAndS
// It should be possible to use |main_task_runner_| for doing IO tasks.
base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
thread_options.priority = base::ThreadPriority::NORMAL;
@@ -509,10 +140,9 @@ index 2196abef4..b4e0a1ae1 100644
// TODO(reveman): Remove this in favor of setting it explicitly for each
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
-diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..d7eba85a9 100644
---- a/content/gpu/BUILD.gn
-+++ b/content/gpu/BUILD.gn
+diff -up chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi chromium-70.0.3538.110/content/gpu/BUILD.gn
+--- chromium-70.0.3538.110/content/gpu/BUILD.gn.vaapi 2018-11-19 13:55:07.000000000 -0500
++++ chromium-70.0.3538.110/content/gpu/BUILD.gn 2018-11-27 16:32:03.926049365 -0500
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
import("//build/config/ui.gni")
import("//gpu/vulkan/features.gni")
@@ -521,21 +151,20 @@ index 8974e441d..d7eba85a9 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources") {
+@@ -134,4 +135,9 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
+ # Use vaapi on desktop Linux builds when use_vaapi is set
-+ if (is_desktop_linux && use_vaapi) {
++ if (is_desktop_linux && use_vaapi) {
+ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
-diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index f589d015d..03fd1b44a 100644
---- a/content/gpu/gpu_main.cc
-+++ b/content/gpu/gpu_main.cc
-@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+diff -up chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi chromium-70.0.3538.110/content/gpu/gpu_main.cc
+--- chromium-70.0.3538.110/content/gpu/gpu_main.cc.vaapi 2018-11-19 13:55:07.000000000 -0500
++++ chromium-70.0.3538.110/content/gpu/gpu_main.cc 2018-11-27 16:33:26.059266401 -0500
+@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
base::PlatformThread::SetName("CrGpuMain");
@@ -544,8 +173,8 @@ index f589d015d..03fd1b44a 100644
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
-@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& parameters) {
- GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
+@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
+ GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
@@ -553,15 +182,13 @@ index f589d015d..03fd1b44a 100644
io_thread_priority = base::ThreadPriority::DISPLAY;
#endif
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 445953a64..0aac9ddb6 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -373,17 +373,6 @@
- "all"
+diff -up chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi chromium-70.0.3538.110/gpu/config/software_rendering_list.json
+--- chromium-70.0.3538.110/gpu/config/software_rendering_list.json.vaapi 2018-11-19 13:55:08.000000000 -0500
++++ chromium-70.0.3538.110/gpu/config/software_rendering_list.json 2018-11-27 16:32:03.936049148 -0500
+@@ -374,17 +374,6 @@
]
},
-- {
+ {
- "id": 48,
- "description": "Accelerated video decode is unavailable on Linux",
- "cr_bugs": [137247],
@@ -572,14 +199,14 @@ index 445953a64..0aac9ddb6 100644
- "accelerated_video_decode"
- ]
- },
- {
+- {
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
-diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
-index 684c1d5cf..e887e60bb 100644
---- a/media/base/media_switches.cc
-+++ b/media/base/media_switches.cc
-@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
+ "cr_bugs": [145531, 332596, 571899, 629434],
+diff -up chromium-70.0.3538.110/media/base/media_switches.cc.vaapi chromium-70.0.3538.110/media/base/media_switches.cc
+--- chromium-70.0.3538.110/media/base/media_switches.cc.vaapi 2018-11-19 13:55:09.000000000 -0500
++++ chromium-70.0.3538.110/media/base/media_switches.cc 2018-11-27 16:32:03.937049127 -0500
+@@ -468,7 +468,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
switches::kUseFakeJpegDecodeAccelerator)) {
return true;
}
@@ -588,10 +215,9 @@ index 684c1d5cf..e887e60bb 100644
return true;
#endif
return false;
-diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index ab6215152..b8d1ee896 100644
---- a/media/filters/BUILD.gn
-+++ b/media/filters/BUILD.gn
+diff -up chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi chromium-70.0.3538.110/media/filters/BUILD.gn
+--- chromium-70.0.3538.110/media/filters/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000 -0500
++++ chromium-70.0.3538.110/media/filters/BUILD.gn 2018-11-27 16:34:43.272581693 -0500
@@ -5,6 +5,7 @@
import("//build/config/jumbo.gni")
import("//media/media_options.gni")
@@ -604,16 +230,15 @@ index ab6215152..b8d1ee896 100644
deps += [ "//media/base/android" ]
}
-- if (current_cpu != "arm" && is_linux) {
-+ if (use_vaapi && is_linux) {
+- if (current_cpu != "arm" && is_linux) {
++ if (use_vaapi && is_linux) {
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
-diff --git a/media/gpu/BUILD.gn b/media/gpu/BUILD.gn
-index 9ef4730a4..0c3a06c24 100644
---- a/media/gpu/BUILD.gn
-+++ b/media/gpu/BUILD.gn
-@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_mac || is_win) {
+diff -up chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi chromium-70.0.3538.110/media/gpu/BUILD.gn
+--- chromium-70.0.3538.110/media/gpu/BUILD.gn.vaapi 2018-11-19 13:55:09.000000000 -0500
++++ chromium-70.0.3538.110/media/gpu/BUILD.gn 2018-11-27 16:32:03.937049127 -0500
+@@ -501,6 +501,12 @@ if (use_v4l2_codec || use_vaapi || is_ma
}
}
@@ -634,12 +259,3 @@ index 9ef4730a4..0c3a06c24 100644
}
}
---
-2.19.1
-
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2018-11-27 21:05:03 +0000</div>
-</div> <!-- id=cgit -->
-</body>
-</html>
5 years, 6 months
- 1
- 0