Browse Source

Pre-update to 98.0.4758.80

master
wchen342 10 months ago
parent
commit
3db51bc54d
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 13
      chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
  2. 24
      chromium-96-CommandLine-include.patch
  3. 25
      chromium-96-CouponDB-include.patch
  4. 24
      chromium-96-DrmRenderNodePathFinder-include.patch
  5. 31
      chromium-96-RestrictedCookieManager-tuple.patch
  6. 12
      chromium-96.0.4664.110-enable-WebRTCPipeWireCapturer-byDefault.patch
  7. 21
      chromium-98.0.4758.80-EnumTable-crash.patch
  8. 48
      chromium-98.0.4758.80-enable-hardware-accelerated-mjpeg.patch
  9. 2
      sources
  10. 2
      ungoogled-chromium.desktop
  11. 48
      ungoogled-chromium.spec

13
chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch

@ -1,13 +0,0 @@
diff -up chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S
--- chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S.fixme 2020-08-21 15:49:55.565746419 +0000
+++ chromium-84.0.4147.125/third_party/ffmpeg/libavcodec/aarch64/videodsp.S 2020-08-21 15:50:55.592152015 +0000
@@ -23,6 +23,8 @@ function ff_prefetch_aarch64, export=1
prfm pldl1strm, [x0]
prfm pldl1strm, [x0, x1]
add x0, x0, x1, lsl #1
- b.gt X(ff_prefetch_aarch64)
+ b.le 1f
+ b X(ff_prefetch_aarch64)
+ 1:
ret
endfunc

24
chromium-96-CommandLine-include.patch

@ -1,24 +0,0 @@
From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 9 Oct 2021 08:27:04 +0000
Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
---
base/command_line.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/base/command_line.h b/base/command_line.h
index 706726a..ad02812 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -19,6 +19,7 @@
#include <stddef.h>
#include <functional>
#include <map>
+#include <memory>
#include <string>
#include <vector>
--
2.32.0

25
chromium-96-CouponDB-include.patch

@ -1,25 +0,0 @@
From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Wed, 6 Oct 2021 15:36:47 +0000
Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
---
chrome/browser/commerce/coupons/coupon_db.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
index f0758f4..93e2dd3 100644
--- a/chrome/browser/commerce/coupons/coupon_db.h
+++ b/chrome/browser/commerce/coupons/coupon_db.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
#define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+#include <vector>
+
#include "base/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "url/gurl.h"
--
2.32.0

24
chromium-96-DrmRenderNodePathFinder-include.patch

@ -1,24 +0,0 @@
From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 9 Oct 2021 16:17:34 +0000
Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder
---
ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
index 06776a7..d5b7b71 100644
--- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
#include <fcntl.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
--
2.32.0

31
chromium-96-RestrictedCookieManager-tuple.patch

