rpmfusion-commits
October 2019
rpmfusion-commits@lists.rpmfusion.org
- 18 participants
- 471 discussions
[chromium-browser-privacy: 16/103] Update to 71.0.3578.80 Add a patch to fix libva version mismatch error Re bundle re2 as it's ancient
by qvint
commit a99d631cebfe62aa8fd9a2212e5a1fea9b3a0f47
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Tue Dec 11 01:29:23 2018 -0500
Update to 71.0.3578.80
Add a patch to fix libva version mismatch error
Re bundle re2 as it's ancient on Fedora
Enable experimental support for wayland-ozone in the spec file (WIP; disabled by default)
Bring patch definitions closer to %prep so to find and apply patches easier.
.gitignore | 1 +
ccompiler.patch | 170 +++++++++++++++++++++++++++++++++++++++++++
chromium-71-gcc-fix.patch | 57 +++++++++++++++
chromium-gcc8-r588316.patch | 98 -------------------------
chromium-gcc8-r588547.patch | 30 --------
chromium-gcc8-r589614.patch | 37 ----------
chromium-gn-r607596.patch | 19 +++--
chromium-vaapi.spec | 146 +++++++++++++++++++++++++------------
enable-vaapi.patch | 56 +++++++-------
unrar.patch => nounrar.patch | 38 +++++++---
py2-bootstrap.patch | 32 ++++----
relax-libva-version.patch | 56 ++++++++++++++
sources | 2 +-
widevine.patch | 30 +++-----
14 files changed, 478 insertions(+), 294 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d8ec4bb..3b3f465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/chromium-70.0.3538.77.tar.xz
/chromium-70.0.3538.102.tar.xz
/chromium-70.0.3538.110.tar.xz
+/chromium-71.0.3578.80.tar.xz
diff --git a/ccompiler.patch b/ccompiler.patch
new file mode 100644
index 0000000..db8d046
--- /dev/null
+++ b/ccompiler.patch
@@ -0,0 +1,170 @@
+From cec10e55fdb150b33342ad462907fb6202de364e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym(a)gentoo.org>
+Date: Wed, 25 Apr 2018 13:22:49 -0400
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 63 ++++++++++------------------------
+ 1 file changed, 18 insertions(+), 45 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 0f7a6b48f7b2..c91b702147d4 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -236,8 +236,6 @@ config("compiler") {
+
+ configs += [
+ # See the definitions below.
+- ":clang_revision",
+- ":compiler_cpu_abi",
+ ":compiler_codegen",
+ ]
+
+@@ -502,17 +500,6 @@ config("compiler") {
+ }
+ }
+
+- if (is_clang && !is_nacl && !use_xcode_clang) {
+- cflags += [
+- # TODO(hans): Remove this once Clang generates better optimized debug info
+- # by default. https://crbug.com/765793
+- "-Xclang",
+- "-mllvm",
+- "-Xclang",
+- "-instcombine-lower-dbg-declare=0",
+- ]
+- }
+-
+ # Print absolute paths in diagnostics. There is no precedent for doing this
+ # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
+ # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
+@@ -1498,13 +1485,6 @@ config("default_warnings") {
+ cflags += [
+ # TODO(thakis): https://crbug.com/753973
+ "-Wno-enum-compare-switch",
+-
+- # Ignore warnings about MSVC optimization pragmas.
+- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+- "-Wno-ignored-pragma-optimize",
+-
+- # TODO(hans): https://crbug.com/890307
+- "-Wno-defaulted-function-deleted",
+ ]
+ }
+ }
+@@ -1546,22 +1526,6 @@ config("chromium_code") {
+ "__STDC_FORMAT_MACROS",
+ ]
+
+- if (!is_debug && !using_sanitizer &&
+- (!is_linux || !is_clang || is_official_build) &&
+- current_cpu != "s390x" && current_cpu != "s390" &&
+- current_cpu != "ppc64" && current_cpu != "ppc64" &&
+- current_cpu != "mips" && current_cpu != "mips64") {
+- # _FORTIFY_SOURCE isn't really supported by Clang now, see
+- # http://llvm.org/bugs/show_bug.cgi?id=16821.
+- # It seems to work fine with Ubuntu 12 headers though, so use it in
+- # official builds.
+- #
+- # Non-chromium code is not guaranteed to compile cleanly with
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+- # disabled, so only do that for Release build.
+- defines += [ "_FORTIFY_SOURCE=2" ]
+- }
+-
+ if (is_mac) {
+ cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+ cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -1931,7 +1895,8 @@ config("default_stack_frames") {
+ }
+
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+ if (is_win) {
+ # TODO(thakis): Remove is_clang here, https://crbug.com/598772
+ if (is_official_build && full_wpo_on_official && !is_clang) {
+@@ -1965,7 +1930,8 @@ config("optimize") {
+ }
+
+ # Same config as 'optimize' but without the WPO flag.
+-config("optimize_no_wpo") {
++config("optimize_no_wpo") { }
++config("xoptimize_no_wpo") {
+ if (is_win) {
+ # Favor size over speed, /O1 must be before the common flags. The GYP
+ # build also specifies /Os and /GF but these are implied by /O1.
+@@ -1988,7 +1954,8 @@ config("optimize_no_wpo") {
+ }
+
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+ if (is_win) {
+ cflags = [
+ "/Od", # Disable optimization.
+@@ -2012,7 +1979,8 @@ config("no_optimize") {
+ # Turns up the optimization level. On Windows, this implies whole program
+ # optimization and link-time code generation which is very expensive and should
+ # be used sparingly.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+ if (is_nacl && is_nacl_irt) {
+ # The NaCl IRT is a special case and always wants its own config.
+ # Various components do:
+@@ -2059,7 +2027,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+ if (is_nacl && is_nacl_irt) {
+ # The NaCl IRT is a special case and always wants its own config.
+ # Various components do:
+@@ -2097,7 +2066,8 @@ config("optimize_speed") {
+ }
+ }
+
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+ cflags = [ "-O1" ] + common_optimize_on_cflags
+ ldflags = common_optimize_on_ldflags
+ visibility = [ ":default_optimization" ]
+@@ -2183,7 +2153,8 @@ config("afdo") {
+ # configs += [ "//build/config/compiler:symbols" ]
+
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+ if (is_win) {
+ if (use_goma || is_clang) {
+ # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
+@@ -2281,7 +2252,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+ if (is_win) {
+ # Linker symbols for backtraces only.
+ cflags = []
+@@ -2321,7 +2293,8 @@ config("minimal_symbols") {
+ }
+
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+ if (!is_win) {
+ cflags = [ "-g0" ]
+ asmflags = cflags
+--
+2.19.1
+
diff --git a/chromium-71-gcc-fix.patch b/chromium-71-gcc-fix.patch
new file mode 100644
index 0000000..711b827
--- /dev/null
+++ b/chromium-71-gcc-fix.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-gn-r607596.patch b/chromium-gn-r607596.patch
index 836e3cf..a1d4712 100644
--- a/chromium-gn-r607596.patch
+++ b/chromium-gn-r607596.patch
@@ -1,4 +1,4 @@
-From 4849d9a19f700961e2c25b642bdaaa6514040e60 Mon Sep 17 00:00:00 2001
+From c779208380972b546c1e1ed6d5f8475fd12f6520 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
Date: Tue, 13 Nov 2018 15:41:11 +0000
Subject: [PATCH] gn bootstrap: Remove sysroot-related options
@@ -17,9 +17,11 @@ Cr-Commit-Position: refs/heads/master@{#607596}
tools/gn/bootstrap/bootstrap.py | 6 ------
1 file changed, 6 deletions(-)
---- chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py.orig 2018-11-14 06:52:07.000000000 +0800
-+++ chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py 2018-11-15 00:22:05.719552038 +0800
-@@ -46,10 +46,6 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 261fddde7..1945852c4 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -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)')
@@ -28,9 +30,9 @@ Cr-Commit-Position: refs/heads/master@{#607596}
- action='store_true',
- help='Download and build with the Debian sysroot.')
parser.add_option('-v', '--verbose', help='ignored')
- options, args = parser.parse_args(argv)
- if args:
-@@ -71,8 +67,6 @@
+ parser.add_option(
+ '--skip-generate-buildfiles',
+@@ -76,8 +72,6 @@ def main(argv):
'--no-last-commit-position',
'--out-path=' + gn_build_dir,
]
@@ -39,3 +41,6 @@ Cr-Commit-Position: refs/heads/master@{#607596}
if options.debug:
cmd.append('--debug')
subprocess.check_call(cmd)
+--
+2.19.2
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index e39ad2a..a2a5b8c 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -16,6 +16,9 @@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
+# This package depends on automagic byte compilation
+# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
#Require harfbuzz >= 1.8.6 for hb_font_funcs_set_glyph_h_advances_func
%if 0%{?fedora} >= 29
%bcond_without system_harfbuzz
@@ -40,13 +43,14 @@
%else
%bcond_without system_minizip
%endif
+# Need re2 ver. 2016.07.21 for re2::LazyRE2
+%bcond_with system_re2
+
#Turn on verbose mode
%global debug_logs 1
# Allow compiling with clang
%global clang 0
-#Allow jumbo builds(turned off by default because it consumes too much memory)
-#enabled by default on rawhide for testing
-#Edit it works
+#Allow jumbo builds
# Enabled by default
%global jumbo 1
#------------------------------------------------------
@@ -67,9 +71,11 @@
%else
%global stopgold 0
%endif
+# Enable building with ozone support
+%global ozone 0
##############################Package Definitions######################################
Name: chromium-vaapi
-Version: 70.0.3538.110
+Version: 71.0.3578.80
Release: 1%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
@@ -85,7 +91,7 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-official/c
# scripts included in official Fedora packages are copied, modified, and used
# to automate the repackaging work.
# Get those helper scripts from https://src.fedoraproject.org/rpms/chromium
-# If you don't use Fedora services, Just set the value of freeworld in this spec fil
+# If you don't use Fedora services, Just set the value of freeworld in this spec file
# to 1 to use the upstreanm packaged source.
# The repackaged source tarball used here is produced by:
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
@@ -97,35 +103,7 @@ Source10: %{name}.sh
Source11: %{name}.appdata.xml
#Personal stuff
Source15: LICENSE
-# Enable video acceleration on chromium for Linux
-Patch1: enable-vaapi.patch
-# Enable support for widevine
-Patch2: widevine.patch
-#Will use any clang patch here
-#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
-Patch7: llvm-arflags.patch
-#Gcc patches area.
-#Gcc produces way too many warnings. Try to silence some of it.
-Patch8: silencegcc.patch
-#Fix building with GCC 8
-Patch9: chromium-gcc8-r588316.patch
-Patch10: chromium-gcc8-r588547.patch
-Patch11: chromium-gcc8-r589614.patch
-# More patches to fix chromium build here
-# remove dependency on unrar. That's a nasty code.
-Patch50: unrar.patch
-# Bootstrap still uses python command
-Patch51: py2-bootstrap.patch
-# Fix building with system icu
-Patch52: chromium-system-icu.patch
-# Fix chromium build with harfbuzz 2 in rawhide
-Patch53: chromium-harfbuzz2.patch
-# Let's brand chromium!
-Patch54: brand.patch
-# Disable sysroot related settings
-Patch55: chromium-gn-r607596.patch
-# This build should be only available to amd64
-ExclusiveArch: x86_64
+
########################################################################################
#Compiler settings
%if %{clang}
@@ -153,8 +131,13 @@ BuildRequires: pkgconfig(libffi)
# remove_bundled_libraries.py --do-remove
BuildRequires: python2-rpm-macros
BuildRequires: python2-beautifulsoup4
+BuildRequires: python2-lxml
BuildRequires: python2-html5lib
BuildRequires: python2-markupsafe
+Buildrequires: python2-six
+%if %{with system_re2}
+BuildRequires: re2-devel
+%endif
%if %{with system_ply}
BuildRequires: python2-ply
%endif
@@ -180,7 +163,6 @@ BuildRequires: pkgconfig(libxml-2.0)
%endif
BuildRequires: pkgconfig(libxslt)
BuildRequires: opus-devel
-BuildRequires: re2-devel
BuildRequires: snappy-devel
BuildRequires: yasm
BuildRequires: pciutils-devel
@@ -200,6 +182,42 @@ Recommends: libva-intel-driver%{?_isa}
%if !%{debug_pkg}
%global debug_package %{nil}
%endif
+# This build should be only available to amd64
+ExclusiveArch: x86_64
+# Define Patches here ##
+# Enable video acceleration on chromium for Linux
+Patch1: enable-vaapi.patch
+# Enable support for widevine
+Patch2: widevine.patch
+#Will use any clang patch here
+Patch3: ccompiler.patch
+#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
+Patch7: llvm-arflags.patch
+#Gcc patches area.
+#Gcc produces way too many warnings. Try to silence some of it.
+Patch8: silencegcc.patch
+#Fix building with GCC 8
+Patch9: chromium-71-gcc-fix.patch
+# More patches to fix chromium build here
+# remove dependency on unrar. That's a nasty code.
+Patch50: nounrar.patch
+# Bootstrap still uses python command
+Patch51: py2-bootstrap.patch
+# Fix building with system icu
+Patch52: chromium-system-icu.patch
+# Fix chromium build with harfbuzz 2 in rawhide
+Patch53: chromium-harfbuzz2.patch
+# Let's brand chromium!
+Patch54: brand.patch
+# Disable sysroot related settings
+Patch55: chromium-gn-r607596.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 acceleration 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.
+Patch56: relax-libva-version.patch
+
%description
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
@@ -209,23 +227,25 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
%patch1 -p1 -b .vaapi
%patch2 -p1 -b .widevine
%if %{clang}
+%patch3 -p1 -b .cc
%patch7 -p1 -b .llvmarflags
%else
%patch8 -p1 -b .silencegcc
-%patch9 -p1 -b .r588316
-%patch10 -p1 -b .r588547
-%patch11 -p1 -b .r589614
+%patch9 -p1 -b .gcc
%endif
-%patch50 -p1 -b .unrar
+%patch50 -p1 -b .nounrar
%patch51 -p1 -b .py2boot
%patch52 -p1 -b .icu
%if 0%{?fedora} >= 30
%patch53 -p1 -b .harfbuzz2
%endif
+%if %{freeworld}
%patch54 -p1 -b .brand
+%endif
%patch55 -p1 -b .gn
+%patch56 -p1 -b .relaxva
#Let's change the default shebang of python files.
-find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
+find -depth -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
base/third_party/dmg_fp \
base/third_party/dynamic_annotations \
@@ -312,6 +332,7 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
%endif
third_party/inspector_protocol \
third_party/jinja2 \
+ third_party/jsoncpp \
third_party/jstemplate \
third_party/khronos \
third_party/leveldatabase \
@@ -341,6 +362,9 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
third_party/lzma_sdk \
third_party/mesa \
third_party/metrics_proto \
+%if %{ozone}
+ third_party/minigbm \
+%endif
%if !%{with system_minizip}
third_party/minizip/ \
%endif
@@ -369,6 +393,9 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
third_party/protobuf/third_party/six \
third_party/pyjson5 \
third_party/qcms \
+%if !%{with system_re2}
+ third_party/re2 \
+%endif
third_party/rnnoise \
third_party/s2cellid \
third_party/sfntly \
@@ -379,6 +406,7 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
third_party/smhasher \
third_party/speech-dispatcher \
third_party/spirv-headers \
+ third_party/SPIRV-Tools \
third_party/spirv-tools-angle \
third_party/sqlite \
third_party/swiftshader \
@@ -389,6 +417,9 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
third_party/usrsctp \
third_party/vulkan \
third_party/vulkan-validation-layers \
+%if %{ozone}
+ third_party/wayland \
+%endif
third_party/web-animations-js \
third_party/webdriver \
third_party/WebKit \
@@ -434,7 +465,9 @@ find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env p
%endif
libxslt \
opus \
+%if %{with system_re2}
re2 \
+%endif
snappy \
yasm \
%if %{with system_minizip}
@@ -448,6 +481,7 @@ sed -i '/-static-libstdc++/d' tools/gn/build/gen.py
rmdir third_party/markupsafe
ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
+
%if %{with system_ply}
rmdir third_party/ply
ln -s %{python2_sitelib}/ply third_party/ply
@@ -476,10 +510,10 @@ CBUILDFLAGS="$(echo '%{__global_cflags}' | sed -e 's/-fexceptions//' \
-e 's/-g1record-g1cc-switches//' \
-e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g')"
CXXBUILDFLAGS="$(echo '%{?__global_cxxflags}%{!?__global_cxxflags:%{__global_cflags}}' | sed -e 's/-fexceptions//' \
- -e 's/-Werror=format-security//' \
- -e 's/-pipe//' \
- -e 's/-g1record-g1cc-switches//' \
- -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g')"
+ -e 's/-Werror=format-security//' \
+ -e 's/-pipe//' \
+ -e 's/-g1record-g1cc-switches//' \
+ -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g')"
export CFLAGS="${CBUILDFLAGS}"
export CXXFLAGS="${CXXBUILDFLAGS} -fpermissive"
export LDFLAGS='%{__global_ldflags}'
@@ -490,9 +524,9 @@ export CXXFLAGS=$CXXFLAGS" -fpermissive"
gn_args=(
is_debug=false
use_vaapi=true
- enable_swiftshader=false
is_component_build=false
use_sysroot=false
+ enable_swiftshader=false
use_custom_libcxx=false
use_aura=true
'system_libdir="%{_lib}"'
@@ -550,6 +584,19 @@ gn_args+=(
concurrent_links=1
%endif
)
+
+
+# Ozone stuff
+gn_args+=(
+%if %{ozone}
+ use_ozone=true
+ ozone_auto_platforms=true
+ ozone_platform_wayland=true
+ use_xkbcommon=true
+%endif
+)
+
+
#symbol
gn_args+=(
%if %{debug_pkg}
@@ -645,8 +692,15 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Thu Dec 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 71.0.3578.80-1
+- Update to 71.0.3578.80
+- Add a patch to fix libva version mismatch error
+- Re bundle re2 as it's ancient on Fedora
+- Enable experimental support for wayland-ozone in the spec file (WIP; disabled by default)
+- Bring patch definitions closer to %%prep so to find and apply patches easier.
+
* Mon Nov 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.110-1
-- Update to 70.0.3538.110
+- Update to 70.0.3538.110
* Thu Nov 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-2
- Add a patch from upstream to remove sysroot-related options from gn bootstrap
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
diff --git a/unrar.patch b/nounrar.patch
similarity index 88%
rename from unrar.patch
rename to nounrar.patch
index 5951ab4..d4e680c 100644
--- a/unrar.patch
+++ b/nounrar.patch
@@ -1,8 +1,23 @@
+From 136a79606fb83485e6c10257bb2e970d306c6f5f Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <biswasab(a)akarshans-desk.biswasab.org>
+Date: Thu, 6 Dec 2018 12:53:47 +0530
+Subject: [PATCH] Don't use unrar
+
+---
+ .../check_client_download_request.cc | 69 -------------------
+ .../check_client_download_request.h | 1 -
+ chrome/common/safe_browsing/BUILD.gn | 2 -
+ chrome/services/file_util/public/cpp/BUILD.gn | 3 -
+ .../public/mojom/safe_archive_analyzer.mojom | 5 --
+ .../file_util/safe_archive_analyzer.cc | 9 ---
+ .../file_util/safe_archive_analyzer.h | 2 -
+ 7 files changed, 91 deletions(-)
+
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-index f5aaff83c87a..737e168ec5aa 100644
+index d1413bb1d..ec337e92c 100644
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -379,10 +379,6 @@ void CheckClientDownloadRequest::AnalyzeFile() {
+@@ -380,10 +380,6 @@ void CheckClientDownloadRequest::AnalyzeFile() {
// are enabled.
if (item_->GetTargetFilePath().MatchesExtension(FILE_PATH_LITERAL(".zip"))) {
StartExtractZipFeatures();
@@ -13,7 +28,7 @@ index f5aaff83c87a..737e168ec5aa 100644
#if defined(OS_MACOSX)
} else if (item_->GetTargetFilePath().MatchesExtension(
FILE_PATH_LITERAL(".dmg")) ||
-@@ -499,71 +495,6 @@ void CheckClientDownloadRequest::ExtractFileFeatures(
+@@ -500,71 +496,6 @@ void CheckClientDownloadRequest::ExtractFileFeatures(
OnFileFeatureExtractionDone();
}
@@ -86,7 +101,7 @@ index f5aaff83c87a..737e168ec5aa 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(item_); // Called directly from Start(), item should still exist.
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
-index 9042d5d589ab..1c50dcff4312 100644
+index ae0f6fbe4..b74dde031 100644
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
@@ -148,7 +148,6 @@ class CheckClientDownloadRequest
@@ -98,7 +113,7 @@ index 9042d5d589ab..1c50dcff4312 100644
base::TimeTicks rar_analysis_start_time_;
base::TimeTicks zip_analysis_start_time_;
diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
-index 92cc4f57d03b..4780e931e9e7 100644
+index f971c742a..33f7c9d31 100644
--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
@@ -68,7 +68,6 @@ if (safe_browsing_mode == 1) {
@@ -109,7 +124,7 @@ index 92cc4f57d03b..4780e931e9e7 100644
]
defines = [
-@@ -121,7 +120,6 @@ source_set("safe_browsing") {
+@@ -136,7 +135,6 @@ source_set("safe_browsing") {
deps += [
":archive_analyzer_results",
":download_protection_util",
@@ -118,7 +133,7 @@ index 92cc4f57d03b..4780e931e9e7 100644
]
diff --git a/chrome/services/file_util/public/cpp/BUILD.gn b/chrome/services/file_util/public/cpp/BUILD.gn
-index 158cbfc6d157..6d8b0df7c59e 100644
+index 158cbfc6d..6d8b0df7c 100644
--- a/chrome/services/file_util/public/cpp/BUILD.gn
+++ b/chrome/services/file_util/public/cpp/BUILD.gn
@@ -14,8 +14,6 @@ source_set("cpp") {
@@ -139,7 +154,7 @@ index 158cbfc6d157..6d8b0df7c59e 100644
]
diff --git a/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom b/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
-index 6983f7b415d4..15d5aaba3657 100644
+index 6983f7b41..15d5aaba3 100644
--- a/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
+++ b/chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom
@@ -22,11 +22,6 @@ interface SafeArchiveAnalyzer {
@@ -155,7 +170,7 @@ index 6983f7b415d4..15d5aaba3657 100644
[Native]
diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
-index a13b42b197b3..db49c37b9b49 100644
+index a13b42b19..db49c37b9 100644
--- a/chrome/services/file_util/safe_archive_analyzer.cc
+++ b/chrome/services/file_util/safe_archive_analyzer.cc
@@ -44,12 +44,3 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile(base::File dmg_file,
@@ -172,7 +187,7 @@ index a13b42b197b3..db49c37b9b49 100644
- std::move(callback).Run(results);
-}
diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
-index f21efa6f57ba..2eda4f378bcc 100644
+index f21efa6f5..2eda4f378 100644
--- a/chrome/services/file_util/safe_archive_analyzer.h
+++ b/chrome/services/file_util/safe_archive_analyzer.h
@@ -25,8 +25,6 @@ class SafeArchiveAnalyzer : public chrome::mojom::SafeArchiveAnalyzer {
@@ -184,3 +199,6 @@ index f21efa6f57ba..2eda4f378bcc 100644
const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
+--
+2.19.2
+
diff --git a/py2-bootstrap.patch b/py2-bootstrap.patch
index 8a5db71..9d83256 100644
--- a/py2-bootstrap.patch
+++ b/py2-bootstrap.patch
@@ -1,7 +1,7 @@
-diff -up chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
---- chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-09-06 10:45:17.919774145 -0400
-+++ chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-09-06 10:45:17.914774254 -0400
-@@ -58,7 +58,7 @@ def _MinifyJS(input_js):
+diff -urN chromium-71.0.3578.30.orig/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py chromium-71.0.3578.30/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+--- chromium-71.0.3578.30.orig/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-11-08 14:32:09.783181849 +0300
++++ chromium-71.0.3578.30/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-11-08 14:32:47.160705794 +0300
+@@ -58,7 +58,7 @@
with tempfile.NamedTemporaryFile() as _:
args = [
@@ -10,7 +10,7 @@ diff -up chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulca
rjsmin_path
]
p = subprocess.Popen(args,
-@@ -177,7 +177,7 @@ def _MinifyCSS(css_text):
+@@ -177,7 +177,7 @@
os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py'))
with tempfile.NamedTemporaryFile() as _:
@@ -19,15 +19,15 @@ diff -up chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulca
p = subprocess.Popen(rcssmin_args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
-diff -up chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py
---- chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 2018-09-06 10:44:42.225550561 -0400
-+++ chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py 2018-09-06 13:06:24.251636231 -0400
-@@ -87,7 +87,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 -urN chromium-71.0.3578.30.orig/tools/gn/bootstrap/bootstrap.py chromium-71.0.3578.30/tools/gn/bootstrap/bootstrap.py
+--- chromium-71.0.3578.30.orig/tools/gn/bootstrap/bootstrap.py 2018-11-08 14:33:17.817140200 +0300
++++ chromium-71.0.3578.30/tools/gn/bootstrap/bootstrap.py 2018-11-08 14:33:21.274189185 +0300
+@@ -93,7 +93,7 @@
+ if not options.debug:
+ gn_gen_args += ' is_debug=false'
+ subprocess.check_call([
+- gn_path, 'gen', out_dir,
++ gn_path, 'gen', '--script-executable=/usr/bin/python2', out_dir,
+ '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
+ ])
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;
diff --git a/sources b/sources
index 12f78f5..4e2d3b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f45eadcee2101b1e3f57c98765616d14 chromium-70.0.3538.110.tar.xz
+2cd599a74930294cd01fa79d6ada2198 chromium-71.0.3578.80.tar.xz
diff --git a/widevine.patch b/widevine.patch
index 2fc8d79..4a9f78f 100644
--- a/widevine.patch
+++ b/widevine.patch
@@ -1,23 +1,11 @@
-diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
---- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200
-+++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200
-@@ -12,4 +12,6 @@
+Index: chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
+===================================================================
+--- chromium-71.0.3573.0.orig/third_party/widevine/cdm/widevine_cdm_version.h
++++ chromium-71.0.3573.0/third_party/widevine/cdm/widevine_cdm_version.h
+@@ -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"
- #define WIDEVINE_CDM_AVAILABLE
-
-+#define WIDEVINE_CDM_VERSION_STRING "67"
-+
- #endif // WIDEVINE_CDM_VERSION_H_
#endif // WIDEVINE_CDM_VERSION_H_
-
---- a/third_party/widevine/cdm/BUILD.gn
-+++ b/third_party/widevine/cdm/BUILD.gn
-@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
- # Internal Cast builds set enable_widevine=true to bring in Widevine support.
- # TODO(xhwang): Support component updated CDM on other platforms and remove this
- # assert.
--assert(!enable_widevine || is_win || is_mac || is_chromecast,
-+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
- "Component updated CDM only supported on Windows and Mac for now.")
-
- widevine_arch = current_cpu
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 15/103] Update to 70.0.3538.110
by qvint
commit 1829f0debb67fc329ea025d8164f8d6192539e52
Author: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
Date: Mon Nov 26 10:38:32 2018 +0530
Update to 70.0.3538.110
.gitignore | 1 +
chromium-vaapi.spec | 9 +++++----
sources | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b0b2fb..d8ec4bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/chromium-70.0.3538.67.tar.xz
/chromium-70.0.3538.77.tar.xz
/chromium-70.0.3538.102.tar.xz
+/chromium-70.0.3538.110.tar.xz
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index e53c34e..e39ad2a 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -69,8 +69,8 @@
%endif
##############################Package Definitions######################################
Name: chromium-vaapi
-Version: 70.0.3538.102
-Release: 2%{?dist}
+Version: 70.0.3538.110
+Release: 1%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -98,8 +98,6 @@ Source11: %{name}.appdata.xml
#Personal stuff
Source15: LICENSE
# Enable video acceleration on chromium for Linux
-# Enabled video decode acceleration and webrtc encode acceleration(flag disabled by default)
-# Used existing flag instead of creating a new one
Patch1: enable-vaapi.patch
# Enable support for widevine
Patch2: widevine.patch
@@ -647,6 +645,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Mon Nov 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.110-1
+- Update to 70.0.3538.110
+
* Thu Nov 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-2
- Add a patch from upstream to remove sysroot-related options from gn bootstrap
diff --git a/sources b/sources
index 9cf6548..12f78f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15ca8a928ea8a63494d0b12ac16ef2d4 chromium-70.0.3538.102.tar.xz
+f45eadcee2101b1e3f57c98765616d14 chromium-70.0.3538.110.tar.xz
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 14/103] Add a patch from upstream to remove sysroot-related options from gn bootstrap
by qvint
commit f845271df7cd0e1ee779802d633198d3ac2e70e1
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Thu Nov 15 00:18:29 2018 +0530
Add a patch from upstream to remove sysroot-related options from gn bootstrap
chromium-gn-r607596.patch | 41 +++++++++++++++++++++++++++++++++++++++++
chromium-vaapi.spec | 8 +++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/chromium-gn-r607596.patch b/chromium-gn-r607596.patch
new file mode 100644
index 0000000..836e3cf
--- /dev/null
+++ b/chromium-gn-r607596.patch
@@ -0,0 +1,41 @@
+From 4849d9a19f700961e2c25b642bdaaa6514040e60 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Date: Tue, 13 Nov 2018 15:41:11 +0000
+Subject: [PATCH] gn bootstrap: Remove sysroot-related options
+
+https://gn-review.googlesource.com/c/gn/+/3200 removed the --no-sysroot
+option from gen.py and moved to only use a sysroot in the GN bots, so the
+options here no longer have any effect.
+
+Bug: 904350
+Change-Id: Ieddc71a4f8f802c2d050de1c69ca3a9ec788ee88
+Reviewed-on: https://chromium-review.googlesource.com/c/1333391
+Reviewed-by: Nico Weber <thakis(a)chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com>
+Cr-Commit-Position: refs/heads/master@{#607596}
+---
+ tools/gn/bootstrap/bootstrap.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py.orig 2018-11-14 06:52:07.000000000 +0800
++++ chromium-70.0.3538.102/tools/gn/bootstrap/bootstrap.py 2018-11-15 00:22:05.719552038 +0800
+@@ -46,10 +46,6 @@
+ '--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')
+ options, args = parser.parse_args(argv)
+ if args:
+@@ -71,8 +67,6 @@
+ '--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-vaapi.spec b/chromium-vaapi.spec
index b200cec..e53c34e 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.102
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -124,6 +124,8 @@ Patch52: chromium-system-icu.patch
Patch53: chromium-harfbuzz2.patch
# Let's brand chromium!
Patch54: brand.patch
+# Disable sysroot related settings
+Patch55: chromium-gn-r607596.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -223,6 +225,7 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
%patch53 -p1 -b .harfbuzz2
%endif
%patch54 -p1 -b .brand
+%patch55 -p1 -b .gn
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -644,6 +647,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Thu Nov 15 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-2
+- Add a patch from upstream to remove sysroot-related options from gn bootstrap
+
* Wed Nov 14 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-1
- Update to 70.0.3538.102
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 13/103] Update to 70.0.3538.102
by qvint
commit 764a3f6e6a6e7ca61afec0f8f85be709b6dd3cbd
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 14 19:08:07 2018 +0530
Update to 70.0.3538.102
.gitignore | 1 +
chromium-vaapi.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3b2d70..9b0b2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/chromium-69.0.3497.100.tar.xz
/chromium-70.0.3538.67.tar.xz
/chromium-70.0.3538.77.tar.xz
+/chromium-70.0.3538.102.tar.xz
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 5395239..b200cec 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -69,8 +69,8 @@
%endif
##############################Package Definitions######################################
Name: chromium-vaapi
-Version: 70.0.3538.77
-Release: 4%{?dist}
+Version: 70.0.3538.102
+Release: 1%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -644,6 +644,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 14 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.102-1
+- Update to 70.0.3538.102
+
* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong.
diff --git a/sources b/sources
index d44eb6b..9cf6548 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
+15ca8a928ea8a63494d0b12ac16ef2d4 chromium-70.0.3538.102.tar.xz
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 12/103] Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
by qvint
commit 198824687d5270c7260e463fac7894961e7e1c24
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 19:25:09 2018 +0530
Switch to %%setup from %%autosetup because adding conditions on patch defines is wrong
chromium-vaapi.spec | 30 +++++++++++++++++++++++-------
llvm-arflags.patch | 26 ++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 7 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index b63518c..5395239 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -103,11 +103,9 @@ Source15: LICENSE
Patch1: enable-vaapi.patch
# Enable support for widevine
Patch2: widevine.patch
-%if %{clang}
#Will use any clang patch here
#Fix breaking builds caused by gcc_ar_wrapper.py from upstream
Patch7: llvm-arflags.patch
-%else
#Gcc patches area.
#Gcc produces way too many warnings. Try to silence some of it.
Patch8: silencegcc.patch
@@ -115,7 +113,6 @@ Patch8: silencegcc.patch
Patch9: chromium-gcc8-r588316.patch
Patch10: chromium-gcc8-r588547.patch
Patch11: chromium-gcc8-r589614.patch
-%endif
# More patches to fix chromium build here
# remove dependency on unrar. That's a nasty code.
Patch50: unrar.patch
@@ -123,10 +120,8 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
-%if 0%{?fedora} >= 30
# Fix chromium build with harfbuzz 2 in rawhide
Patch53: chromium-harfbuzz2.patch
-%endif
# Let's brand chromium!
Patch54: brand.patch
# This build should be only available to amd64
@@ -209,7 +204,25 @@ Recommends: libva-intel-driver%{?_isa}
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
%prep
-%autosetup -n chromium-%{version} -p1
+%setup -q -n chromium-%{version}
+## Apply patches here ##
+%patch1 -p1 -b .vaapi
+%patch2 -p1 -b .widevine
+%if %{clang}
+%patch7 -p1 -b .llvmarflags
+%else
+%patch8 -p1 -b .silencegcc
+%patch9 -p1 -b .r588316
+%patch10 -p1 -b .r588547
+%patch11 -p1 -b .r589614
+%endif
+%patch50 -p1 -b .unrar
+%patch51 -p1 -b .py2boot
+%patch52 -p1 -b .icu
+%if 0%{?fedora} >= 30
+%patch53 -p1 -b .harfbuzz2
+%endif
+%patch54 -p1 -b .brand
#Let's change the default shebang of python files.
find -depth -type f -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@ -631,6 +644,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-4
+- Replace %%autosetup with %%setup and fix spec file because applying condition on patch defines is wrong.
+
* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
- Add a patch to fix building on rawhide with harfbuzz2
diff --git a/llvm-arflags.patch b/llvm-arflags.patch
new file mode 100644
index 0000000..40bc529
--- /dev/null
+++ b/llvm-arflags.patch
@@ -0,0 +1,26 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 08939c54483d..a7008d7278b8 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1688,7 +1688,7 @@ config("thin_archive") {
+ # have a "thin archive" mode (it does accept -T, but it means truncating
+ # archive names to 16 characters, which is not what we want).
+ if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
+- arflags = [ "-T" ]
++ arflags = [ "T" ]
+ }
+ }
+
+diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
+index e7c88708c366..bdb8ab4d36a0 100644
+--- a/build/toolchain/gcc_toolchain.gni
++++ b/build/toolchain/gcc_toolchain.gni
+@@ -336,7 +336,7 @@ template("gcc_toolchain") {
+ } else {
+ rspfile = "{{output}}.rsp"
+ rspfile_content = "{{inputs}}"
+- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\""
+ }
+
+ # Remove the output file first so that ar doesn't try to modify the
5 years, 1 month
- 1
- 0
[chromium-browser-privacy/f31] (103 commits) ...Merge branch 'f30' into f31
by qvint
Summary of changes:
2012613... Initial setup of the repo (*)
444bbe5... Remove dependency on minizip-compat package(https://bugzill (*)
e45f345... Rebuild against new libva version on Fedora 29+ (*)
9bea27a... Turn off gold linker since it crashes; Make use of metainfo (*)
eb2287c... Re enable Gold for rawhide (*)
8a9fd2c... Turn off fedora build flags on rawhide (*)
a4eb1cd... Update to 70.0.3538.67 with new vaapi patch (*)
ba7299a... Reduce jumbo_file_merge_limit to a much lower number since (*)
6b14e1f... Update to 70.0.3538.77 Add a patch to fix building with sys (*)
7f8e0b3... Re brand chromium-vaapi and update vaapi patch (*)
d6f0043... Add a patch to fix building with harfbuzz2 on rawhide (*)
1988246... Switch to %%setup from %%autosetup because adding condition (*)
764a3f6... Update to 70.0.3538.102 (*)
f845271... Add a patch from upstream to remove sysroot-related options (*)
1829f0d... Update to 70.0.3538.110 (*)
a99d631... Update to 71.0.3578.80 Add a patch to fix libva version mis (*)
14e8997... Update to 71.0.3578.98 (*)
44e517b... Re enable the non effective enable_widevine flag (*)
95bdf98... Update to 72.0.3626.81 Add a patch to fix missing includes (*)
39ae7ad... Disable gold linker (again); Update didn't fixed the issue. (*)
473eed6... Rebundle icu for fedora 29 and fedora 28; Need icu version (*)
d918bbe... Update to 72.0.3626.109 remove ozone patches (*)
9f27085... Enable webrtc includes patch again. (*)
e57526b... Add fix-the-VA_CHECK_VERSION patch from upstream (*)
2ce345d... Updated to 72.0.3626.121 spec cleanup (*)
147974b... Update to 73.0.3683.75 Update BuildRequires for ozone, libv (*)
eba61dc... Enable pipewire support Added a patch from fedora to fix bu (*)
d76fb61... Add a patch from upstream to stop vsync error spam when run (*)
8b7b9e0... Switched to clang compiler which is supported by upstream (*)
f149ea0... Update to 73.0.3683.86. Disable debug logs. (*)
4d4d9b4... Update source file. (*)
27d8141... Switched to GNU ar and nm to work around a bug in the curre (*)
e953730... Fix date in changelog. (*)
45601a9... Revert switching to GNU ar and nm. (*)
8bf777f... Update to 73.0.3683.103. (*)
5e4b736... Update to 73.0.3683.103. (*)
16c42b6... Add wildcard for gitignore (*)
528cdf6... Removed outdated workarounds for linker and compiler (*)
566b951... Merge branch 'master' of ssh://pkgs.rpmfusion.org/free/chro (*)
8a83ddf... Fixed build with llvm 8. (*)
846be0c... Merge branch 'master' into f30 (*)
84f0bc7... Add MEIPreload in install package (*)
f0dfab7... Update to 74.0.3729.108 Install missing MEIPreload componen (*)
b94d551... Upload new sources (*)
5a043eb... Merge branch 'master' into f30 (*)
4bbccf8... Update to 74.0.3729.131 and spec cleanup (*)
b5ae81c... Merge branch 'master' into f30 (*)
0681269... Add a patch from upstream to Fix window flash for some WMs; (*)
f728a8c... Update to 74.0.3729.157 (*)
0dc6aab... Merge branch 'master' into f30 (*)
f98d107... Update to 74.0.3729.169. (*)
f426b11... Update to 74.0.3729.169. (*)
a16c57f... Merge branch 'master' into f30 (*)
4591d7d... Add patch to Disallow non-buildable sources in binary targe (*)
7d52ac7... Merge branch 'master' into f30 (*)
d8f20b8... Update to 75.0.3770.80 (*)
b76762b... Upload new sources (*)
51b388c... Use %autosetup and switch back to GCC (build fails on clang (*)
5eaf680... Update to 75.0.3770.90 Re bundle icu; requires 64 and up Us (*)
836f1f3... Use linux/sockios.h instead of sys/socket.h (linux 5.2) (*)
7bf836e... Merge branch 'master' into f30 (*)
2742ca6... Update to 75.0.3770.100. (*)
4b7d14f... Merge branch 'master' into f30 (*)
da49c06... Fix vaapi regression on few intel devices, disabled vaapi p (*)
e9e9fcd... Merge branch 'master' into f30 (*)
24e2c81... Remove the orig file (*)
641d58d... Remove the orig file (*)
7f157b7... Update to 75.0.3770.142 Removed Nvidia GPU video decode bla (*)
c3570e3... Merge branch 'master' into f30 (*)
bac7d04... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
ca1f5b4... Update to 76.0.3809.100 (*)
90547a9... Add a patch to fix Unrar wrapper (*)
b0a2aed... Remove the no unrar patch (*)
9475c8a... Use unrar, it is free software and license permits to be fr (*)
61d5af5... Add third_party/unrar (*)
7225b60... Merge branch 'master' into f30 (*)
138fb15... Fix a bug which causes chromium to reject certificates by t (*)
ba193ad... Merge branch 'master' into f30 (*)
7158681... Update to 76.0.3809.132 (*)
b65c857... Merge branch 'master' into f30 (*)
4fb0363... Correct writting either RPM Fusion or rpmfusion (*)
97b636a... Update to 77.0.3865.90 Disabled Nvidia support (*)
7b33c54... Use the bundled python2 as python2 is going to be removed f (*)
58a9a8f... Add build requires: /usr/bin/python2 (*)
08af7c1... Preserve bundled pylibs (*)
fee2c1b... Apply ungoogled-chromium modifications (*)
9bd4d86... Rename to chromium-browser-privacy (*)
6724e3f... Rebundle harfbuzz (*)
0257b50... Enable Shiftshader support (*)
5b41de2... Revert "Rebundle harfbuzz" (*)
9d56b6c... Add patch from upstream to fix building with system harfbuz (*)
88571ef... Restart the changelog (*)
578480c... Merge branch 'master' into f30 (*)
532a378... Merge branch 'chromium-vaapi-f30' into chromium-browser-pri (*)
d297586... Rebundle syslibs on older Fedoras (*)
55586db... Update to 77.0.3865.120 (*)
c1aa6a5... Upload: New Sources (*)
8d976e2... Remove: blink symbol level gn flag, use the default option (*)
e01e3e3... Merge branch 'f30' (*)
54087a4... Merge branch 'chromium-vaapi-f30' into chromium-browser-pri (*)
a2f9717... Merge branch 'chromium-vaapi-f31' into chromium-browser-pri (*)
0716825... Import sources with full history (*)
d96de2d... Merge branch 'f30' into f31 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 11/103] Add a patch to fix building with harfbuzz2 on rawhide
by qvint
commit d6f0043fec579ffc8a26dae855af7d560ae570f6
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 17:00:18 2018 +0530
Add a patch to fix building with harfbuzz2 on rawhide
chromium-vaapi.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 53162ca..b63518c 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -631,7 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
-* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-3
+- Add a patch to fix building on rawhide with harfbuzz2
+
+* Tue Nov 06 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
- Use correct branding in chromium
- update vaapi patch
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 10/103] Re brand chromium-vaapi and update vaapi patch
by qvint
commit 7f8e0b3d0d3ff2c924257f9e6d84a312c968de50
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Wed Nov 7 16:35:02 2018 +0530
Re brand chromium-vaapi and update vaapi patch
brand.patch | 25 +++++++++
chromium-harfbuzz2.patch | 80 +++++++++++++++++++++++++++
chromium-vaapi.spec | 14 ++++-
enable-vaapi.patch | 139 +++++++++++++++++++++++++++++------------------
4 files changed, 204 insertions(+), 54 deletions(-)
---
diff --git a/brand.patch b/brand.patch
new file mode 100644
index 0000000..002c423
--- /dev/null
+++ b/brand.patch
@@ -0,0 +1,25 @@
+From bfff7b95bb4d9ff20a3a67191dfffe25334f9dca Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshan.biswas(a)gmail.com>
+Date: Wed, 7 Nov 2018 16:29:01 +0530
+Subject: [PATCH] Let's brand chromium-vaapi
+
+---
+ components/version_ui_strings.grdp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/version_ui_strings.grdp b/components/version_ui_strings.grdp
+index 6278a8a38..1611b4c80 100644
+--- a/components/version_ui_strings.grdp
++++ b/components/version_ui_strings.grdp
+@@ -7,7 +7,7 @@
+ Official Build
+ </message>
+ <message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page">
+- Developer Build
++ RPMFusion Build
+ </message>
+ <message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page">
+ (32-bit)
+--
+2.19.1
+
diff --git a/chromium-harfbuzz2.patch b/chromium-harfbuzz2.patch
new file mode 100644
index 0000000..2d5602d
--- /dev/null
+++ b/chromium-harfbuzz2.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster(a)gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 95aff15..53162ca 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -70,7 +70,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.77
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -123,6 +123,12 @@ Patch50: unrar.patch
Patch51: py2-bootstrap.patch
# Fix building with system icu
Patch52: chromium-system-icu.patch
+%if 0%{?fedora} >= 30
+# Fix chromium build with harfbuzz 2 in rawhide
+Patch53: chromium-harfbuzz2.patch
+%endif
+# Let's brand chromium!
+Patch54: brand.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -437,7 +443,7 @@ mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
# Hard code extra version
FILE=chrome/common/channel_info_posix.cc
-sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi Fedora Project"/' $FILE
+sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"chromium-vaapi"/' $FILE
#####################################BUILD#############################################
%build
#export compilar variables
@@ -625,6 +631,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Wed Nov 07 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-2
+- Use correct branding in chromium
+- update vaapi patch
+
* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
- Update to 70.0.3538.77
- Add a patch to fix building with system libicu
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 2cb451e..6211000 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -1,46 +1,25 @@
-From a4d39ad4677cbc83c5e32a205d25c27beb84e13c Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
-Date: Fri, 19 Oct 2018 19:19:44 +0530
-Subject: [PATCH] Enable hardware video decoding and encoding using libva vaapi
+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 | 6 +++---
- chrome/browser/flag_descriptions.h | 8 ++++++--
+ 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 | 5 +++++
+ content/gpu/BUILD.gn | 6 ++++++
content/gpu/gpu_main.cc | 4 ++--
- gpu/config/software_rendering_list.json | 11 -----------
+ 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, 34 insertions(+), 28 deletions(-)
+ 10 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index d029d0648..942f3627b 100644
+index d029d0648..39df8d6cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -1386,18 +1386,18 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kUiPartialSwapDescription, kOsAll,
- SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
- {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-- flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
- {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
- flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
- {"enable-webrtc-hw-h264-encoding",
- flag_descriptions::kWebrtcHwH264EncodingName,
-- flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWH264Encoding)},
- {"enable-webrtc-hw-vp8-encoding",
- flag_descriptions::kWebrtcHwVP8EncodingName,
-- flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS,
-+ flag_descriptions::kWebrtcHwVP8EncodingDescription, kOsAndroid | kOsCrOS | kOsLinux,
- FEATURE_VALUE_TYPE(features::kWebRtcHWVP8Encoding)},
- #if !defined(OS_ANDROID)
- {"enable-webrtc-remote-event-log",
@@ -1775,7 +1775,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -66,8 +45,25 @@ index d029d0648..942f3627b 100644
{"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
flag_descriptions::kV8CacheOptionsDescription, kOsAll,
MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
+@@ -4444,12 +4444,14 @@ const FeatureEntry kFeatureEntries[] = {
+ "AutofillDropdownLayout")},
+ #endif // OS_ANDROID
+
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+ {"enable-vaapi-jpeg-image-decode-acceleration",
+ flag_descriptions::kVaapiJpegImageDecodeAccelerationName,
+- flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS,
++ flag_descriptions::kVaapiJpegImageDecodeAccelerationDescription, kOsCrOS | kOsLinux,
+ FEATURE_VALUE_TYPE(features::kVaapiJpegImageDecodeAcceleration)},
++#endif
+
++#if defined(OS_CHROMEOS)
+ {"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..b53567008 100644
+index 0cb812619..df8ecb24e 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3053,9 +3053,9 @@ const char kTextSuggestionsTouchBarDescription[] =
@@ -75,46 +71,84 @@ index 0cb812619..b53567008 100644
#endif
-// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux-------------------------------------------------------------------
++// Chrome OS and Linux -------------------------------------------------------------------
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -3595,7 +3595,7 @@ const char kZipArchiverUnpackerName[] = "ZIP archiver - Unpacker";
- const char kZipArchiverUnpackerDescription[] =
- "Enable or disable the ability to unpack archives in incognito mode";
-
--#endif // defined(OS_CHROMEOS)
-+#endif // defined(OS_CHROMEOS) defined(OS_LINUX)
+@@ -3063,6 +3063,18 @@ const char kAcceleratedMjpegDecodeDescription[] =
+ "Enable hardware-accelerated mjpeg decode for captured frame where "
+ "available.";
- // Random platform combinations -----------------------------------------------
++const char kVaapiJpegImageDecodeAccelerationName[] =
++ "VA-API JPEG decode acceleration for images";
++const char kVaapiJpegImageDecodeAccelerationDescription[] =
++ "Enable or disable decode acceleration of JPEG images (as opposed to camera"
++ " captures) using the VA-API.";
++
++#endif // defined(OS_CHROMEOS) defined(OS_LINUX) and !defined(OS_ANDROID)
++
++// Only Chrome OS ------------------------------------------------------
++
++#if defined(OS_CHROMEOS)
++
+ 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[] =
+ "Enables Chrome to use the color space information provided by the monitor"
+ " instead of the default sRGB color space.";
+-const char kVaapiJpegImageDecodeAccelerationName[] =
+- "VA-API JPEG decode acceleration for images";
+-const char kVaapiJpegImageDecodeAccelerationDescription[] =
+- "Enable or disable decode acceleration of JPEG images (as opposed to camera"
+- " captures) using the VA-API.";
+-
+ 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..3306c5a27 100644
+index b3c5e5691..14d7e33e9 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,17 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
+@@ -1846,13 +1846,22 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
#endif // defined(OS_MACOSX)
-// Chrome OS ------------------------------------------------------------------
++// 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[];
++extern const char kVaapiJpegImageDecodeAccelerationName[];
++extern const char kVaapiJpegImageDecodeAccelerationDescription[];
++
+#endif
-+// Only Chrome OS ------------------------------------------------------------------
++
++// Chrome OS ----------------------------------------------------------------------
++
+#if defined(OS_CHROMEOS)
+
extern const char kAllowTouchpadThreeFingerClickName[];
extern const char kAllowTouchpadThreeFingerClickDescription[];
+@@ -2158,9 +2167,6 @@ extern const char kUseMashDescription[];
+ extern const char kUseMonitorColorSpaceName[];
+ extern const char kUseMonitorColorSpaceDescription[];
+
+-extern const char kVaapiJpegImageDecodeAccelerationName[];
+-extern const char kVaapiJpegImageDecodeAccelerationDescription[];
+-
+ 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
@@ -129,7 +163,7 @@ index 2196abef4..b4e0a1ae1 100644
// type of process.
thread_options.priority = base::ThreadPriority::DISPLAY;
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
-index 8974e441d..24b7acd3d 100644
+index 8974e441d..d7eba85a9 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
@@ -140,13 +174,14 @@ index 8974e441d..24b7acd3d 100644
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -134,4 +135,8 @@ 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
++
++ # Use vaapi on desktop Linux builds when use_vaapi is set
+ if (is_desktop_linux && use_vaapi) {
-+ public_configs = [ "//media/gpu:libva_config" ]
++ public_configs = [ "//media/gpu:libva_config" ]
+ }
}
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
@@ -253,5 +288,5 @@ index 9ef4730a4..0c3a06c24 100644
}
--
-2.17.2
+2.19.1
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 9/103] Update to 70.0.3538.77 Add a patch to fix building with system libicu
by qvint
commit 6b14e1f1afa1f97b3333f0fc12270470f9b53f38
Author: Akarshan Biswas <akarshan.biswas(a)hotmail.com>
Date: Sat Oct 27 10:37:27 2018 +0530
Update to 70.0.3538.77
Add a patch to fix building with system libicu
.gitignore | 1 +
chromium-system-icu.patch | 11 +++++++++++
chromium-vaapi.spec | 13 ++++++++++---
sources | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 808c350..c3b2d70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/chromium-69.0.3497.100.tar.xz
/chromium-70.0.3538.67.tar.xz
+/chromium-70.0.3538.77.tar.xz
diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch
new file mode 100644
index 0000000..cbea609
--- /dev/null
+++ b/chromium-system-icu.patch
@@ -0,0 +1,11 @@
+--- chromium-70.0.3521.2.old/third_party/blink/renderer/platform/text/character_property_data_generator.h 2018-08-15 12:41:21.091987662 +0200
++++ chromium-70.0.3521.2/third_party/blink/renderer/platform/text/character_property_data_generator.h 2018-08-17 12:37:45.459538308 +0200
+@@ -247,7 +247,7 @@
+ 0xFFA0, 0xFFDC,
+ };
+
+-static const UChar32 kIsHangulArray[] = {};
++static const UChar32 kIsHangulArray[] = {0xFFDC,};
+
+ } // namespace blink
+
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 4460bcb..95aff15 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -29,7 +29,8 @@
%bcond_without system_ply
# Allow testing whether icu can be unbundled
-%bcond_with system_libicu
+# A patch fix building so enabled by default
+%bcond_without system_libicu
# Allow testing whether libvpx can be unbundled
%bcond_with system_libvpx
#Allow minizip to be unbundled
@@ -68,8 +69,8 @@
%endif
##############################Package Definitions######################################
Name: chromium-vaapi
-Version: 70.0.3538.67
-Release: 2%{?dist}
+Version: 70.0.3538.77
+Release: 1%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -120,6 +121,8 @@ Patch11: chromium-gcc8-r589614.patch
Patch50: unrar.patch
# Bootstrap still uses python command
Patch51: py2-bootstrap.patch
+# Fix building with system icu
+Patch52: chromium-system-icu.patch
# This build should be only available to amd64
ExclusiveArch: x86_64
########################################################################################
@@ -622,6 +625,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Fri Oct 26 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.77-1
+- Update to 70.0.3538.77
+- Add a patch to fix building with system libicu
+
* Sun Oct 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.67-2
- Reduce jumbo_file_merge_limit to a much lower number since rpmfusion koji can't keep up.
diff --git a/sources b/sources
index f405063..d44eb6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c6e39bdbeea70fdd30832fa18bbe6fb chromium-70.0.3538.67.tar.xz
+a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
5 years, 1 month
- 1
- 0
[chromium-browser-privacy: 8/103] Reduce jumbo_file_merge_limit to a much lower number since rpmfusion koji can't keep up.
by qvint
commit ba7299aa170bea7945f3de000f07ea700a8c98ca
Author: Akarshan Biswas <hellbanger(a)ga-lmt-s2.biswasab.org>
Date: Sun Oct 21 20:13:15 2018 +0530
Reduce jumbo_file_merge_limit to a much lower number since rpmfusion koji can't keep up.
chromium-vaapi.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index 9ecd1ef..4460bcb 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -69,7 +69,7 @@
##############################Package Definitions######################################
Name: chromium-vaapi
Version: 70.0.3538.67
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Chromium web browser with video decoding acceleration
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)
URL: https://www.chromium.org/Home
@@ -523,7 +523,7 @@ gn_args+=(
gn_args+=(
%if %{jumbo}
use_jumbo_build=true
- jumbo_file_merge_limit=12
+ jumbo_file_merge_limit=7
concurrent_links=1
%endif
)
@@ -622,6 +622,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/locales/*.pak
#########################################changelogs#################################################
%changelog
+* Sun Oct 21 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.67-2
+- Reduce jumbo_file_merge_limit to a much lower number since rpmfusion koji can't keep up.
+
* Wed Oct 17 2018 Akarshan Biswas <akarshan.biswas(a)hotmail.com> 70.0.3538.67-1
- Update to 70.0.3538.67
- brand new vaapi patch
5 years, 1 month
- 1
- 0