install new built libraries in chromium folder [release 116.0.5845.110-2mamba;Sat Aug 26 2023]
This commit is contained in:
parent
d8a1244821
commit
5906d9643e
@ -0,0 +1,49 @@
|
||||
From 54969766fd2029c506befc46e9ce14d67c7ed02a Mon Sep 17 00:00:00 2001
|
||||
From: Arthur Eubanks <aeubanks@google.com>
|
||||
Date: Tue, 25 Apr 2023 03:05:19 +0000
|
||||
Subject: [PATCH] Reland [clang] Disable autoupgrading debug info in ThinLTO
|
||||
builds
|
||||
|
||||
ThinLTO reads bitcode many times and attempts to upgrade the debug info every time. This is expensive since it calls the verifier. We don't need this given all LLVM bitcode producers are from the same version of LLVM.
|
||||
|
||||
For just the build step that runs ThinLTO and links official Chrome, measured 34T -> 32T instructions via perf stat.
|
||||
|
||||
Reland disables adding flag for ChromeOS since that toolchain is too old to have this flag.
|
||||
|
||||
Bug: 972449
|
||||
Change-Id: I44552dd6c9dc71683c002d0c885e78b2a4341659
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4470209
|
||||
Reviewed-by: Nico Weber <thakis@chromium.org>
|
||||
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#1135007}
|
||||
---
|
||||
build/config/compiler/BUILD.gn | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 1c13bc80f0f..53db095c1b1 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -685,6 +685,7 @@ config("compiler") {
|
||||
"/lldltocache:" +
|
||||
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
|
||||
"/lldltocachepolicy:$cache_policy",
|
||||
+ "-mllvm:-disable-auto-upgrade-debug-info",
|
||||
]
|
||||
} else {
|
||||
ldflags += [ "-flto=thin" ]
|
||||
@@ -725,6 +726,14 @@ config("compiler") {
|
||||
}
|
||||
|
||||
ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
|
||||
+
|
||||
+ if (!is_chromeos) {
|
||||
+ # TODO(https://crbug.com/972449): turn on for ChromeOS when that
|
||||
+ # toolchain has this flag.
|
||||
+ # We only use one version of LLVM within a build so there's no need to
|
||||
+ # upgrade debug info, which can be expensive since it runs the verifier.
|
||||
+ ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
|
||||
+ }
|
||||
}
|
||||
|
||||
# TODO(https://crbug.com/1211155): investigate why this isn't effective on
|
10
chromium-116-0.5845.110-aarch64-include-limits.patch
Normal file
10
chromium-116-0.5845.110-aarch64-include-limits.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- chromium-116.0.5845.110/third_party/abseil-cpp/absl/debugging/stacktrace.cc.orig 2023-08-26 14:23:36.138606451 +0100
|
||||
+++ chromium-116.0.5845.110/third_party/abseil-cpp/absl/debugging/stacktrace.cc 2023-08-26 14:24:24.048294851 +0100
|
||||
@@ -37,6 +37,7 @@
|
||||
#include "absl/debugging/stacktrace.h"
|
||||
|
||||
#include <atomic>
|
||||
+#include <limits>
|
||||
|
||||
#include "absl/base/attributes.h"
|
||||
#include "absl/base/port.h"
|
516
chromium-116.0.5845.96-randrom-build-fixes.patch
Normal file
516
chromium-116.0.5845.96-randrom-build-fixes.patch
Normal file
@ -0,0 +1,516 @@
|
||||
diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
index 93ec91e38b9..acd25f25d15 100644
|
||||
--- a/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
||||
@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item) {
|
||||
// Helper to get an iterator to the last element in the cache. The cache
|
||||
// must not be empty.
|
||||
template <typename Item>
|
||||
-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
||||
CHECK(!cache.empty());
|
||||
auto it = cache.end();
|
||||
return std::prev(it);
|
||||
@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheImpl(
|
||||
}
|
||||
|
||||
template <typename Id, typename Item>
|
||||
-SortedItems<Item>::iterator
|
||||
+typename SortedItems<Item>::iterator
|
||||
DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
|
||||
- SortedItems<Item>::iterator iter,
|
||||
+ typename SortedItems<Item>::iterator iter,
|
||||
SortedItems<Item>& cache,
|
||||
IterMap<Id, Item>& iter_map) {
|
||||
CHECK(iter != cache.end());
|
||||
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
index d923cdfa322..36ac59ca7ac 100644
|
||||
--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||||
@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocompleteAccept(
|
||||
alternative_nav_match);
|
||||
|
||||
// Store the details necessary to open the omnibox match via browser commands.
|
||||
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
|
||||
+ location_bar_->set_navigation_params(LocationBar::NavigationParams{
|
||||
destination_url, disposition, transition, match_selection_timestamp,
|
||||
destination_url_entered_without_scheme,
|
||||
- destination_url_entered_with_http_scheme));
|
||||
+ destination_url_entered_with_http_scheme});
|
||||
|
||||
if (browser_) {
|
||||
auto navigation = chrome::OpenCurrentURL(browser_);
|
||||
diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
|
||||
index a29dc8e4818..00aaf9b4067 100644
|
||||
--- a/chrome/test/chromedriver/capabilities.cc
|
||||
+++ b/chrome/test/chromedriver/capabilities.cc
|
||||
@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::Value& option,
|
||||
"'version' field of type string");
|
||||
}
|
||||
|
||||
- brands.emplace_back(*brand, *version);
|
||||
+ brands.emplace_back(BrandVersion{*brand, *version});
|
||||
}
|
||||
|
||||
client_hints.brands = std::move(brands);
|
||||
@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::Value& option,
|
||||
"a 'version' field of type string");
|
||||
}
|
||||
|
||||
- full_version_list.emplace_back(*brand, *version);
|
||||
+ full_version_list.emplace_back(BrandVersion{*brand, *version});
|
||||
}
|
||||
|
||||
client_hints.full_version_list = std::move(full_version_list);
|
||||
diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h
|
||||
index 31417bc8d9d..abd41f4c8d4 100644
|
||||
--- a/components/optimization_guide/core/tflite_model_executor.h
|
||||
+++ b/components/optimization_guide/core/tflite_model_executor.h
|
||||
@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
|
||||
void SendForBatchExecution(
|
||||
BatchExecutionCallback callback_on_complete,
|
||||
base::TimeTicks start_time,
|
||||
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
||||
override {
|
||||
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
index 3bace0dab10..0ea54d136ea 100644
|
||||
--- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
+++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||||
@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
|
||||
|
||||
// Issue readbacks from the surfaces:
|
||||
for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
|
||||
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
|
||||
+ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
|
||||
SkImageInfo dst_info = SkImageInfo::Make(
|
||||
size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
|
||||
kUnpremul_SkAlphaType);
|
||||
diff --git a/content/public/browser/web_ui_browser_interface_broker_registry.h b/content/public/browser/web_ui_browser_interface_broker_registry.h
|
||||
index 0a419be66b3..7253c9680f7 100644
|
||||
--- a/content/public/browser/web_ui_browser_interface_broker_registry.h
|
||||
+++ b/content/public/browser/web_ui_browser_interface_broker_registry.h
|
||||
@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegistry {
|
||||
//
|
||||
// TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
|
||||
template <typename ControllerType>
|
||||
- JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
||||
+ typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
||||
using Traits = JsBridgeTraits<ControllerType>;
|
||||
- using Interface = Traits::Interface;
|
||||
- using JsBridgeBinderInitializer = Traits::BinderInitializer;
|
||||
+ using Interface = typename Traits::Interface;
|
||||
+ using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
|
||||
|
||||
// WebUIController::GetType() requires an instantiated WebUIController
|
||||
// (because it's a virtual method and can't be static). Here we only have
|
||||
diff --git a/net/dns/host_resolver_cache.cc b/net/dns/host_resolver_cache.cc
|
||||
index df037a1a440..b2152d54408 100644
|
||||
--- a/net/dns/host_resolver_cache.cc
|
||||
+++ b/net/dns/host_resolver_cache.cc
|
||||
@@ -159,7 +159,7 @@ void HostResolverCache::Set(
|
||||
|
||||
std::string domain_name = result->domain_name();
|
||||
entries_.emplace(
|
||||
- Key(std::move(domain_name), network_anonymization_key),
|
||||
+ Key{std::move(domain_name), network_anonymization_key},
|
||||
Entry(std::move(result), source, secure, staleness_generation_));
|
||||
|
||||
if (entries_.size() > max_entries_) {
|
||||
diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
index f9cf9f5ae86..0566ae194ce 100644
|
||||
--- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
+++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
||||
@@ -169,7 +169,7 @@ class HTMLFastPathParser {
|
||||
using Span = base::span<const Char>;
|
||||
using USpan = base::span<const UChar>;
|
||||
// 32 matches that used by HTMLToken::Attribute.
|
||||
- typedef std::conditional<std::is_same_v<Char, UChar>,
|
||||
+ typedef typename std::conditional<std::is_same_v<Char, UChar>,
|
||||
UCharLiteralBuffer<32>,
|
||||
LCharLiteralBuffer<32>>::type LiteralBufferType;
|
||||
typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
|
||||
diff --git a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
||||
index 8bb1639676c..350bdbd5fde 100644
|
||||
--- a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
||||
+++ b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
||||
@@ -269,8 +270,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public ObjectPaintProperties {
|
||||
NodeList& nodes,
|
||||
NodeId node_id,
|
||||
const ParentType& parent,
|
||||
- NodeType::State&& state,
|
||||
- const NodeType::AnimationState& animation_state =
|
||||
+ typename NodeType::State&& state,
|
||||
+ const typename NodeType::AnimationState& animation_state =
|
||||
NodeType::AnimationState()) {
|
||||
// First, check if we need to add a new node.
|
||||
if (!nodes.HasField(node_id)) {
|
||||
diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
||||
index 883d769ca4b..1b4b75bbaf7 100644
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
||||
@@ -83,12 +83,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
|
||||
case kGradient:
|
||||
GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
|
||||
ImageDrawOptions());
|
||||
- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
|
||||
+ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
|
||||
break;
|
||||
case kImagePattern:
|
||||
GetCanvasPattern()->GetPattern()->ApplyToFlags(
|
||||
flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
|
||||
- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
|
||||
+ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
|
||||
break;
|
||||
default:
|
||||
NOTREACHED();
|
||||
diff --git a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
index 5a0121510ae..0cf45e0b0da 100644
|
||||
--- a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
+++ b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||||
@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterpolation::MixColorRecords(
|
||||
color_interpolation_space, hue_interpolation_method, start_color,
|
||||
end_color, percentage, alpha_multiplier);
|
||||
|
||||
- FontPalette::FontPaletteOverride result_color_record(i, result_color);
|
||||
+ FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
|
||||
result_color_records.push_back(result_color_record);
|
||||
}
|
||||
return result_color_records;
|
||||
diff --git a/ui/base/wayland/color_manager_util.h b/ui/base/wayland/color_manager_util.h
|
||||
index fa1dd422c0e..52d3702e3e5 100644
|
||||
--- a/ui/base/wayland/color_manager_util.h
|
||||
+++ b/ui/base/wayland/color_manager_util.h
|
||||
@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap<
|
||||
zcr_color_manager_v1_chromaticity_names,
|
||||
PrimaryVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB,
|
||||
- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::BT470M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::XYZ_D50,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::SMPTEST431_2,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM,
|
||||
- PrimaryVersion(
|
||||
+ PrimaryVersion{
|
||||
gfx::ColorSpace::PrimaryID::FILM,
|
||||
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}});
|
||||
|
||||
// A map from the zcr_color_manager_v1 eotf_names enum values
|
||||
// representing well-known EOTFs, to their equivalent TransferIDs.
|
||||
@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixedFlatMap<
|
||||
zcr_color_manager_v1_eotf_names,
|
||||
TransferVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT709,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
// This is ever so slightly inaccurate. The number ought to be
|
||||
// 2.19921875f, not 2.2
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::HLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::HLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SMPTEST428_1,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::IEC61966_2_4,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS,
|
||||
- TransferVersion(
|
||||
+ TransferVersion{
|
||||
gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28,
|
||||
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)},
|
||||
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}},
|
||||
});
|
||||
|
||||
// A map from the SDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixedFlatMap<
|
||||
constexpr auto kTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kRec709,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||||
- TransferFnVersion(gamma24, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{gamma24, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kA98RGB,
|
||||
- kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB,
|
||||
+ kDefaultSinceVersion}},
|
||||
});
|
||||
|
||||
// A map from the HDR zcr_color_manager_v1 eotf_names enum values
|
||||
@@ -194,68 +194,68 @@ constexpr auto kTransferMap =
|
||||
constexpr auto kHDRTransferMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||||
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||||
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||||
- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||||
- TransferFnVersion(SkNamedTransferFn::kHLG,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||||
+ TransferFnVersion{SkNamedTransferFn::kHLG,
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10,
|
||||
- TransferFnVersion(
|
||||
+ TransferFnVersion{
|
||||
SkNamedTransferFnExt::kSRGBExtended1023Over510,
|
||||
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}});
|
||||
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 matrix_names enum values to
|
||||
// gfx::ColorSpace::MatrixIDs.
|
||||
constexpr auto kMatrixMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT709,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG,
|
||||
- MatrixVersion(
|
||||
+ MatrixVersion{
|
||||
gfx::ColorSpace::MatrixID::BT470BG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)},
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::GBR,
|
||||
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR,
|
||||
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
- kDefaultSinceVersion)},
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M,
|
||||
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
// A map from zcr_color_manager_v1 range_names enum values to
|
||||
// gfx::ColorSpace::RangeIDs.
|
||||
constexpr auto kRangeMap =
|
||||
base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
|
||||
{{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
|
||||
- kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED,
|
||||
+ kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)},
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}},
|
||||
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED,
|
||||
- RangeVersion(gfx::ColorSpace::RangeID::DERIVED,
|
||||
- kDefaultSinceVersion)}});
|
||||
+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED,
|
||||
+ kDefaultSinceVersion}}});
|
||||
|
||||
zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity(
|
||||
gfx::ColorSpace::PrimaryID primaryID,
|
||||
--- chromium-116.0.5845.82.orig/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-11 18:10:42.162664104 +0000
|
||||
+++ chromium-116.0.5845.82/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-11 18:14:48.571543555 +0000
|
||||
@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen
|
||||
|
||||
while (rule_iterator && rule_iterator->HasNext()) {
|
||||
auto rule = rule_iterator->Next();
|
||||
- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
|
||||
- rule->secondary_pattern);
|
||||
+ patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern,
|
||||
+ rule->secondary_pattern});
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
setting_type,
|
||||
permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
|
||||
@@ -303,7 +303,7 @@ void OneTimePermissionProvider::DeleteEn
|
||||
if (rule->primary_pattern.Matches(origin_gurl) &&
|
||||
rule->secondary_pattern.Matches(origin_gurl)) {
|
||||
patterns_to_delete.emplace_back(
|
||||
- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
|
||||
+ ContentSettingEntry{content_setting_type, rule->primary_pattern, rule->secondary_pattern});
|
||||
permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
||||
content_setting_type, trigger_event);
|
||||
}
|
@ -2,8 +2,8 @@
|
||||
%define gcc_patchset 2
|
||||
Name: chromium
|
||||
Epoch: 3
|
||||
Version: 111.0.5563.110
|
||||
Release: 1mamba
|
||||
Version: 116.0.5845.110
|
||||
Release: 2mamba
|
||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||
Group: Graphical Desktop/Applications/Internet
|
||||
Vendor: openmamba
|
||||
@ -57,6 +57,9 @@ Patch37: chromium-105.0.5195.102-angle-wayland-include-protocol.patch
|
||||
Patch38: chromium-109.0.5414.119-REVERT-roll-src-third_party-ffmpeg-m106.patch
|
||||
Patch39: chromium-110.0.5481.177-v8-move-the-Stack-object-from-ThreadLocalTop.patch
|
||||
Patch40: chromium-111.0.5563.110-sql-relax-constraints-on-VirtualCursor-layout.patch
|
||||
Patch41: chromium-115.0.5790.170-REVERT-disable-autoupgrading-debug-info.patch
|
||||
Patch42: chromium-116.0.5845.96-randrom-build-fixes.patch
|
||||
Patch43: chromium-116-0.5845.110-aarch64-include-limits.patch
|
||||
License: BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -67,13 +70,11 @@ BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libalsa-devel
|
||||
BuildRequires: libaom-devel
|
||||
BuildRequires: libat-spi2-core-devel
|
||||
BuildRequires: libatomic-devel
|
||||
BuildRequires: libavcodec-ffmpeg-devel
|
||||
BuildRequires: libavformat-ffmpeg-devel
|
||||
BuildRequires: libavutil-ffmpeg-devel
|
||||
BuildRequires: libbrotli-devel
|
||||
BuildRequires: libcairo-devel
|
||||
BuildRequires: libcups-devel
|
||||
BuildRequires: libdav1d-devel
|
||||
@ -109,20 +110,20 @@ BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libz-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: libharfbuzz-devel >= 3.0.0
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libbrotli-tools
|
||||
BuildRequires: libdbus-glib-devel
|
||||
BuildRequires: libe2fs-devel
|
||||
BuildRequires: libexif-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libkeyutils-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
BuildRequires: libpci-devel
|
||||
BuildRequires: libre2-devel >= 2023.08.01
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXxf86vm-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
BuildRequires: libe2fs-devel
|
||||
BuildRequires: libxshmfence-devel
|
||||
BuildRequires: libkeyutils-devel
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libpci-devel
|
||||
BuildRequires: libexif-devel
|
||||
BuildRequires: libXtst-devel
|
||||
BuildRequires: llvm
|
||||
BuildRequires: llvm-tools
|
||||
@ -171,23 +172,22 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||
%patch 3 -p1
|
||||
%endif
|
||||
%patch 7 -p1 -b .use-oauth2-client-switches-as-default
|
||||
#%patch35 -p1 -b .remove-no-opaque-pointers-flag
|
||||
#%patch21 -p0 -b .unexpire-accelerated-video-decode-flag
|
||||
#%patch22 -Rp1 -b .add-a-TODO-about-a-missing-pnacl-flag
|
||||
#%patch18 -Rp1 -b .use-ffile-compilation-dir
|
||||
#%patch36 -p1 -b .tflite-system-zlib
|
||||
%patch 33 -Rp1 -b .roll-src-third_party-ffmpeg
|
||||
#%patch 33 -Rp1 -b .roll-src-third_party-ffmpeg
|
||||
#%patch12 -p1 -b .sql-make-VirtualCursor-standard-layout-type
|
||||
%patch 37 -p0 -b .angle-wayland-include-protocol
|
||||
%patch 38 -Rp1 -b .REVERT-roll-src-third_party-ffmpeg-m106
|
||||
#%patch 37 -p0 -b .angle-wayland-include-protocol
|
||||
#%patch 38 -Rp1 -b .REVERT-roll-src-third_party-ffmpeg-m106
|
||||
#%patch 39 -p1 -d v8 -b .v8-move-the-Stack-object-from-ThreadLocalTop
|
||||
%patch 40 -p1 -b .sql-relax-constraints-on-VirtualCursor-layout
|
||||
#%patch 40 -p1 -b .sql-relax-constraints-on-VirtualCursor-layout
|
||||
%patch 41 -Rp1 -b .REVERT-disable-autoupgrading-debug-info
|
||||
%patch 42 -p1 -b .randrom-build-fixes
|
||||
%patch 43 -p1
|
||||
|
||||
# Fixes for building with libstdc++ instead of libc++
|
||||
#patch -Np1 -i patches/chromium-103-VirtualCursor-std-layout.patch
|
||||
#patch -Np1 -i patches/chromium-110-NativeThemeBase-fabs.patch
|
||||
#patch -Np1 -i patches/chromium-110-CredentialUIEntry-const.patch
|
||||
#patch -Np1 -i patches/chromium-110-DarkModeLABColorSpace-pow.patch
|
||||
patch -Np1 -i patches/chromium-114-maldoca-include.patch
|
||||
patch -Np1 -i patches/chromium-114-ruy-include.patch
|
||||
patch -Np1 -i patches/chromium-114-vk_mem_alloc-include.patch
|
||||
patch -Np1 -i patches/chromium-116-object_paint_properties_sparse-include.patch
|
||||
patch -Np1 -i patches/chromium-116-profile_view_utils-include.patch
|
||||
|
||||
# Force script incompatible with Python 3 to use /usr/bin/python2
|
||||
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
|
||||
@ -213,7 +213,7 @@ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
|
||||
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
|
||||
# Keys are the names in the above script; values are the dependencies in Arch
|
||||
declare -rgA _system_libs=(
|
||||
[brotli]=brotli
|
||||
#[brotli]=brotli
|
||||
[dav1d]=dav1d
|
||||
[ffmpeg]=ffmpeg
|
||||
[flac]=flac
|
||||
@ -222,7 +222,7 @@ declare -rgA _system_libs=(
|
||||
[harfbuzz-ng]=harfbuzz
|
||||
[icu]=icu
|
||||
[jsoncpp]=jsoncpp
|
||||
[libaom]=aom
|
||||
#[libaom]=aom
|
||||
#[libavif]=libavif
|
||||
[libdrm]=
|
||||
[libjpeg]=libjpeg
|
||||
@ -319,16 +319,16 @@ chromium_conf=(
|
||||
'use_custom_libcxx=false'
|
||||
'use_gnome_keyring=false'
|
||||
'use_sysroot=false'
|
||||
'use_system_libffi=true'
|
||||
'use_system_libwayland=true'
|
||||
'use_system_wayland_scanner=true'
|
||||
'use_system_libffi=true'
|
||||
'enable_hangout_services_extension=true'
|
||||
'enable_widevine=true'
|
||||
'enable_nacl=false'
|
||||
'google_api_key="AIzaSyBT3wXwxmFuUQcyeMyp0MbHHhhFwNfWKTc"'
|
||||
'enable_rust=false'
|
||||
'google_api_key="AIzaSyBT3wXwxmFuUQcyeMyp0MbHHhhFwNfWKTc"'
|
||||
'is_debug=false'
|
||||
'icu_use_data_file=false'
|
||||
'toolprefix="%{_target_platform}-"'
|
||||
)
|
||||
|
||||
# 'use_vaapi=true'
|
||||
@ -376,8 +376,11 @@ cp -a out/Release/*.pak %{buildroot}%{_libdir}/chromium/
|
||||
install -D -m0644 chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium.png
|
||||
cp -a out/Release/locales %{buildroot}%{_libdir}/chromium/
|
||||
#install -d -m0755 %{buildroot}%{_libdir}/chromium/swiftshader
|
||||
cp -a out/Release/libvk_swiftshader.so %{buildroot}%{_libdir}/chromium/
|
||||
cp -a out/Release/vk_swiftshader_icd.json %{buildroot}%{_libdir}/chromium/
|
||||
|
||||
for l in libvk_swiftshader.so vk_swiftshader_icd.json \
|
||||
libvulkan.so.1 libVkICD_mock_icd.so libVkLayer_khronos_validation.so; do
|
||||
cp -a out/Release/${l} %{buildroot}%{_libdir}/chromium/
|
||||
done
|
||||
|
||||
# Install deskktop file and man
|
||||
install -Dm644 chrome/installer/linux/common/desktop.template %{buildroot}%{_datadir}/applications/chromium.desktop
|
||||
@ -453,6 +456,7 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
||||
%attr(4755,root,root) %{_libdir}/chromium/chrome-sandbox
|
||||
%{_libdir}/chromium/libEGL.so
|
||||
%{_libdir}/chromium/libGLESv2.so
|
||||
%{_libdir}/chromium/libvulkan.so.1
|
||||
%{_libdir}/chromium/master_preferences
|
||||
%if "%cross_target_cpu" != "i586"
|
||||
%{_libdir}/chromium/protoc
|
||||
@ -463,6 +467,15 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
||||
%{_mandir}/man1/chromium.1*
|
||||
|
||||
%changelog
|
||||
* Sat Aug 26 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 116.0.5845.110-2mamba
|
||||
- install new built libraries in chromium folder
|
||||
|
||||
* Thu Aug 24 2023 Automatic Build System <autodist@mambasoft.it> 116.0.5845.110-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Aug 19 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 116.0.5845.96-1mamba
|
||||
- update to 116.0.5845.96
|
||||
|
||||
* Mon Mar 27 2023 Automatic Build System <autodist@mambasoft.it> 111.0.5563.110-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user