Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-23 09:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 79.0.3945.88

Browse source
This commit is contained in:
Алзим 2019-12-19 17:29:31 +03:00
parent 434b2232cc
commit 1d6ce8a01a
9 changed files with 95 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.abf.yml
View file

@ -1,7 +1,7 @@
sources:
chromium-78.0.3904.108.tar.xz: 6646cd52aeef8d3f78ae9255e4147c6b0feb4071
chromium-gost-92271f5a4787c2551b2dd39a4c8eda4cf56f5ea0.tar.gz: f109674a138395887db5a4903898f164ff2156d7
chromium-79.0.3945.88.tar.xz: f216cc4da1d23731de6594d7a1ab084f2ba6564d
chromium-gost-7b09253b0112b1bb7b4e89a9134cf078f4084c85.tar.gz: d34309d905981f3d03261157257530a0c7fe8f6f
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
msspi-c9939360e68a55da613ac8cd0495c6d7022a6ce7.tar.gz: ff0c8077c2b3fce7aaeb6344e61314155f198e82
msspi-0e5911974e2d76d68e24eac4599c7248d0018589.tar.gz: 852d987c066ea7ab7c8e9d638b6e96a20eca6cbb
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

4
chromium-50-system-ffmpeg-3.patch
View file

@ -2,7 +2,7 @@ diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h26
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 2016-03-22 23:02:39.000000000 +0100
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-03-23 18:51:16.810699343 +0100
@@ -15,9 +15,9 @@
#include <limits>
#include <memory>
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
@ -13,7 +13,7 @@ diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h26
+#include <libavutil/imgutils.h>
} // extern "C"
#include "absl/memory/memory.h"
#include "api/video/color_space.h"
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
--- chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h.system-ffmpeg-3 2016-03-23 18:55:39.080894319 +0100
+++ chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-03-23 18:54:32.178123691 +0100

28
chromium-55-extra-media.patch
View file

