[xine-lib] More EL6 cleanup
by Xavier Bachelot
commit 90e1b89aaf1ff9f913f868a1b815531c12923f54
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Dec 11 11:09:40 2020 +0100
More EL6 cleanup
xine-lib-1.2.9-revert_update_gettext.patch | 179 -----------------------------
xine-lib.spec | 8 +-
2 files changed, 1 insertion(+), 186 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index af05350..d9e3384 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -35,10 +35,6 @@ Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz
# Script to make a snapshot
Source1: make_xinelib_snapshot.sh
-# Based on:
-# https://sourceforge.net/p/xine/xine-lib-1.2/ci/ba01d04fe4d50a67302ed3cdbf...
-Patch1: xine-lib-1.2.9-revert_update_gettext.patch
-
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -133,7 +129,6 @@ This package contains extra plugins for %{name}:
%else
%setup -q -n %{name}-%{version}-%{date}hg%{revision}
%endif
-%{?el6:%patch1 -p1}
autoreconf -ivf
@@ -275,7 +270,6 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
%{!?_without_libssh2:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_ssh.so}
-%{?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_vcd.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_vcdo.so
@@ -288,7 +282,7 @@ mkdir -p %{buildroot}%{codecdir}
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_mmal.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_glx.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_egl_x11.so
-%{!?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_egl_wl.so}
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_gl_egl_wl.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so
3 years, 9 months
[xine-lib] Drop conditionals for EOL distros
by Xavier Bachelot
commit 4ccc41db4b7042161cafa138f31f693cffd10f6e
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed Dec 9 14:51:36 2020 +0100
Drop conditionals for EOL distros
xine-lib.spec | 13 -------------
1 file changed, 13 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index faa1b1e..af05350 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -2,24 +2,11 @@
%global plugin_abi 2.9
%global codecdir %{_libdir}/codecs
-%if 0%{?el6}
- %global _without_aom 1
- %global _without_bluray 1
- %global _without_dav1d 1
- %global _without_nfs 1
- %global _without_openssl 1
- %global _without_png 1
-%endif
-
%if 0%{?el7}
%global _without_dav1d 1
%global _without_png 1
%endif
-%if 0%{?fc29}%{?fc30}
- %global _without_dav1d 1
-%endif
-
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
%global _without_xvmc 1
%endif
3 years, 9 months
[cinelerra-gg/f33] (3 commits) ...Switch to %autosetup
by Frank R Dana
Summary of changes:
01d5d81... Delete upstreamed patch (*)
9897c7a... New upstream release (*)
7f597a7... Switch to %autosetup (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[cinelerra-gg] Switch to %autosetup
by Frank R Dana
commit 7f597a708ccf138489683acf9a82532f583ea68a
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Thu Dec 10 13:08:59 2020 -0500
Switch to %autosetup
cinelerra-gg.spec | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/cinelerra-gg.spec b/cinelerra-gg.spec
index dad4444..01401c4 100644
--- a/cinelerra-gg.spec
+++ b/cinelerra-gg.spec
@@ -118,10 +118,9 @@ BuildArch: noarch
%prep
-%setup -q -n cinelerra-%{git_tag}/cinelerra-5.1
-
-%patch0 -p2 -b.crystal
+%autosetup -p1 -n cinelerra-%{git_tag}
+cd cinelerra-5.1
./autogen.sh
# Fedora 31+ won't have a "python" command
@@ -134,6 +133,7 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
# it breaks OpenEXR detection. It'll be re-enabled before building.
%undefine _hardened_build
+cd cinelerra-5.1
%configure \
--with-exec-name=%{name} \
--disable-static-build \
@@ -192,17 +192,18 @@ sed -i 's/\<python\>/python3/' guicast/Makefile
%install
+pushd cinelerra-5.1
%make_install V=0
+popd
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
%find_lang %{name}
%files -f %{name}.lang
-%license COPYING
-%license plugins/theme_neophyte/Neophyte_License.txt
-%doc README
+%license cinelerra-5.1/COPYING
+%license cinelerra-5.1/plugins/theme_neophyte/Neophyte_License.txt
+%doc cinelerra-5.1/README
%{_bindir}/%{name}
%{_bindir}/zmpeg3cc2txt
%{_bindir}/zmpeg3ifochk
3 years, 9 months
[chromium-browser-privacy/f32: 13/13] Update ungoogled-chromium to 87.0.4280.88-1
by qvint
commit 9977861207730ef7e4c725f866329d559d451b64
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Dec 11 09:32:24 2020 +0300
Update ungoogled-chromium to 87.0.4280.88-1
chromium-browser-privacy.spec | 9 ++++-----
chromium-widevine-locations.patch | 40 ++++++++++-----------------------------
sources | 2 +-
3 files changed, 15 insertions(+), 36 deletions(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 66ff834..cff56a5 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# ungoogled-chromium.
-%global ungoogled_chromium_revision 85.0.4183.102-1
+%global ungoogled_chromium_revision 87.0.4280.88-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
# The following two source files are copied and modified from the chromium source
@@ -151,6 +151,7 @@ ExclusiveArch: x86_64
# Fedora patches:
Patch300: chromium-py2-bootstrap.patch
+Patch320: chromium-widevine-locations.patch
# RPM Fusion patches [free/chromium-freeworld]:
Patch400: chromium-hw-accel-mjpeg.patch
@@ -168,9 +169,6 @@ Patch450: chromium-87-includes.patch
# RPM Fusion patches [free/chromium-browser-privacy]:
Patch500: chromium-default-user-data-dir.patch
-# Additional patches:
-Patch600: chromium-widevine-locations.patch
-
%description
%{name} is a distribution of ungoogled-chromium.
@@ -547,7 +545,7 @@ gn_args=(
proprietary_codecs=false
%endif
enable_nacl=false
- enable_hangout_services_extension=true
+ enable_hangout_services_extension=false
fatal_linker_warnings=false
treat_warnings_as_errors=false
fieldtrial_testing_like_official_build=true
@@ -704,6 +702,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%changelog
* Thu Dec 10 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
- Update Chromium to 87.0.4280.88
+- Update ungoogled-chromium to 87.0.4280.88-1
* Mon Sep 14 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
- Update Chromium to 85.0.4183.102
diff --git a/chromium-widevine-locations.patch b/chromium-widevine-locations.patch
index 9e9acee..e94eda6 100644
--- a/chromium-widevine-locations.patch
+++ b/chromium-widevine-locations.patch
@@ -1,39 +1,19 @@
-Description: try alternative locations for the Widevine CDM library:
- - $HOME/.local/lib/WidevineCdm/ (snap-friendly, see https://launchpad.net/bugs/1738149)
- - /opt/google/chrome/WidevineCdm/ (installed by official google chrome package)
- The manifest lives at the top level, whereas libwidevinecdm.so is inside
- a platform specific directory, see media::GetPlatformSpecificDirectory(…).
-Author: Olivier Tilloy <olivier.tilloy(a)canonical.com>
-
-Source: https://bazaar.launchpad.net/~chromium-team/chromium-browser/disco-dev/vi...
-
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
-@@ -374,8 +374,17 @@ bool PathProvider(int key, base::FilePat
- cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
- break;
-
--#if defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM)
-+#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+@@ -379,6 +379,16 @@ bool PathProvider(int key, base::FilePat
+ #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
+ BUILDFLAG(BUNDLE_WIDEVINE_CDM)
case chrome::DIR_BUNDLED_WIDEVINE_CDM:
+ base::PathService::Get(base::DIR_HOME, &cur);
-+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib"))
-+ .AppendASCII(kWidevineCdmBaseDirectory);
-+ if (base::PathExists(cur))
++ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));
++ if (base::PathExists(cur)) {
+ break;
-+ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome"))
-+ .AppendASCII(kWidevineCdmBaseDirectory);
-+ if (base::PathExists(cur))
++ }
++ // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so
++ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) {
++ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"));
+ break;
++ }
if (!GetComponentDirectory(&cur))
return false;
#if !defined(OS_CHROMEOS)
-@@ -384,7 +393,7 @@ bool PathProvider(int key, base::FilePat
- cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
- #endif // !defined(OS_CHROMEOS)
- break;
--#endif // defined(OS_LINUX) && BUILDFLAG(BUNDLE_WIDEVINE_CDM)
-+#endif // defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
-
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
- BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
diff --git a/sources b/sources
index e789162..9474a3f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (chromium-87.0.4280.88.tar.xz) = ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
-SHA512 (ungoogled-chromium-85.0.4183.102-1.tar.gz) = b4ce88df6faece921d258aeb1554fbda00e25d1577d71967943abc475905ffb8e427a00aad893d3f1cc4cc2fad3ad0015154f12b59ee5ef041a3d7903774b935
+SHA512 (ungoogled-chromium-87.0.4280.88-1.tar.gz) = 84478f743ebc98d581401245da5f764cd3d3ac67ef2fdeb8659077b10c6d09a909f8f6f4a0897ea0d72f33a7faaaea551481d67ddd64ea9d9ca63666e1420c27
3 years, 9 months
[chromium-browser-privacy/f32: 12/13] Sync spec and sources with free/chromium-freeworld
by qvint
commit 7e521a80eecec9e743248a9bf42426fd7fd82696
Merge: ec6df29 10a2944
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Dec 11 01:02:58 2020 +0300
Sync spec and sources with free/chromium-freeworld
chromium-85-ffmpeg-4.3-r796966.patch | 41 -----
chromium-87-includes.patch | 10 ++
chromium-browser-privacy.spec | 172 ++++++++-------------
chromium-fix-vaapi-on-intel.patch | 10 +-
...le-vaapi.patch => chromium-hw-accel-mjpeg.patch | 42 +----
chromium-md5-based-build-id.patch | 14 ++
sources | 4 +-
7 files changed, 103 insertions(+), 190 deletions(-)
---
diff --cc chromium-browser-privacy.spec
index 235e2db,76c42b3..66ff834
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@@ -18,39 -16,21 +18,21 @@@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
- #Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
- %bcond_without system_harfbuzz
- # Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
- %bcond_without system_libxml2
- # Allow testing whether icu can be unbundled
- # A patch fix building so enabled by default for Fedora 30
- # Need icu version >= 64
- %bcond_with system_libicu
- # Allow testing whether libvpx can be unbundled
- %bcond_with system_libvpx
- # Allow testing whether ffmpeg can be unbundled
- %bcond_without system_ffmpeg
- #Allow minizip to be unbundled
- #mini-compat is going to be removed from fedora 30!
- %bcond_without system_minizip
-
- # Need re2 ver. 2016.07.21 for re2::LazyRE2
- %bcond_with system_re2
-
- #Turn on verbose mode
- %global debug_logs 0
- #------------------------------------------------------
- #Build debug packages for debugging
- %global debug_pkg 0
- # Enable building with ozone support
- %global ozone 0
+ # System libraries to use.
+ %global system_ffmpeg 1
+ %global system_harfbuzz 1
+ %global system_libicu 0
+ %global system_libvpx 0
+ %global system_libxml2 1
+ %global system_minizip 1
+ %global system_re2 1
##############################Package Definitions######################################
-Name: chromium-freeworld
+Name: chromium-browser-privacy
- Version: 85.0.4183.102
+ Version: 87.0.4280.88
Release: 1%{?dist}
-Summary: Chromium built with all freeworld codecs and VA-API support
+Summary: Chromium, sans integration with Google
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
+URL: https://github.com/Eloston/ungoogled-chromium
%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
@@@ -71,13 -51,9 +53,13 @@@ Source0: chromium-%{version}-cle
%endif
# Patchset composed by Stephan Hartmann.
- %global patchset_revision chromium-85-patchset-2
+ %global patchset_revision chromium-87-patchset-9
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
+# ungoogled-chromium.
+%global ungoogled_chromium_revision 85.0.4183.102-1
+Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
+
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
#Add our own appdata file.
@@@ -116,11 -91,9 +97,10 @@@ BuildRequires: pkgconfig(wayland-clien
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
- %endif
+BuildRequires: python3
BuildRequires: /usr/bin/python2
BuildRequires: python2-setuptools
- %if %{with system_re2}
+ %if %{system_re2}
BuildRequires: re2-devel
%endif
# replace_gn_files.py --system-libraries
@@@ -163,11 -136,12 +143,9 @@@ BuildRequires: java-1.8.0-openjd
BuildRequires: libstdc++-static
#Runtime Requirements
Requires: hicolor-icon-theme
-# Make sure chromium-freeworld replaces chromium-vaapi
-Provides: chromium-vaapi = %{version}-%{release}
-Obsoletes: chromium-vaapi < %{version}-%{release}
#Some recommendations
Recommends: libva-utils
- %if !%{debug_pkg}
%global debug_package %{nil}
- %endif
# This build should be only available to amd64
ExclusiveArch: x86_64
@@@ -190,22 -158,11 +162,25 @@@ Patch404: chromium-md5-based-buil
Patch420: chromium-rpm-fusion-brand.patch
%endif
+ # RPM Fusion patches [free/chromium-freeworld] -- short-term:
+ Patch450: chromium-87-includes.patch
+
+# RPM Fusion patches [free/chromium-browser-privacy]:
+Patch500: chromium-default-user-data-dir.patch
+
+# Additional patches:
+Patch600: chromium-widevine-locations.patch
+
%description
-%{name} is an open-source web browser, powered by WebKit (Blink)
+%{name} is a distribution of ungoogled-chromium.
+
+ungoogled-chromium is Chromium, sans integration with Google. It also features
+some tweaks to enhance privacy, control, and transparency (almost all of which
+require manual activation or enabling).
+
+ungoogled-chromium retains the default Chromium experience as closely as
+possible. Unlike other Chromium forks that have their own visions of a web
+browser, ungoogled-chromium is essentially a drop-in replacement for Chromium.
############################################PREP###########################################################
%prep
%setup -q -T -n chromium-patches-%{patchset_revision} -b 1
@@@ -217,26 -172,17 +192,21 @@@
# Apply patchset composed by Stephan Hartmann.
%global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1}
- %patchset_apply chromium-blink-gcc-diagnostic-pragma.patch
%patchset_apply chromium-fix-char_traits.patch
- %patchset_apply chromium-quiche-invalid-offsetof.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-79-gcc-protobuf-alignas.patch
- %patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
%patchset_apply chromium-84-blink-disable-clang-format.patch
- %patchset_apply chromium-85-DelayNode-cast.patch
- %patchset_apply chromium-85-FrameWidget-namespace.patch
- %patchset_apply chromium-85-NearbyConnection-abstract.patch
- %patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch
- %patchset_apply chromium-85-oscillator_node-cast.patch
- %patchset_apply chromium-85-ostream-operator.patch
- %patchset_apply chromium-85-ozone-include.patch
- %patchset_apply chromium-85-sim_hash-include.patch
+ %patchset_apply chromium-86-nearby-explicit.patch
+ %patchset_apply chromium-86-nearby-include.patch
+ %patchset_apply chromium-87-ServiceWorkerContainerHost-crash.patch
+ %patchset_apply chromium-87-openscreen-include.patch
+ %patchset_apply chromium-88-ityp-include.patch
+ %patchset_apply chromium-88-vaapi-attribute.patch
+# ungoogled-chromium: binary pruning.
+python3 -B %{ungoogled_chromium_root}/utils/prune_binaries.py . \
+ %{ungoogled_chromium_root}/pruning.list
+
# Apply patches from this spec.
%autopatch -p1
@@@ -745,41 -655,97 +702,44 @@@ appstream-util validate-relax --nonet "
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* Tue Dec 08 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
-- Update to 87.0.4280.88
-
-* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.66-1
-- Update to 87.0.4280.66
-
-* Tue Oct 27 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-2
-- Fix invalid "end" iterator usage in CookieMonster
-- Only fall back to the i965 driver if we're on iHD
-- Check for enable-accelerated-video-decode
-- Fix mouse movements near window edges
-- Fix crash in UserInputMonitorLinuxCore (rfbz#5807)
-
-* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-1
-- Update to 86.0.4240.111
-
-* Wed Sep 23 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.121-1
-- Update to 85.0.4183.121
-- Enable Hangout services extension (rfbz#5758)
-- Use MD5-based BuildID (rfbz#5743)
-- Use %%ninja_build macro
-- Remove debug_pkg toggle
-- Replace bconds with ordinary macros
-- Use system re2
-- Use system libicu (f33+)
-
-* Thu Sep 10 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
-- Update to 85.0.4183.102
-- Remove bundlepylibs and clang toggles
-
-* Mon Aug 31 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-2
-- Ship ANGLE libEGL.so and libGLESv2.so (rfbz#5738)
-
-* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.83-1
-- Update to 85.0.4183.83
-- Use xcb-proto bundled in Chromium tarball
-- Drop Fedora 30 support
-- Fix XDG paths in manpage
++* Thu Dec 10 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
++- Update Chromium to 87.0.4280.88
++
+* Mon Sep 14 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.102-1
+- Update Chromium to 85.0.4183.102
+- Update ungoogled-chromium to 85.0.4183.102-1
+- Add domain_substitution switch
+- Fix manpage and desktop metadata files
- Update AppStream metadata
-- Fix name in .desktop file (rfbz#5717)
-- Fix name in GNOME default-apps XML
-- Add symbolic app icon
-* Tue Aug 11 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
-- Update to 84.0.4147.125
-- Stop using gold
-- Add 'ulimit -n 2048'
+* Thu Aug 13 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.125-1
+- Update Chromium to 84.0.4147.125
+- Update ungoogled-chromium to 84.0.4147.125-1
* Sat Jul 18 2020 qvint <dotqvint(a)gmail.com> - 84.0.4147.89-1
-- Update to 84.0.4147.89
-- Use patchset composed by Stephan Hartmann <stha09(a)googlemail.com>
-- Bundle xcb-proto
-
-* Thu Jun 25 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
-- Update to 83.0.4103.116
-
-* Wed Jun 17 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.106-1
-- Update to 83.0.4103.106
-- Disable python byte compiling
+- Update Chromium to 84.0.4147.89
+- Update ungoogled-chromium to 84.0.4147.89-1
-* Mon Jun 08 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-2
-- Fix crash in ServiceWorker (rfbz#5671)
-
-* Fri Jun 05 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.97-1
-- Update to 83.0.4103.97
+* Sat Jun 27 2020 qvint <dotqvint(a)gmail.com> - 83.0.4103.116-1
+- Update Chromium to 83.0.4103.116
+- Update ungoogled-chromium to 83.0.4103.116-1
+- Try alternative locations for the Widevine CDM library
* Wed May 06 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.138-1
-- Update to 81.0.4044.138
-- Fix touchpad scrolling under XWayland (rfbz#5621)
+- Update Chromium to 81.0.4044.138
+- Update ungoogled-chromium to 38e86b5
* Thu Apr 30 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.129-1
-- Update to 81.0.4044.129
-
-* Thu Apr 09 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
-- Update to 81.0.4044.92
+- Update Chromium to 81.0.4044.129
+- Update ungoogled-chromium to 81.0.4044.129-1
-* Sun Apr 05 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.163-1
-- Update to 80.0.3987.163
+* Fri Apr 10 2020 qvint <dotqvint(a)gmail.com> - 81.0.4044.92-1
+- Update Chromium to 81.0.4044.92
+- Update ungoogled-chromium to 209e24b
-* Thu Apr 02 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.162-1
-- Update to 80.0.3987.162
-
-* Wed Mar 18 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.149-1
-- Update to 80.0.3987.149
-- Fix rpmlint warnings and errors
-
-* Wed Mar 04 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.132-1
-- Update to 80.0.3987.132
-
-* Sun Mar 01 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
-- Update to 80.0.3987.122
+* Thu Feb 27 2020 qvint <dotqvint(a)gmail.com> - 80.0.3987.122-1
+- Update Chromium to 80.0.3987.122
+- Update ungoogled-chromium to 80.0.3987.122-1
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 79.0.3945.130-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --cc sources
index 9a1543b,40f2301..e789162
--- a/sources
+++ b/sources
@@@ -1,3 -1,2 +1,3 @@@
- SHA512 (chromium-85.0.4183.102.tar.xz) = acd6f0a7b74018098752b6598e09a2bd6d1c9f1120c39a5c6cd3d924c466be92b854f3c7f91693ba9506e47b173ef12c14427f998362524b2497fbe5587a6b6c
- SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
+ SHA512 (chromium-87.0.4280.88.tar.xz) = ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
+ SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
+SHA512 (ungoogled-chromium-85.0.4183.102-1.tar.gz) = b4ce88df6faece921d258aeb1554fbda00e25d1577d71967943abc475905ffb8e427a00aad893d3f1cc4cc2fad3ad0015154f12b59ee5ef041a3d7903774b935
3 years, 9 months
[chromium-browser-privacy/f32: 11/13] Update to 87.0.4280.88
by qvint
commit 10a29442d810c022fa645148653fbff4c2eaf260
Author: qvint <dotqvint(a)gmail.com>
Date: Tue Dec 8 20:27:15 2020 +0300
Update to 87.0.4280.88
chromium-freeworld.spec | 8 ++++----
chromium-hw-accel-mjpeg.patch | 2 +-
sources | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 5d88017..76c42b3 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -24,12 +24,9 @@
%global system_libxml2 1
%global system_minizip 1
%global system_re2 1
-%if 0%{?fedora} >= 33
-%global system_libicu 1
-%endif
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 87.0.4280.66
+Version: 87.0.4280.88
Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
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)
@@ -658,6 +655,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Tue Dec 08 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.88-1
+- Update to 87.0.4280.88
+
* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.66-1
- Update to 87.0.4280.66
diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch
index 042ad21..2cbcd2e 100644
--- a/chromium-hw-accel-mjpeg.patch
+++ b/chromium-hw-accel-mjpeg.patch
@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -3336,12 +3336,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3342,12 +3342,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
diff --git a/sources b/sources
index 1c7e2b9..40f2301 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-87.0.4280.66.tar.xz) = 8bf31b012166fb1fd35107020608cf77e6a31038a583423541c64aaf1c91bca0767ca111dcb4dd0f57c9c19c347375bde6b6488c56e309bd2871998c26b8b32a
+SHA512 (chromium-87.0.4280.88.tar.xz) = ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897
SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
3 years, 9 months
[chromium-browser-privacy/f32: 10/13] Update to 87.0.4280.66
by qvint
commit 6f4d1d03d516955afc260a141dd4dcbaabd0b876
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Nov 27 14:11:00 2020 +0300
Update to 87.0.4280.66
chromium-86-cookiemonster-r803260.patch | 72 -----------------
chromium-86-vaapi-r807550.patch | 133 --------------------------------
chromium-86-vaapi-r811480.patch | 37 ---------
chromium-86-xproto-r819538.patch | 31 --------
chromium-86-xproto-r819650.patch | 35 ---------
chromium-87-includes.patch | 10 +++
chromium-fix-vaapi-on-intel.patch | 4 +-
chromium-freeworld.spec | 50 +++++-------
chromium-hw-accel-mjpeg.patch | 6 +-
chromium-md5-based-build-id.patch | 2 +-
sources | 4 +-
11 files changed, 36 insertions(+), 348 deletions(-)
---
diff --git a/chromium-87-includes.patch b/chromium-87-includes.patch
new file mode 100644
index 0000000..1ddec7b
--- /dev/null
+++ b/chromium-87-includes.patch
@@ -0,0 +1,10 @@
+--- a/components/autofill/core/browser/pattern_provider/pattern_provider.h
++++ b/components/autofill/core/browser/pattern_provider/pattern_provider.h
+@@ -6,6 +6,7 @@
+ #define COMPONENTS_AUTOFILL_CORE_BROWSER_PATTERN_PROVIDER_PATTERN_PROVIDER_H_
+
+ #include <string>
++#include <vector>
+
+ #include "base/macros.h"
+ #include "base/no_destructor.h"
diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch
index c559f56..d68bd60 100644
--- a/chromium-fix-vaapi-on-intel.patch
+++ b/chromium-fix-vaapi-on-intel.patch
@@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only
} // namespace
-@@ -1214,6 +1216,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1223,6 +1225,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal;
@@ -30,7 +30,7 @@ Subject: [PATCH] Move offending function to chromeos only
// On Gemini Lake, Kaby Lake and later we can pass to libva the client's
// PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer
-@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1238,6 +1242,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3;
return BufferAllocationMode::kNone;
}
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 1bd9580..5d88017 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -27,13 +27,10 @@
%if 0%{?fedora} >= 33
%global system_libicu 1
%endif
-#------------------------------------------------------
-# Enable building with ozone support
-%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 86.0.4240.111
-Release: 2%{?dist}
+Version: 87.0.4280.66
+Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
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
@@ -57,7 +54,7 @@ Source0: chromium-%{version}-clean.tar.xz
%endif
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-86-patchset-7
+%global patchset_revision chromium-87-patchset-9
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# The following two source files are copied and modified from the chromium source
@@ -93,12 +90,10 @@ BuildRequires: pkgconfig(libffi)
#for vaapi
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(gbm)
-%if %{ozone}
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(wayland-server)
-%endif
BuildRequires: /usr/bin/python2
BuildRequires: python2-setuptools
%if %{system_re2}
@@ -153,13 +148,6 @@ Recommends: libva-utils
# This build should be only available to amd64
ExclusiveArch: x86_64
-# Google patches (short-term fixes and backports):
-Patch150: chromium-86-cookiemonster-r803260.patch
-Patch151: chromium-86-vaapi-r807550.patch
-Patch152: chromium-86-vaapi-r811480.patch
-Patch153: chromium-86-xproto-r819538.patch
-Patch154: chromium-86-xproto-r819650.patch
-
# Fedora patches:
Patch300: chromium-py2-bootstrap.patch
@@ -173,6 +161,9 @@ Patch404: chromium-md5-based-build-id.patch
Patch420: chromium-rpm-fusion-brand.patch
%endif
+# RPM Fusion patches [free/chromium-freeworld] -- short-term:
+Patch450: chromium-87-includes.patch
+
%description
%{name} is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
@@ -188,11 +179,12 @@ Patch420: chromium-rpm-fusion-brand.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-79-gcc-protobuf-alignas.patch
%patchset_apply chromium-84-blink-disable-clang-format.patch
-%patchset_apply chromium-86-ConsumeDurationNumber-constexpr.patch
-%patchset_apply chromium-86-ImageMemoryBarrierData-init.patch
-%patchset_apply chromium-86-ServiceWorkerRunningInfo-noexcept.patch
%patchset_apply chromium-86-nearby-explicit.patch
%patchset_apply chromium-86-nearby-include.patch
+%patchset_apply chromium-87-ServiceWorkerContainerHost-crash.patch
+%patchset_apply chromium-87-openscreen-include.patch
+%patchset_apply chromium-88-ityp-include.patch
+%patchset_apply chromium-88-vaapi-attribute.patch
# Apply patches from this spec.
%autopatch -p1
@@ -275,6 +267,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/devscripts \
third_party/devtools-frontend \
third_party/devtools-frontend/src/front_end/third_party/acorn \
+ third_party/devtools-frontend/src/front_end/third_party/axe-core \
third_party/devtools-frontend/src/front_end/third_party/chromium \
third_party/devtools-frontend/src/front_end/third_party/codemirror \
third_party/devtools-frontend/src/front_end/third_party/fabricjs \
@@ -284,6 +277,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/devtools-frontend/src/front_end/third_party/lit-html \
third_party/devtools-frontend/src/front_end/third_party/lodash-isequal \
third_party/devtools-frontend/src/front_end/third_party/marked \
+ third_party/devtools-frontend/src/front_end/third_party/puppeteer \
third_party/devtools-frontend/src/front_end/third_party/wasmparser \
third_party/devtools-frontend/src/third_party \
third_party/dom_distiller_js \
@@ -342,9 +336,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/markupsafe \
third_party/mesa \
third_party/metrics_proto \
-%if %{ozone}
third_party/minigbm \
-%endif
%if !%{system_minizip}
third_party/minizip/ \
%endif
@@ -375,6 +367,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/ply \
third_party/polymer \
third_party/private-join-and-compute \
+ third_party/private_membership \
third_party/protobuf \
third_party/protobuf/third_party/six \
third_party/pyjson5 \
@@ -386,6 +379,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/s2cellid \
third_party/schema_org \
third_party/securemessage \
+ third_party/shaka-player \
+ third_party/shell-encryption \
third_party/skia \
third_party/skia/include/third_party/skcms \
third_party/skia/include/third_party/vulkan \
@@ -409,9 +404,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/usb_ids \
third_party/usrsctp \
third_party/vulkan \
-%if %{ozone}
third_party/wayland \
-%endif
third_party/web-animations-js \
third_party/webdriver \
third_party/webrtc \
@@ -549,16 +542,6 @@ gn_args+=(
rtc_link_pipewire=true
)
-# Ozone stuff : Whole work is done completely upstream.
-gn_args+=(
-%if %{ozone}
- use_ozone=true
- use_system_minigbm=true
- use_xkbcommon=true
-%endif
-)
-
-
#symbol
gn_args+=(
symbol_level=0
@@ -675,6 +658,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com> - 87.0.4280.66-1
+- Update to 87.0.4280.66
+
* Tue Oct 27 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-2
- Fix invalid "end" iterator usage in CookieMonster
- Only fall back to the i965 driver if we're on iHD
diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch
index ac3d37b..042ad21 100644
--- a/chromium-hw-accel-mjpeg.patch
+++ b/chromium-hw-accel-mjpeg.patch
@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3336,12 +3336,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -18,7 +18,7 @@
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr
+@@ -3590,16 +3590,19 @@ const char kVideoToolboxVp9DecodingDescr
#endif
@@ -43,7 +43,7 @@
"Use the aggregated ML model to rank the suggested apps.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi
+@@ -2062,13 +2062,19 @@ extern const char kVideoToolboxVp9Decodi
#endif // defined(OS_MAC)
diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch
index 1c6734e..c76e078 100644
--- a/chromium-md5-based-build-id.patch
+++ b/chromium-md5-based-build-id.patch
@@ -3,7 +3,7 @@ https://bugzilla.rpmfusion.org/show_bug.cgi?id=5743
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -342,7 +342,7 @@ config("compiler") {
+@@ -338,7 +338,7 @@ config("compiler") {
# links.
ldflags += [ "-Wl,--build-id=sha1" ]
} else if (current_os != "aix") {
diff --git a/sources b/sources
index 26553c5..1c7e2b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-86.0.4240.111.tar.xz) = 809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54
-SHA512 (chromium-patches-chromium-86-patchset-7.tar.gz) = 4b569655409b2ba1564a7de8f3f97ffadea65f5d982024d665b873117688a9874f869114e753fb77492b7a2c38e66f0f9a7294785077776230ee057d4e70bf7d
+SHA512 (chromium-87.0.4280.66.tar.xz) = 8bf31b012166fb1fd35107020608cf77e6a31038a583423541c64aaf1c91bca0767ca111dcb4dd0f57c9c19c347375bde6b6488c56e309bd2871998c26b8b32a
+SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691
3 years, 9 months
[chromium-browser-privacy/f32: 9/13] Backport some fixes from the upstream
by qvint
commit b53c752f54437825dbde39ee663645914840c10c
Author: qvint <dotqvint(a)gmail.com>
Date: Tue Oct 27 08:19:33 2020 +0300
Backport some fixes from the upstream
- Fix invalid "end" iterator usage in CookieMonster
- Only fall back to the i965 driver if we're on iHD
- Check for enable-accelerated-video-decode
- Fix mouse movements near window edges
- Fix crash in UserInputMonitorLinuxCore[1]
[1] See https://bugzilla.rpmfusion.org/show_bug.cgi?id=5807
chromium-86-cookiemonster-r803260.patch | 72 +++++++++++++++++
chromium-86-vaapi-r807550.patch | 133 ++++++++++++++++++++++++++++++++
chromium-86-vaapi-r811480.patch | 37 +++++++++
chromium-86-xproto-r819538.patch | 31 ++++++++
chromium-86-xproto-r819650.patch | 35 +++++++++
chromium-freeworld.spec | 19 ++++-
sources | 2 +-
7 files changed, 325 insertions(+), 4 deletions(-)
---
diff --git a/chromium-86-cookiemonster-r803260.patch b/chromium-86-cookiemonster-r803260.patch
new file mode 100644
index 0000000..fd97e29
--- /dev/null
+++ b/chromium-86-cookiemonster-r803260.patch
@@ -0,0 +1,72 @@
+From 53478caee862624fc6d73516f8d64253854b146f Mon Sep 17 00:00:00 2001
+From: Piotr Tworek <ptworek(a)vewd.com>
+Date: Mon, 31 Aug 2020 21:03:58 +0000
+Subject: [PATCH] Fix invalid "end" iterator usage in CookieMonster.
+
+Commit 229623d76e8baf714c8569c9f4efc5de266cef8b has introduced the following
+code in cookie_monster.cc.
+
+// If this is the first cookie in |cookies_| with this key, increment the
+// |num_keys_| counter.
+bool different_prev =
+ inserted == cookies_.begin() || std::prev(inserted)->first != key;
+bool different_next =
+ inserted == cookies_.end() || std::next(inserted)->first != key;
+if (different_prev && different_next)
+ ++num_keys_;
+
+The "inserted" iterator is something that has been returned from
+std::multimap::insert. At first glance it looks reasonable. The code
+tries to determine if there are already similar elements with the same
+key in the map. Unfortunately the expression calculating the value of
+different_next can potentially use the end iterator to the map. The
+"inserted == cookies_.end()" part of the expression will always evaluate
+to false since the newly inserted element has to be in the map and
+cookies_.end() points to the first element outside the map. If the
+inserted happens to be the last element in the map the second part of
+the expression will grab the end iterator by calling std::next(inserted)
+and then will try to use it leading to invalid memory access.
+
+Given the fact that cookies_ is a std::multimap we should not even need
+to calculate the value of different_next. It should always be true.
+
+ "If the container has elements with equivalent key, inserts at the
+ upper bound of that range.(since C++11)"
+
+See: https://en.cppreference.com/w/cpp/container/multimap/insert
+
+Bug: 1120240
+Change-Id: I8928c294ac4daf72349a2331b31b017c1d015da0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368872
+Reviewed-by: Maksim Orlovich <morlovich(a)chromium.org>
+Commit-Queue: Piotr Tworek <ptworek(a)vewd.com>
+Cr-Commit-Position: refs/heads/master@{#803260}
+--- a/net/cookies/cookie_monster.cc
++++ b/net/cookies/cookie_monster.cc
+@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator Cooki
+ // |num_keys_| counter.
+ bool different_prev =
+ inserted == cookies_.begin() || std::prev(inserted)->first != key;
+- bool different_next =
+- inserted == cookies_.end() || std::next(inserted)->first != key;
+- if (different_prev && different_next)
++ // According to std::multiqueue documentation:
++ // "If the container has elements with equivalent key, inserts at the upper
++ // bound of that range. (since C++11)"
++ // This means that "inserted" iterator either points to the last element in
++ // the map, or the element succeeding it has to have different key.
++ DCHECK(std::next(inserted) == cookies_.end() ||
++ std::next(inserted)->first != key);
++ if (different_prev)
+ ++num_keys_;
+
+ return inserted;
+@@ -1381,7 +1386,7 @@ void CookieMonster::InternalDeleteCookie
+ bool different_prev =
+ it == cookies_.begin() || std::prev(it)->first != it->first;
+ bool different_next =
+- it == cookies_.end() || std::next(it)->first != it->first;
++ std::next(it) == cookies_.end() || std::next(it)->first != it->first;
+ if (different_prev && different_next)
+ --num_keys_;
+
diff --git a/chromium-86-vaapi-r807550.patch b/chromium-86-vaapi-r807550.patch
new file mode 100644
index 0000000..de8cd69
--- /dev/null
+++ b/chromium-86-vaapi-r807550.patch
@@ -0,0 +1,133 @@
+From fbd756ab55f9351165f923b0411c31dd71319c78 Mon Sep 17 00:00:00 2001
+From: Ted Meyer <tmathmeyer(a)chromium.org>
+Date: Wed, 16 Sep 2020 17:42:03 +0000
+Subject: [PATCH] Only fall back to the i965 driver if we're on iHD
+
+I got my hands on an old AMD laptop, and the gallium driver worked very
+well and was saving power even at 720p, so there's no reason to block
+that for now.
+
+Bug: 1116703
+Change-Id: Ib15bc2b93f33e99adad7569dd825e167b503a0ea
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409967
+Commit-Queue: Ted Meyer <tmathmeyer(a)chromium.org>
+Reviewed-by: Andres Calderon Jaramillo <andrescj(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#807550}
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -410,6 +410,8 @@ class VADisplayState {
+
+ // Implementation of Initialize() called only once.
+ bool InitializeOnce() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
++ bool InitializeVaDisplay_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
++ bool InitializeVaDriver_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
+
+ int refcount_ GUARDED_BY(va_lock_);
+
+@@ -473,11 +475,7 @@ bool VADisplayState::Initialize() {
+ return success;
+ }
+
+-bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
++bool VADisplayState::InitializeVaDisplay_Locked() {
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -520,25 +518,10 @@ bool VADisplayState::InitializeOnce() {
+ return false;
+ }
+
+- // Set VA logging level and driver name, unless already set.
+- constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
+- std::unique_ptr<base::Environment> env(base::Environment::Create());
+- if (!env->HasVar(libva_log_level_env))
+- env->SetVar(libva_log_level_env, "1");
+-
+-#if defined(USE_X11)
+- if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE) {
+- DCHECK(!features::IsUsingOzonePlatform());
+- constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
+- // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
+- // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
+- // is discussion of the issue here:
+- // https://github.com/intel/media-driver/issues/818
+- if (!env->HasVar(libva_driver_impl_env))
+- env->SetVar(libva_driver_impl_env, "i965");
+- }
+-#endif // USE_X11
++ return true;
++}
+
++bool VADisplayState::InitializeVaDriver_Locked() {
+ // The VAAPI version.
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+@@ -546,9 +529,6 @@ bool VADisplayState::InitializeOnce() {
+ LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+ return false;
+ }
+-
+- va_initialized_ = true;
+-
+ const std::string va_vendor_string = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string.empty())
+ << "Vendor string empty or error reading.";
+@@ -556,6 +536,8 @@ bool VADisplayState::InitializeOnce() {
+ << va_vendor_string;
+ implementation_type_ = VendorStringToImplementationType(va_vendor_string);
+
++ va_initialized_ = true;
++
+ // The VAAPI version is determined from what is loaded on the system by
+ // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
+ // version check which helps in upgrading the libva, without breaking any
+@@ -572,6 +554,45 @@ bool VADisplayState::InitializeOnce() {
+ return true;
+ }
+
++bool VADisplayState::InitializeOnce() {
++ static_assert(
++ VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
++ "Requires VA-API >= 1.1.0");
++
++ // Set VA logging level, unless already set.
++ constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
++ std::unique_ptr<base::Environment> env(base::Environment::Create());
++ if (!env->HasVar(libva_log_level_env))
++ env->SetVar(libva_log_level_env, "1");
++
++ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
++ return false;
++
++#if defined(USE_X11)
++ if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
++ implementation_type_ == VAImplementation::kIntelIHD) {
++ DCHECK(!features::IsUsingOzonePlatform());
++ constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
++ // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
++ // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
++ // is discussion of the issue here:
++ // https://github.com/intel/media-driver/issues/818
++ if (!env->HasVar(libva_driver_impl_env))
++ env->SetVar(libva_driver_impl_env, "i965");
++
++ // Re-initialize with the new driver.
++ va_display_ = nullptr;
++ va_initialized_ = false;
++ implementation_type_ = VAImplementation::kInvalid;
++
++ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
++ return false;
++ }
++#endif // USE_X11
++
++ return true;
++}
++
+ VAStatus VADisplayState::Deinitialize() {
+ base::AutoLock auto_lock(va_lock_);
+ VAStatus va_res = VA_STATUS_SUCCESS;
diff --git a/chromium-86-vaapi-r811480.patch b/chromium-86-vaapi-r811480.patch
new file mode 100644
index 0000000..61f305a
--- /dev/null
+++ b/chromium-86-vaapi-r811480.patch
@@ -0,0 +1,37 @@
+From 54deb9811ca9bd2327def5c05ba6987b8c7a0897 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos(a)foutrelis.com>
+Date: Tue, 29 Sep 2020 01:02:22 +0000
+Subject: [PATCH] Check for enable-accelerated-video-decode on Linux
+
+Video decoding was being accelerated on Linux even though the newly
+added "enable-accelerated-video-decode" flag was not specified. The
+chrome://gpu page was misleadingly showing this feature as disabled:
+
+ > Video Decode: Software only. Hardware acceleration disabled
+
+This change adds a check for --enable-accelerated-video-decode when
+considering if video decoding should be activated. (Only on Linux.)
+
+Extra context: https://crbug.com/1097029#c18 (and also comment 20).
+
+Bug: 1066176, 1097029
+Change-Id: I534115f5f6ceed0ee3511fcf5c2d0f1dd04b9b7e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431434
+Reviewed-by: John Abd-El-Malek <jam(a)chromium.org>
+Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org>
+Commit-Queue: Ted Meyer <tmathmeyer(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#811480}
+--- a/content/renderer/render_thread_impl.cc
++++ b/content/renderer/render_thread_impl.cc
+@@ -1111,7 +1111,11 @@ media::GpuVideoAcceleratorFactories* Ren
+ kGpuStreamPriorityMedia);
+
+ const bool enable_video_accelerator =
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++ cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
++#else
+ !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
++#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ (gpu_channel_host->gpu_feature_info()
+ .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
+ gpu::kGpuFeatureStatusEnabled);
diff --git a/chromium-86-xproto-r819538.patch b/chromium-86-xproto-r819538.patch
new file mode 100644
index 0000000..2cd2a4c
--- /dev/null
+++ b/chromium-86-xproto-r819538.patch
@@ -0,0 +1,31 @@
+From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson(a)chromium.org>
+Date: Wed, 21 Oct 2020 22:02:35 +0000
+Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
+
+x11::Input::Fp1616 should be treated as a signed integer, otherwise
+-1 will underflow to 65535. When dragging a scrollbar, this would
+cause the scrollbar to snap to the bottom when the cursor is dragged
+above the window's y=0 coordinate. Verified that the issue is fixed
+after this CL.
+
+BUG=1139623,1136352
+R=sky
+
+Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
+Auto-Submit: Thomas Anderson <thomasanderson(a)chromium.org>
+Commit-Queue: Scott Violet <sky(a)chromium.org>
+Reviewed-by: Scott Violet <sky(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#819538}
+--- a/ui/events/x/events_x_utils.cc
++++ b/ui/events/x/events_x_utils.cc
+@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(cons
+
+ // This is ported from libxi's FP1616toDBL in XExtInt.c
+ double Fp1616ToDouble(x11::Input::Fp1616 x) {
+- auto x32 = static_cast<uint32_t>(x);
++ auto x32 = static_cast<int32_t>(x);
+ return x32 * 1.0 / (1 << 16);
+ }
+
diff --git a/chromium-86-xproto-r819650.patch b/chromium-86-xproto-r819650.patch
new file mode 100644
index 0000000..bbf5298
--- /dev/null
+++ b/chromium-86-xproto-r819650.patch
@@ -0,0 +1,35 @@
+From 6e50c5a3abfa22eb17e26086bffbee288d07483e Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson(a)chromium.org>
+Date: Thu, 22 Oct 2020 01:05:44 +0000
+Subject: [PATCH] [XProto] Fix crash in
+ media::UserInputMonitorLinuxCore::DispatchXEvent
+
+The X server may send unsolicited events (from clients calling
+XSendEvent() or from new keyboard mappings). So we must check that
+the event is the correct type before dispatching it.
+
+R=dalecurtis
+
+Change-Id: Ic3e19f7da1415c358991609c9b016bd60ead2038
+Bug: 1140927
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490674
+Commit-Queue: Thomas Anderson <thomasanderson(a)chromium.org>
+Auto-Submit: Thomas Anderson <thomasanderson(a)chromium.org>
+Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#819650}
+--- a/media/base/user_input_monitor_linux.cc
++++ b/media/base/user_input_monitor_linux.cc
+@@ -115,9 +115,10 @@ void UserInputMonitorLinuxCore::Dispatch
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
+
+ auto* raw = event->As<x11::Input::RawDeviceEvent>();
+- DCHECK(raw);
+- DCHECK(raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress ||
+- raw->opcode == x11::Input::RawDeviceEvent::RawKeyRelease);
++ if (!raw || (raw->opcode != x11::Input::RawDeviceEvent::RawKeyPress &&
++ raw->opcode != x11::Input::RawDeviceEvent::RawKeyRelease)) {
++ return;
++ }
+
+ ui::EventType type = raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress
+ ? ui::ET_KEY_PRESSED
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index a3830ac..1bd9580 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -33,7 +33,7 @@
##############################Package Definitions######################################
Name: chromium-freeworld
Version: 86.0.4240.111
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
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
@@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz
%endif
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-86-patchset-6
+%global patchset_revision chromium-86-patchset-7
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# The following two source files are copied and modified from the chromium source
@@ -153,6 +153,13 @@ Recommends: libva-utils
# This build should be only available to amd64
ExclusiveArch: x86_64
+# Google patches (short-term fixes and backports):
+Patch150: chromium-86-cookiemonster-r803260.patch
+Patch151: chromium-86-vaapi-r807550.patch
+Patch152: chromium-86-vaapi-r811480.patch
+Patch153: chromium-86-xproto-r819538.patch
+Patch154: chromium-86-xproto-r819650.patch
+
# Fedora patches:
Patch300: chromium-py2-bootstrap.patch
@@ -180,7 +187,6 @@ Patch420: chromium-rpm-fusion-brand.patch
%patchset_apply chromium-fix-char_traits.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-79-gcc-protobuf-alignas.patch
-%patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
%patchset_apply chromium-84-blink-disable-clang-format.patch
%patchset_apply chromium-86-ConsumeDurationNumber-constexpr.patch
%patchset_apply chromium-86-ImageMemoryBarrierData-init.patch
@@ -669,6 +675,13 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Tue Oct 27 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-2
+- Fix invalid "end" iterator usage in CookieMonster
+- Only fall back to the i965 driver if we're on iHD
+- Check for enable-accelerated-video-decode
+- Fix mouse movements near window edges
+- Fix crash in UserInputMonitorLinuxCore (rfbz#5807)
+
* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-1
- Update to 86.0.4240.111
diff --git a/sources b/sources
index 59b84b8..26553c5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (chromium-86.0.4240.111.tar.xz) = 809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54
-SHA512 (chromium-patches-chromium-86-patchset-6.tar.gz) = a2b6ada235dd39c23629c613ec0f98d7df6d4b0e95396415ab68396f730efa1dd13f0118e71992b9c279fbe1b4c39a225416915cd6af058d650252bd16e8641d
+SHA512 (chromium-patches-chromium-86-patchset-7.tar.gz) = 4b569655409b2ba1564a7de8f3f97ffadea65f5d982024d665b873117688a9874f869114e753fb77492b7a2c38e66f0f9a7294785077776230ee057d4e70bf7d
3 years, 9 months
[chromium-browser-privacy/f32: 8/13] Update to 86.0.4240.111
by qvint
commit 0d6e5c65602291d29c0420c394edeb69ac0fdafa
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Oct 21 16:07:29 2020 +0300
Update to 86.0.4240.111
chromium-85-ffmpeg-4.3-r796966.patch | 41 ---------------------
chromium-fix-vaapi-on-intel.patch | 10 +++---
chromium-freeworld.spec | 42 +++++++++++-----------
...le-vaapi.patch => chromium-hw-accel-mjpeg.patch | 42 ++++------------------
chromium-md5-based-build-id.patch | 2 +-
sources | 4 +--
6 files changed, 35 insertions(+), 106 deletions(-)
---
diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch
index f54cb69..c559f56 100644
--- a/chromium-fix-vaapi-on-intel.patch
+++ b/chromium-fix-vaapi-on-intel.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Move offending function to chromeos only
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -66,6 +66,7 @@ void ReportToUMA(VAVDADecoderFailure fai
- VAVDA_DECODER_FAILURES_MAX + 1);
+@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecPro
+ return VA_RT_FORMAT_YUV420;
}
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
// Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
// Lake) Cpu platform id's are referenced from the following file in kernel
// source arch/x86/include/asm/intel-family.h
-@@ -78,6 +79,7 @@ bool IsGeminiLakeOrLater() {
+@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() {
cpuid.model() >= kGeminiLakeModelId;
return is_geminilake_or_later;
}
@@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only
} // namespace
-@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1214,6 +1216,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
return BufferAllocationMode::kNormal;
@@ -30,7 +30,7 @@ Subject: [PATCH] Move offending function to chromeos only
// On Gemini Lake, Kaby Lake and later we can pass to libva the client's
// PictureBuffers to decode onto, which skips the use of the Vpp unit and its
// associated format reconciliation copy, avoiding all internal buffer
-@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
num_extra_pics_ = 3;
return BufferAllocationMode::kNone;
}
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index ca65ff9..a3830ac 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -32,7 +32,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 85.0.4183.121
+Version: 86.0.4240.111
Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
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)
@@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz
%endif
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-85-patchset-2
+%global patchset_revision chromium-86-patchset-6
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# The following two source files are copied and modified from the chromium source
@@ -153,18 +153,11 @@ Recommends: libva-utils
# This build should be only available to amd64
ExclusiveArch: x86_64
-# Google patches (short-term fixes and backports):
-%if 0%{?fedora} >= 33
-Patch150: chromium-85-ffmpeg-4.3-r796966.patch
-%endif
-
-# Gentoo patches (short-term fixes):
-
# Fedora patches:
Patch300: chromium-py2-bootstrap.patch
# RPM Fusion patches [free/chromium-freeworld]:
-Patch400: chromium-enable-vaapi.patch
+Patch400: chromium-hw-accel-mjpeg.patch
Patch401: chromium-fix-vaapi-on-intel.patch
Patch402: chromium-enable-widevine.patch
Patch403: chromium-manpage.patch
@@ -184,21 +177,16 @@ Patch420: chromium-rpm-fusion-brand.patch
# Apply patchset composed by Stephan Hartmann.
%global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1}
-%patchset_apply chromium-blink-gcc-diagnostic-pragma.patch
%patchset_apply chromium-fix-char_traits.patch
-%patchset_apply chromium-quiche-invalid-offsetof.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-79-gcc-protobuf-alignas.patch
%patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
%patchset_apply chromium-84-blink-disable-clang-format.patch
-%patchset_apply chromium-85-DelayNode-cast.patch
-%patchset_apply chromium-85-FrameWidget-namespace.patch
-%patchset_apply chromium-85-NearbyConnection-abstract.patch
-%patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch
-%patchset_apply chromium-85-oscillator_node-cast.patch
-%patchset_apply chromium-85-ostream-operator.patch
-%patchset_apply chromium-85-ozone-include.patch
-%patchset_apply chromium-85-sim_hash-include.patch
+%patchset_apply chromium-86-ConsumeDurationNumber-constexpr.patch
+%patchset_apply chromium-86-ImageMemoryBarrierData-init.patch
+%patchset_apply chromium-86-ServiceWorkerRunningInfo-noexcept.patch
+%patchset_apply chromium-86-nearby-explicit.patch
+%patchset_apply chromium-86-nearby-include.patch
# Apply patches from this spec.
%autopatch -p1
@@ -253,7 +241,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/breakpad \
third_party/breakpad/breakpad/src/third_party/curl \
third_party/brotli \
- third_party/cacheinvalidation \
third_party/catapult \
third_party/catapult/common/py_vulcanize/third_party/rcssmin \
third_party/catapult/common/py_vulcanize/third_party/rjsmin \
@@ -282,9 +269,15 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/devscripts \
third_party/devtools-frontend \
third_party/devtools-frontend/src/front_end/third_party/acorn \
+ third_party/devtools-frontend/src/front_end/third_party/chromium \
third_party/devtools-frontend/src/front_end/third_party/codemirror \
third_party/devtools-frontend/src/front_end/third_party/fabricjs \
+ third_party/devtools-frontend/src/front_end/third_party/i18n \
+ third_party/devtools-frontend/src/front_end/third_party/intl-messageformat \
third_party/devtools-frontend/src/front_end/third_party/lighthouse \
+ third_party/devtools-frontend/src/front_end/third_party/lit-html \
+ third_party/devtools-frontend/src/front_end/third_party/lodash-isequal \
+ third_party/devtools-frontend/src/front_end/third_party/marked \
third_party/devtools-frontend/src/front_end/third_party/wasmparser \
third_party/devtools-frontend/src/third_party \
third_party/dom_distiller_js \
@@ -351,6 +344,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
%endif
third_party/modp_b64 \
third_party/nasm \
+ third_party/nearby \
third_party/node \
third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 \
third_party/one_euro_filter \
@@ -385,6 +379,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/rnnoise \
third_party/s2cellid \
third_party/schema_org \
+ third_party/securemessage \
third_party/skia \
third_party/skia/include/third_party/skcms \
third_party/skia/include/third_party/vulkan \
@@ -403,6 +398,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/swiftshader/third_party/subzero \
third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \
third_party/tcmalloc \
+ third_party/ukey2 \
third_party/unrar \
third_party/usb_ids \
third_party/usrsctp \
@@ -425,6 +421,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/xcbproto \
third_party/xdg-utils \
third_party/zlib/google \
+ third_party/zxcvbn-cpp \
tools/grit/third_party/six \
%if !%{system_minizip}
third_party/zlib \
@@ -672,6 +669,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com> - 86.0.4240.111-1
+- Update to 86.0.4240.111
+
* Wed Sep 23 2020 qvint <dotqvint(a)gmail.com> - 85.0.4183.121-1
- Update to 85.0.4183.121
- Enable Hangout services extension (rfbz#5758)
diff --git a/chromium-enable-vaapi.patch b/chromium-hw-accel-mjpeg.patch
similarity index 63%
rename from chromium-enable-vaapi.patch
rename to chromium-hw-accel-mjpeg.patch
index 99446a4..ac3d37b 100644
--- a/chromium-enable-vaapi.patch
+++ b/chromium-hw-accel-mjpeg.patch
@@ -1,20 +1,6 @@
-From e04b52fc9b12f0725e76b889161ea45c776e6da5 Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
-Date: Fri, 20 Sep 2019 19:55:45 +0530
-Subject: [PATCH] Enable VAAPI on Linux
-
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -2372,7 +2372,7 @@ const FeatureEntry kFeatureEntries[] = {
- "disable-accelerated-video-decode",
- flag_descriptions::kAcceleratedVideoDecodeName,
- flag_descriptions::kAcceleratedVideoDecodeDescription,
-- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
-+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
- },
- {
-@@ -2823,12 +2823,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -26,13 +12,13 @@ Subject: [PATCH] Enable VAAPI on Linux
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
-#endif // OS_CHROMEOS
-+#endif // OS_CHROMEOS | OS_LINUX
++#endif // OS_CHROMEOS || OS_LINUX
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3257,16 +3257,19 @@ const char kMetalDescription[] =
+@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr
#endif
@@ -57,9 +43,9 @@ Subject: [PATCH] Enable VAAPI on Linux
"Use the aggregated ML model to rank the suggested apps.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -1881,13 +1881,19 @@ extern const char kMetalDescription[];
+@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi
- #endif // defined(OS_MACOSX)
+ #endif // defined(OS_MAC)
-// Chrome OS ------------------------------------------------------------------
+// Chrome OS and Linux ---------------------------------------------------------
@@ -70,7 +56,7 @@ Subject: [PATCH] Enable VAAPI on Linux
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];
-+#endif
++#endif
+
+// Chrome OS -------------------------------------------------------------------
+
@@ -79,19 +65,3 @@ Subject: [PATCH] Enable VAAPI on Linux
extern const char kAggregatedMlAppRankingName[];
extern const char kAggregatedMlAppRankingDescription[];
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -337,11 +337,12 @@
- },
- {
- "id": 48,
-- "description": "Accelerated video decode is unavailable on Linux",
-+ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
- "cr_bugs": [137247, 1032907],
- "os": {
- "type": "linux"
- },
-+ "vendor_id": "0x10de",
- "exceptions": [
- {
- "machine_model_name": ["Chromecast"]
diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch
index c76e078..1c6734e 100644
--- a/chromium-md5-based-build-id.patch
+++ b/chromium-md5-based-build-id.patch
@@ -3,7 +3,7 @@ https://bugzilla.rpmfusion.org/show_bug.cgi?id=5743
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -338,7 +338,7 @@ config("compiler") {
+@@ -342,7 +342,7 @@ config("compiler") {
# links.
ldflags += [ "-Wl,--build-id=sha1" ]
} else if (current_os != "aix") {
diff --git a/sources b/sources
index d94d7d0..59b84b8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-85.0.4183.121.tar.xz) = 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945
-SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e
+SHA512 (chromium-86.0.4240.111.tar.xz) = 809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54
+SHA512 (chromium-patches-chromium-86-patchset-6.tar.gz) = a2b6ada235dd39c23629c613ec0f98d7df6d4b0e95396415ab68396f730efa1dd13f0118e71992b9c279fbe1b4c39a225416915cd6af058d650252bd16e8641d
3 years, 9 months