[chromium-freeworld/el7] fix noexcept, moar
by Akarshan Biswas
commit 817017a693a2a9bf3adf7ab03a23d059d4af693e
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jan 2 10:59:58 2019 -0500
fix noexcept, moar
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-71.0.3578.98-el7-fix-noexcept.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
---
diff --git a/chromium-71.0.3578.98-el7-fix-noexcept.patch b/chromium-71.0.3578.98-el7-fix-noexcept.patch
index ba1268b..0080e81 100644
--- a/chromium-71.0.3578.98-el7-fix-noexcept.patch
+++ b/chromium-71.0.3578.98-el7-fix-noexcept.patch
@@ -1,3 +1,15 @@
+diff -up chromium-71.0.3578.98/components/signin/core/browser/account_info.cc.fix-noexcept chromium-71.0.3578.98/components/signin/core/browser/account_info.cc
+--- chromium-71.0.3578.98/components/signin/core/browser/account_info.cc.fix-noexcept 2019-01-02 10:57:29.194710662 -0500
++++ chromium-71.0.3578.98/components/signin/core/browser/account_info.cc 2019-01-02 10:58:57.829965474 -0500
+@@ -32,7 +32,7 @@ AccountInfo::AccountInfo(AccountInfo&& o
+
+ AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default;
+
+-AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default;
++AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default;
+
+ bool AccountInfo::IsEmpty() const {
+ return account_id.empty() && email.empty() && gaia.empty() &&
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
5 years, 3 months
[chromium-freeworld/el7] add BR
by Akarshan Biswas
commit 1c4bd59273aa11244002561823a0a204d6d3107a
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sat Dec 22 19:46:19 2018 -0500
add BR
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 0417c0f..60eee50 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -377,6 +377,7 @@ BuildRequires: libdrm-devel
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libudev-devel
+BuildRequires: libuuid-devel
BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
5 years, 3 months
[chromium-freeworld/el7] use prebuilt node on rhel7
by Akarshan Biswas
commit 2555ccfc61f17f83f77a130599faebbfd152b311
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Dec 21 16:37:45 2018 -0500
use prebuilt node on rhel7
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 068f89c..0417c0f 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -344,7 +344,10 @@ Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow-
Source16: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
Source17: GardinerModBug.ttf
Source18: GardinerModCat.ttf
-
+# RHEL needs newer nodejs
+%if 0%{?rhel}
+Source19: node-v8.9.1-linux-x64.tar.gz
+%endif
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -1075,8 +1078,15 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_
CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false'
export CHROMIUM_HEADLESS_GN_DEFINES
+%if 0%{?rhel}
+pushd third_party/node/linux
+tar xf %{SOURCE19}
+mv node-v8.9.1-linux-x64 node-linux-x64
+popd
+%else
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
+%endif
# Remove most of the bundled libraries. Libraries specified below (taken from
# Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
5 years, 3 months
[chromium-freeworld/el7] RHEL 7s nodejs is too old, do not use it in the buildroot
by Akarshan Biswas
commit fe161e5f32d2725bf16be9544a15251dc51646a1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Dec 20 12:35:41 2018 -0500
RHEL 7s nodejs is too old, do not use it in the buildroot
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 3228fe4..068f89c 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -383,7 +383,10 @@ BuildRequires: minizip-compat-devel
%else
BuildRequires: minizip-devel
%endif
+# RHEL 7's nodejs is too old
+%if 0%{?fedora}
BuildRequires: nodejs
+%endif
BuildRequires: nss-devel >= 3.26
BuildRequires: pciutils-devel
BuildRequires: pulseaudio-libs-devel
5 years, 3 months
[chromium-freeworld/el7] okay, lets try this
by Akarshan Biswas
commit 0b9f96a4b69ce43cdae44707b7c0e15e30e0c85f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Dec 20 09:53:41 2018 -0500
okay, lets try this
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-71.0.3578.98-el7-fix-noexcept.patch | 12 ++++++++++++
chromium-freeworld.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-freeworld.spec b/chromium-freeworld.spec
index c781fbb..3228fe4 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.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, 3 months
[chromium-freeworld/el7] Use a variable for the DTS version
by Akarshan Biswas
commit cdb9f1e3bdebd5fa50c1d96709d13e4520699adc
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Thu Dec 20 07:25:26 2018 +0100
Use a variable for the DTS version
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 58649cf..c781fbb 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.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, 3 months
[chromium-freeworld/el7] more hardcoded devtoolset versions
by Akarshan Biswas
commit f830685c1c9cfbb8bc24b7bd6cd0050f681cdf1f
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Dec 19 15:59:47 2018 -0500
more hardcoded devtoolset versions
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index db4d811..58649cf 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.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, 3 months
[chromium-freeworld/el7] need to use devtoolset-8-*. I love hardcoded versions in package names.
by Akarshan Biswas
commit 9c67fa4c62849c331104c67944e2dae6780013da
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.
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
chromium-freeworld.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 3378c6d..db4d811 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.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, 3 months
[chromium-freeworld/el7] 71.0.3578.98
by Akarshan Biswas
commit f6e9054044b98be166247e58ed4841d45a281154
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Dec 18 15:12:33 2018 -0500
71.0.3578.98
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
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-freeworld.spec | 56 +++++++++------
8 files changed, 272 insertions(+), 22 deletions(-)
---
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-freeworld.spec b/chromium-freeworld.spec
index d12f220..3378c6d 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.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)
5 years, 3 months
[chromium-freeworld/el7] Add relax libva version check patch
by Akarshan Biswas
commit 6336c806f70ce3809464b636d702687ee516a9af
Author: Akarshan Biswas <akarshanbiswas(a)akarshan-desk.biswasab.org>
Date: Tue Dec 11 12:42:50 2018 +0530
Add relax libva version check patch
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)gmail.com>
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, 3 months