@ -46,7 +46,7 @@ diff -up chromium-62.0.3192.0/media/base/audio_codecs.h.extra-media chromium-62.
diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chromium-62.0.3192.0/media/base/mime_util_internal.cc
--- chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media 2017-08-22 21:04:45.000000000 +0200
+++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 15:44:46.519076991 +0200
@@ -87,6 +87,10 @@
@@ -88,6 +88,10 @@ const StringToCodecMap& GetStringToCodec
{"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8},
{"theora", MimeUtil::THEORA},
@ -57,7 +57,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
});
return *kStringToCodecMap;
@@ -162,6 +166,10 @@
@@ -183,6 +187,10 @@ AudioCodec MimeUtilToAudioCodec(MimeUtil
return kCodecOpus;
case MimeUtil::FLAC:
return kCodecFLAC;
@ -68,7 +68,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
default:
break;
}
@@ -184,6 +192,9 @@
@@ -205,6 +213,9 @@ VideoCodec MimeUtilToVideoCodec(MimeUtil
return kCodecTheora;
case MimeUtil::DOLBY_VISION:
return kCodecDolbyVision;
@ -78,7 +78,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
default:
break;
}
@@ -274,6 +285,35 @@
@@ -295,6 +306,35 @@ void MimeUtil::AddSupportedMediaFormats(
CodecSet ogg_codecs(ogg_audio_codecs);
ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end());
@ -105,16 +105,16 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
+#if BUILDFLAG(ENABLE_AV1_DECODER)
+ matroska_video_codecs.emplace(AV1);
+#endif
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
+ matroska_video_codecs.emplace(HEVC);
+#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
+#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
+ CodecSet matroska_codecs(matroska_audio_codecs);
+ matroska_codecs.insert(matroska_video_codecs.begin(), matroska_video_codecs.end());
+
const CodecSet webm_audio_codecs{OPUS, VORBIS};
CodecSet webm_video_codecs{VP8, VP9};
#if BUILDFLAG(ENABLE_AV1_DECODER)
@@ -283,9 +323,9 @@
@@ -304,9 +344,9 @@ void MimeUtil::AddSupportedMediaFormats(
CodecSet webm_codecs(webm_audio_codecs);
webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
@ -126,16 +126,16 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
// Only VP9 with valid codec string vp09.xx.xx.xx.xx.xx.xx.xx is supported.
// See ParseVp9CodecID for details.
@@ -309,6 +349,8 @@
#endif // BUILDFLAG(ENABLE_MPEG_H_AUDIO_DEMUXING)
@@ -330,6 +370,8 @@ void MimeUtil::AddSupportedMediaFormats(
#endif // BUILDFLAG(ENABLE_PLATFORM_MPEG_H_AUDIO)
mp4_video_codecs.emplace(H264);
+ mp4_video_codecs.emplace(MPEG4_SP);
+ mp4_video_codecs.emplace(MPEG4_ASP);
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
mp4_video_codecs.emplace(HEVC);
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
@@ -345,6 +387,10 @@
#endif // BUILDFLAG(ENABLE_PLATFORM_HEVC)
@@ -366,6 +408,10 @@ void MimeUtil::AddSupportedMediaFormats(
DCHECK(!mp4_video_codecs.empty());
AddContainerWithCodecs("video/mp4", mp4_codecs);
@ -200,7 +200,7 @@ diff -up chromium-62.0.3192.0/media/ffmpeg/ffmpeg_common.cc.extra-media chromium
- // not fill |sample_fmt|.
- case kCodecAC3:
- case kCodecEAC3:
-#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
-#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
- // The spec for AC3/EAC3 audio is ETSI TS 102 366. According to sections
- // F.3.1 and F.5.1 in that spec the sample_format for AC3/EAC3 must be 16.
- sample_format = kSampleFormatS16;
@ -219,7 +219,7 @@ diff -up chromium-62.0.3192.0/media/ffmpeg/ffmpeg_common.cc.extra-media chromium
if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
config->SetChannelsForDiscrete(codec_context->channels);
-#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
-#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
- // These are bitstream formats unknown to ffmpeg, so they don't have
- // a known sample format size.
- if (codec == kCodecAC3 || codec == kCodecEAC3)

10
chromium-68.0.3440.106-rosa-user-agent.patch
View file

@ -1,7 +1,7 @@
diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent chromium-68.0.3440.106/content/common/user_agent.cc
--- chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent 2018-08-09 03:27:45.965769824 -0400
+++ chromium-68.0.3440.106/content/common/user_agent.cc 2018-08-09 03:28:34.001586650 -0400
@@ -135,7 +135,7 @@ std::string getUserAgentPlatform() {
diff -up chromium-79.0.3945.56/content/common/user_agent.cc.fedora-user-agent chromium-79.0.3945.56/content/common/user_agent.cc
--- chromium-79.0.3945.56/content/common/user_agent.cc.fedora-user-agent 2019-12-03 14:16:13.076763501 -0500
+++ chromium-79.0.3945.56/content/common/user_agent.cc 2019-12-03 14:21:57.427351621 -0500
@@ -35,7 +35,7 @@ std::string GetUserAgentPlatform() {
#elif defined(OS_MACOSX)
return "Macintosh; ";
#elif defined(USE_X11) || defined(USE_OZONE)
@ -9,4 +9,4 @@ diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent c
+ return "X11; OS ROSA; "; // strange, but that's what Firefox uses
#elif defined(OS_ANDROID)
return "Linux; ";
#elif defined(OS_POSIX)
#elif defined(OS_FUCHSIA)

10
chromium-69-gn-bootstrap.patch Normal file
View file

@ -0,0 +1,10 @@
--- chromium-79.0.3945.79/tools/gn/bootstrap/bootstrap.py.no-static-libstdc++ 2019-12-11 11:53:17.058272551 +0100
+++ chromium-79.0.3945.79/tools/gn/bootstrap/bootstrap.py 2019-12-11 11:53:56.932576910 +0100
@@ -111,6 +111,7 @@ def main(argv):
sys.executable,
os.path.join(GN_ROOT, 'build', 'gen.py'),
'--no-last-commit-position',
+ '--no-static-libstdc++',
'--out-path=' + gn_build_dir,
]
if options.debug:

86
chromium-77-pulseaudio-13.patch
View file

@ -1,86 +0,0 @@
From b7091c42eb46871d9d7065de38de59a95f27b6f5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 1 Oct 2019 20:09:28 +0000
Subject: [PATCH] Fix building with pulseaudio 13
The function signatures changed though the ABI stayed the same.
Bug: 1008856
Change-Id: I7407ae5033d23fa08a7c5cd23417a91b0603615b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1827415
Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701726}
---
media/audio/pulse/pulse.sigs | 16 ++++++++--------
media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/media/audio/pulse/pulse.sigs b/media/audio/pulse/pulse.sigs
index 61779335b4ce8..85ff08ab78461 100644
--- a/media/audio/pulse/pulse.sigs
+++ b/media/audio/pulse/pulse.sigs
@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
-pa_context_state_t pa_context_get_state(pa_context* c);
+pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
-pa_operation_state_t pa_operation_get_state(pa_operation* o);
+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
void pa_context_unref(pa_context* c);
void pa_operation_cancel(pa_operation* o)
void pa_operation_unref(pa_operation* o);
@@ -39,23 +39,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
int pa_stream_disconnect(pa_stream* s);
int pa_stream_drop(pa_stream *p);
pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
-uint32_t pa_stream_get_device_index(pa_stream* s);
+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
-pa_stream_state_t pa_stream_get_state(pa_stream* p);
+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
pa_proplist* pa_proplist_new(void);
-int pa_proplist_contains(pa_proplist* p, const char* key);
+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
void pa_proplist_free(pa_proplist* p);
-const char* pa_proplist_gets(pa_proplist* p, const char* key);
+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
-size_t pa_stream_readable_size(pa_stream *p);
+size_t pa_stream_readable_size(const_pa_stream_ptr p);
int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
void pa_stream_unref(pa_stream* s);
-int pa_context_errno(pa_context *c);
+int pa_context_errno(const_pa_context_ptr c);
const char* pa_strerror(int error);
pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
diff --git a/media/audio/pulse/pulse_stub_header.fragment b/media/audio/pulse/pulse_stub_header.fragment
index 2a2d3e7552b9b..cdaa841b29fb1 100644
--- a/media/audio/pulse/pulse_stub_header.fragment
+++ b/media/audio/pulse/pulse_stub_header.fragment
@@ -5,4 +5,15 @@ extern "C" {
#include <pulse/pulseaudio.h>
+#if PA_MAJOR > 12
+typedef const pa_context* const_pa_context_ptr;
+typedef const pa_operation* const_pa_operation_ptr;
+typedef const pa_proplist* const_pa_proplist_ptr;
+typedef const pa_stream* const_pa_stream_ptr;
+#else
+typedef pa_context* const_pa_context_ptr;
+typedef pa_operation* const_pa_operation_ptr;
+typedef pa_proplist* const_pa_proplist_ptr;
+typedef pa_stream* const_pa_stream_ptr;
+#endif
}

32
chromium-79.0.3945.88-deleted-chromium-gost-info.patch Normal file
View file

@ -0,0 +1,32 @@
diff --git a/chrome/installer/linux/common/chromium-browser/chromium-browser.info b/chrome/installer/linux/common/chromium-browser/chromium-browser.info
index 3593c9e797ef..9826523e0f36 100644
--- a/chrome/installer/linux/common/chromium-browser/chromium-browser.info
+++ b/chrome/installer/linux/common/chromium-browser/chromium-browser.info
@@ -6,22 +6,22 @@
# chromium-browser packages for various platforms.
# Base name of the package.
-PACKAGE="chromium-browser"
+PACKAGE="chromium-gost"
# Filename of the main executable (for generating launcher scripts, etc.)
PROGNAME=chrome
# Base directory for package installation.
-INSTALLDIR=/opt/chromium.org/chromium
+INSTALLDIR=/opt/chromium-gost
# Display string for desktop menu/icon.
-MENUNAME="Chromium Web Browser"
+MENUNAME="chromium-gost"
# Brief package description.
-SHORTDESC="The web browser from Chromium.org"
+SHORTDESC="Chromium browser with GOST cryptography support"
# Detailed package description.
-FULLDESC="Chromium is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier."
+FULLDESC="Chromium is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier. This version supports GOST cryptography in TLS-connections."
# Package maintainer information.
# TODO(mmoss) Setup a mailbox for this address

47
chromium-browser-stable.spec
View file

@ -34,8 +34,8 @@
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
# GOST patches and sources
%define chromium_gost_commit 92271f5a4787c2551b2dd39a4c8eda4cf56f5ea0
%define msspi_commit c9939360e68a55da613ac8cd0495c6d7022a6ce7
%define chromium_gost_commit 7b09253b0112b1bb7b4e89a9134cf078f4084c85
%define msspi_commit 0e5911974e2d76d68e24eac4599c7248d0018589
%define _gostsourcedir %{_builddir}/chromium-gost
%if %{with gost}
@ -49,7 +49,7 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 78.0.3904.108
Version: 79.0.3945.88
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -74,6 +74,10 @@ Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_comm
Source1102: https://github.com/deemru/msspi/archive/%{msspi_commit}.tar.gz?/msspi-%{msspi_commit}.tar.gz
%endif
# needs with gost
# https://github.com/deemru/chromium-gost/blob/master/patch/chromium.patch
Patch1: chromium-79.0.3945.88-deleted-chromium-gost-info.patch
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
# (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio.
Patch6: chromium-55-extra-media.patch
@ -94,6 +98,8 @@ Patch35: chromium-50-system-ffmpeg-3.patch
Patch36: chromium-58-glib.patch
# clang builtin subtract functions, scoped enum
Patch47: chromium-61-gcc5.patch
# (cjw) fix gn bootstrapping with gcc
Patch190: chromium-69-gn-bootstrap.patch
# (cjw) fix i586 build
Patch198: chromium-72-i586.patch
@ -111,8 +117,6 @@ Patch504: chromium-system-icu-r0.patch
# https://aur.archlinux.org/packages/chromium-vaapi/
Patch508: chromium-vaapi.patch
# ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-widevine-r4.patch
Patch509: chromium-widevine-r4.patch
# ROSA Build
Patch600: chromium-buildname-60.0.3112.90.patch
@ -125,8 +129,6 @@ Patch603: chromium-66.0.3359.81-system-clang.patch
Patch604: chromium-compiler-r4.patch
# https://chromium.googlesource.com/chromium/src/+/40a8d84a54ac47d3299194c5377aebd71714f1f0%5E%21/
Patch607: chromium-67.0.3396.87-fix-build-llvm-ar.patch
# From Chromium 79 (https://github.com/chromium/chromium/commit/b7091c42eb46871d9d7065de38de59a95f27b6f5)
Patch608: chromium-77-pulseaudio-13.patch
# Add "ROSA" to the user agent string
Patch627: chromium-68.0.3440.106-rosa-user-agent.patch
@ -266,6 +268,8 @@ your profile before changing channels.
%{_crdir}/themes
%{_crdir}/default_apps
%{_crdir}/swiftshader
%{_crdir}/libEGL.so
%{_crdir}/libGLESv2.so
%dir %{_crdir}/pepper
%{_datadir}/applications/*.desktop
%{_iconsdir}/hicolor/*/apps/chromium*
@ -325,14 +329,17 @@ members of the Chromium and WebDriver teams.
%setup -qn chromium-%{version} -a 997 -a 999
%if %{with gost}
rm -rf %{_gostsourcedir}
mkdir -p %{_gostsourcedir}
tar -C %{_gostsourcedir} --strip 1 -xf %{SOURCE1101}
sed -i \
-e "s,^#include <../ssl/internal.h>,#include \"${PWD}/third_party/boringssl/src/ssl/internal.h\",g" \
%{_gostsourcedir}/src/gostssl.cpp
tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
sed -i 's/ (Chromium GOST) / /g' %{_gostsourcedir}/patch/chromium.patch
sed -i 's/Chromium GOST/Chromium/g' %{_gostsourcedir}/patch/chromium.patch
patch -p1 < %{_gostsourcedir}/patch/chromium.patch
%patch1 -p1 -R
( cd ./third_party/boringssl/src
patch -p1 < %{_gostsourcedir}/patch/boringssl.patch )
#( cd %{_gostsourcedir}
@ -358,6 +365,7 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
%endif
%patch36 -p1
%patch47 -p1
%patch190 -p1
%patch198 -p1
# new from debian
@ -372,7 +380,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
%if 0%{?libva}
%patch508 -p1 -b .vaapi
%endif
%patch509 -p1
%patch600 -p1
%patch601 -p1
@ -381,7 +388,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
%patch604 -p1
%patch607 -p1
patch -p1 < %{PATCH608}
%patch627 -p1
%patch629 -p1
@ -578,6 +584,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader' \
'third_party/swiftshader/third_party/llvm-7.0' \
'third_party/swiftshader/third_party/llvm-subzero' \
'third_party/swiftshader/third_party/marl' \
'third_party/swiftshader/third_party/subzero' \
'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1' \
'third_party/tcmalloc' \
@ -677,15 +684,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
%define use_gold true
%endif
# jumbo https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
# (Alzim) 1 - localhost, 0 - ABF build
%define localhost 0
%if 0%{localhost}
%define is_limit 100
%else
%define is_limit 50
%endif
%if 0%{?libva}
%define is_vaapi true
%else
@ -704,9 +702,9 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
custom_toolchain="%{_sourcedir}:default" \
ffmpeg_branding="Chromium" \
proprietary_codecs=true \
enable_ac3_eac3_audio_demuxing=true \
enable_platform_ac3_eac3_audio = true \
enable_mse_mpeg2ts_stream_parser=true \
enable_hevc_demuxing=true \
enable_platform_hevc=true \
use_system_libjpeg=true \
use_libjpeg_turbo=false \
enable_widevine=%{is_widevine} \
@ -723,13 +721,12 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
is_clang=%{is_clang} \
clang_use_chrome_plugins=false \
clang_base_path="%{_prefix}" \
use_jumbo_build = true \
jumbo_file_merge_limit = %{is_limit} \
use_lld=%{is_lld} \
use_system_freetype=true \
use_system_harfbuzz=false \
use_system_libpng=true \
use_vaapi=%{is_vaapi} \
enable_dav1d_decoder=true enable_libaom_decoder=false \
v8_use_external_startup_data=false \
google_api_key="%{google_api_key}" \
google_default_client_id="%{google_default_client_id}" \
@ -744,8 +741,10 @@ export CXX=clang++
export AR=ar
export NM=nm
export CFLAGS="$CFLAGS -stdlib=libc++ -Wno-unused-command-line-argument"
export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -Wno-unused-command-line-argument"
# flags to fix i586 builds
export LDFLAGS="$LDFLAGS -Wl,-z,notext -pthread"
export LDFLAGS="$LDFLAGS -Wl,-z,notext -pthread -stdlib=libc++"
%else
%setup_compile_flags
CC=%{__cc}; export CC
@ -787,6 +786,8 @@ install -m 644 out/Release/icudtl.dat %{buildroot}%{_crdir}/
install -m 644 out/Release/locales/*.pak %{buildroot}%{_crdir}/locales/
install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/
install -m 644 chrome/browser/resources/default_apps/* %{buildroot}%{_crdir}/default_apps/
install -m 755 out/Release/libEGL.so %{buildroot}%{_crdir}/
install -m 755 out/Release/libGLESv2.so %{buildroot}%{_crdir}/
ln -s %{_crdir}/chromium-wrapper %{buildroot}%{_bindir}/%{crname}
sed -i "s!@LIBDIR@!%{_libdir}!g" %{buildroot}%{_crdir}/chromium-wrapper
ln -s %{_crdir}/chromedriver %{buildroot}%{_bindir}/chromedriver

9
chromium-compiler-r4.patch
View file

@ -19,7 +19,7 @@
cflags += [ "-Wno-deprecated-declarations" ]
# -Wcomment gives too many false positives in the case a
@@ -1492,37 +1487,6 @@ config("default_warnings") {
@@ -1507,38 +1502,6 @@ config("default_warnings") {
# Currently goma can not handle case sensitiveness for windows well.
cflags += [ "-Wno-nonportable-include-path" ]
}
@ -35,9 +35,6 @@
- # TODO(https://crbug.com/989932): Evaluate and possibly enable.
- "-Wno-implicit-int-float-conversion",
-
- # TODO(https://crbug.com/995200): Clean up and enable.
- "-Wno-xor-used-as-pow",
-
- # TODO(https://crbug.com/999871): Decide if we want to clean up the
- # codebase or just disable this. Doesn't seem super useful, but
- # also fires in only 4 files.
@ -48,7 +45,11 @@
-
- # TODO(https://crbug.com/999886): Clean up, enable.
- "-Wno-final-dtor-non-final-class",
-
- # TODO(https://crbug.com/1002945): Evaluate and possibly enable.
- "-Wno-sizeof-array-div",
- ]
-
- cflags_c += [
- # TODO(https://crbug.com/995993): Clean up and enable.
- "-Wno-implicit-fallthrough",