@ -1,31 +0,0 @@
From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <[email protected]>
Date: Fri, 08 Oct 2021 06:32:55 +0000
Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager.
Fix compilation error:
../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
There is no conversion from tuple to pair.
Bug: 957519
Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
Reviewed-by: Robbie McElrath <[email protected]>
Commit-Queue: José Dapena Paz <[email protected]>
Cr-Commit-Position: refs/heads/[email protected]{#929597}
---
diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
index 425426f..c8c10c6 100644
--- a/services/network/restricted_cookie_manager.cc
+++ b/services/network/restricted_cookie_manager.cc
@@ -161,7 +161,7 @@
const GURL& url,
const net::SiteForCookies& site_for_cookies) {
std::unique_ptr<CookieAccesses>& entry =
- recent_cookie_accesses_[std::tie(url, site_for_cookies)];
+ recent_cookie_accesses_[std::make_pair(url, site_for_cookies)];
if (!entry) {
entry = std::make_unique<CookieAccesses>();
}

12
chromium-96.0.4664.110-enable-WebRTCPipeWireCapturer-byDefault.patch

@ -0,0 +1,12 @@
diff -up chromium-96.0.4664.110/content/public/common/content_features.cc.enable-WebRTCPipeWireCapturer-byDefault chromium-96.0.4664.110/content/public/common/content_features.cc
--- chromium-96.0.4664.110/content/public/common/content_features.cc.enable-WebRTCPipeWireCapturer-byDefault 2021-12-20 11:24:28.862940185 -0500
+++ chromium-96.0.4664.110/content/public/common/content_features.cc 2021-12-20 11:24:43.397027114 -0500
@@ -1125,7 +1125,7 @@ const base::Feature kAuraWindowSubtreeCa
// Controls whether the PipeWire support for screen capturing is enabled on the
// Wayland display server.
const base::Feature kWebRtcPipeWireCapturer{"WebRTCPipeWireCapturer",
- base::FEATURE_DISABLED_BY_DEFAULT};
+ base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(WEBRTC_USE_PIPEWIRE)
enum class VideoCaptureServiceConfiguration {

21
chromium-96-EnumTable-crash.patch → chromium-98.0.4758.80-EnumTable-crash.patch

@ -1,7 +1,6 @@
diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
index aad9e08..2f3fcad 100644
--- a/components/cast_channel/enum_table.h
+++ b/components/cast_channel/enum_table.h
diff -up chromium-98.0.4758.80/components/cast_channel/enum_table.h.EnumTable-crash chromium-98.0.4758.80/components/cast_channel/enum_table.h
--- chromium-98.0.4758.80/components/cast_channel/enum_table.h.EnumTable-crash 2022-02-01 00:41:47.000000000 +0000
+++ chromium-98.0.4758.80/components/cast_channel/enum_table.h 2022-02-02 18:54:23.096214186 +0000
@@ -8,6 +8,7 @@
#include <cstdint>
#include <cstring>
@ -9,8 +8,8 @@ index aad9e08..2f3fcad 100644
+#include <vector>
#include "base/check_op.h"
#include "base/macros.h"
@@ -188,7 +189,6 @@ class
#include "base/notreached.h"
@@ -187,7 +188,6 @@ class
inline constexpr GenericEnumTableEntry(int32_t value);
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
@ -18,7 +17,7 @@ index aad9e08..2f3fcad 100644
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
private:
@@ -254,7 +254,6 @@ class EnumTable {
@@ -253,7 +253,6 @@ class EnumTable {
constexpr Entry(E value, base::StringPiece str)
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
@ -26,7 +25,7 @@ index aad9e08..2f3fcad 100644
Entry& operator=(const Entry&) = delete;
};
@@ -313,15 +312,14 @@ class EnumTable {
@@ -312,15 +311,14 @@ class EnumTable {
if (is_sorted_) {
const std::size_t index = static_cast<std::size_t>(value);
if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
@ -44,7 +43,7 @@ index aad9e08..2f3fcad 100644
}
// This overload of GetString is designed for cases where the argument is a
@@ -349,8 +347,7 @@ class EnumTable {
@@ -348,8 +346,7 @@ class EnumTable {
// enum value directly.
absl::optional<E> GetEnum(base::StringPiece str) const {
auto* entry = GenericEnumTableEntry::FindByString(
@ -54,7 +53,7 @@ index aad9e08..2f3fcad 100644
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
@@ -365,7 +362,7 @@ class EnumTable {
@@ -364,7 +361,7 @@ class EnumTable {
// Align the data on a cache line boundary.
alignas(64)
#endif
@ -63,7 +62,7 @@ index aad9e08..2f3fcad 100644
bool is_sorted_;
constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
@@ -377,8 +374,8 @@ class EnumTable {
@@ -376,8 +373,8 @@ class EnumTable {
for (std::size_t i = 0; i < data.size(); i++) {
for (std::size_t j = i + 1; j < data.size(); j++) {

48
chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch → chromium-98.0.4758.80-enable-hardware-accelerated-mjpeg.patch

@ -1,7 +1,7 @@
diff -up chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/about_flags.cc
--- chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg 2021-03-04 14:02:26.379527446 -0500
+++ chromium-89.0.4389.72/chrome/browser/about_flags.cc 2021-03-04 14:06:40.208830372 -0500
@@ -3526,12 +3526,12 @@ const FeatureEntry kFeatureEntries[] = {
diff -up chromium-98.0.4758.80/chrome/browser/about_flags.cc.accel-mjpeg chromium-98.0.4758.80/chrome/browser/about_flags.cc
--- chromium-98.0.4758.80/chrome/browser/about_flags.cc.accel-mjpeg 2022-02-01 00:41:40.000000000 +0000
+++ chromium-98.0.4758.80/chrome/browser/about_flags.cc 2022-02-02 19:23:15.554137616 +0000
@@ -3822,12 +3822,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@ -17,43 +17,39 @@ diff -up chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg chromiu
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg 2021-03-02 12:45:03.000000000 -0500
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc 2021-03-04 14:07:56.648199844 -0500
@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc
"Settings. "
"See go/betterAM";
diff -up chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc
--- chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-02-02 19:23:15.555137569 +0000
+++ chromium-98.0.4758.80/chrome/browser/flag_descriptions.cc 2022-02-02 19:30:58.315465225 +0000
@@ -3979,7 +3979,7 @@ const char kUseAngleGL[] = "OpenGL";
+#endif
+
// Chrome OS -------------------------------------------------------------------
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
const char kAcceleratedMjpegDecodeDescription[] =
@@ -3987,6 +3987,10 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
+#endif
+
+// Chrome OS -------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+
const char kAllowDisableMouseAccelerationName[] =
"Allow disabling mouse acceleration";
const char kAllowDisableMouseAccelerationDescription[] =
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.h
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg 2021-03-04 14:02:26.381527456 -0500
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.h 2021-03-04 14:09:10.842558552 -0500
@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi
extern const char kAccountManagementFlowsV2Name[];
extern const char kAccountManagementFlowsV2Description[];
diff -up chromium-98.0.4758.80/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-98.0.4758.80/chrome/browser/flag_descriptions.h
--- chromium-98.0.4758.80/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-02-02 19:23:15.556137523 +0000
+++ chromium-98.0.4758.80/chrome/browser/flag_descriptions.h 2022-02-02 19:31:59.585595773 +0000
@@ -2297,11 +2297,15 @@ extern const char kUseAngleGL[];
+#endif
+
// Chrome OS ------------------------------------------------------------------
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
extern const char kAcceleratedMjpegDecodeName[];
extern const char kAcceleratedMjpegDecodeDescription[];

2
sources

@ -3,5 +3,5 @@ SHA256 (MuktiNarrow-0.94.tar.bz2) = bb8af9b9437f1d13ff8cdc8784188ebf0c2ee8b97e32
SHA256 (Ahem.ttf) = b719ecb31c5b21fc573c03f6421c74ac63c271a5a3ff841e34f9705fb94b8448
SHA256 (NotoSansTibetan-Regular.ttf) = 5a45f430812ef981952553ef6dd6fa04c7849e97880cdfecc7bf572a58efed93
SHA256 (xcb-proto-1.14.tar.xz) = 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605
SHA256 (chromium-96.0.4664.110.tar.xz) = 36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8
SHA256 (chromium-98.0.4758.80.tar.xz) = c87266e20f860a32c48affc70a769368d1b876dbad768e3aa93ee3c335944171
SHA256 (ungoogled-chromium-96.0.4664.110-1.tar.gz) = 4d851d62d67391b6ab9bb1267a92c9d0a8279fe7f7b86bdbf0c8cff7b9bbdad5

2
ungoogled-chromium.desktop

@ -134,7 +134,7 @@ X-MultipleArgs=false
Type=Application
Icon=ungoogled-chromium
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
StartupWMClass=Chromium-browser
Keywords=web;browser;internet;
Actions=new-window;new-private-window;

48
ungoogled-chromium.spec

@ -138,18 +138,18 @@ BuildRequires: libicu-devel >= 5.4
#Build with debugging symbols
%global debug_pkg 0
%global majorversion 96
%global majorversion 98
%global revision 1
# Depot tools revision
%global depot_tools_revision dc86a4b9044f9243886ca0da0c1753820ac51f45
%global depot_tools_revision a8c66d0dabec812f47b6f2a4639baca46b9b4d7a
%if %{freeworld}
Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4664.110
Version: %{majorversion}.0.4758.80
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -175,20 +175,10 @@ Patch10: chromium-92.0.4515.107-widevine-other-locations.patch
Patch11: chromium-93.0.4577.63-py3-bootstrap.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
Patch52: chromium-81.0.4044.92-unbundle-zlib.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CouponDB-include.patch
Patch59: chromium-96-CouponDB-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CommandLine-include.patch
Patch61: chromium-96-CommandLine-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-RestrictedCookieManager-tuple.patch
Patch62: chromium-96-RestrictedCookieManager-tuple.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-DrmRenderNodePathFinder-include.patch
Patch63: chromium-96-DrmRenderNodePathFinder-include.patch
# Fix issue where closure_compiler thinks java is only allowed in android builds
# https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
Patch65: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
# Work around binutils bug in aarch64 (F33+)
Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
# Rawhide (f35) glibc defines SIGSTKSZ as a long instead of a constant
Patch76: chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch
# Do not download proprietary widevine module in the background (thanks Debian)
@ -196,22 +186,23 @@ Patch79: chromium-93.0.4577.63-widevine-no-download.patch
# Fix crashes with components/cast_*
# Thanks to Gentoo
Patch80: chromium-96-EnumTable-crash.patch
Patch80: chromium-98.0.4758.80-EnumTable-crash.patch
# Clean up clang-format for python3
# thanks to Jon Nettleton
Patch86: chromium-94.0.4606.81-clang-format.patch
# include full UrlResponseHead header
Patch95: chromium-93.0.4577.63-mojo-header-fix.patch
# Fix multiple defines issue in webrtc/BUILD.gn
Patch96: chromium-94.0.4606.54-webrtc-BUILD.gn-fix-multiple-defines.patch
# From gentoo
Patch98: chromium-94.0.4606.71-InkDropHost-crash.patch
# Enable WebRTCPPipeWireCapturer by default
Patch99: chromium-96.0.4664.110-enable-WebRTCPipeWireCapturer-byDefault.patch
# VAAPI
# Upstream turned VAAPI on in Linux in 86
Patch202: chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch
Patch202: chromium-98.0.4758.80-enable-hardware-accelerated-mjpeg.patch
Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch
Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch
@ -272,7 +263,7 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
Source22: ungoogled-chromium.appdata.xml
# ungoogled-chromium source
%global ungoogled_chromium_revision 96.0.4664.110-1
%global ungoogled_chromium_revision 98.0.4758.80-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz
BuildRequires: llvm
@ -570,12 +561,7 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%if 0%{?fedora}
%patch52 -p1 -b .unbundle-zlib
%endif
%patch59 -p1 -b .CouponDB-include
%patch61 -p1 -b .CommandLine-include
%patch62 -p1 -b .RestrictedCookieManager-tuple
%patch63 -p1 -b .DrmRenderNodePathFinder-include
%patch65 -p1 -b .java-only-allowed
# %%patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround
%if 0%{?fedora} >= 35
%patch76 -p1 -b .sigstkszfix
%endif
@ -585,6 +571,7 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%patch95 -p1 -b .mojo-header-fix
%patch96 -p1 -b .webrtc-BUILD.gn-fix-multiple-defines
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault
# Feature specific patches
%if %{use_vaapi}
@ -766,7 +753,9 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \
'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \
'third_party/catapult/third_party/beautifulsoup4' \
'third_party/catapult/third_party/beautifulsoup4-4.9.3' \
'third_party/catapult/third_party/google-endpoints' \
'third_party/catapult/third_party/html5lib-1.1' \
'third_party/catapult/third_party/html5lib-python' \
'third_party/catapult/third_party/polymer' \
'third_party/catapult/third_party/six' \
@ -932,6 +921,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/shell-encryption' \
'third_party/simplejson' \
'third_party/sinonjs' \
'third_party/six' \
'third_party/skia' \
'third_party/skia/include/third_party/skcms' \
'third_party/skia/include/third_party/vulkan' \
@ -1125,6 +1115,9 @@ echo
%endif
%build_target %{builddir} policy_templates
# bug #827861, vk_swiftshader_icd.json not getting properly installed in out/Release
sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > out/Release/vk_swiftshader_icd.json
%install
rm -rf %{buildroot}
@ -1152,6 +1145,9 @@ pushd %{builddir}
cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path}
%ifarch x86_64 i686 aarch64
cp -a swiftshader %{buildroot}%{chromium_path}
cp -a libvk_swiftshader.so* %{buildroot}%{chromium_path}
cp -a libvulkan.so* %{buildroot}%{chromium_path}
cp -a vk_swiftshader_icd.json %{buildroot}%{chromium_path}
%endif
cp -a chrome %{buildroot}%{chromium_path}/%{chromium_browser_channel}
cp -a chrome_sandbox %{buildroot}%{chromium_path}/chrome-sandbox
@ -1264,6 +1260,12 @@ fi
%{chromium_path}/libclearkeycdm.so
%endif
%{chromium_path}/resources/
%ifarch x86_64 i686 aarch64
%{chromium_path}/swiftshader/
%{chromium_path}/libvk_swiftshader.so*
%{chromium_path}/libvulkan.so*
%{chromium_path}/vk_swiftshader_icd.json
%endif
%dir %{chromium_path}/locales/
%lang(am) %{chromium_path}/locales/am.pak*
%lang(ar) %{chromium_path}/locales/ar.pak*

Loading…
Cancel
Save