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 17:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 77.0.3865.75

Browse source
This commit is contained in:
Алзим 2019-09-13 00:11:53 +03:00
parent 6055e4cf78
commit b70331b7c4
9 changed files with 237 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,5 +1,5 @@
sources:
chromium-76.0.3809.132.tar.xz: d8cf329fbfbe899207ea388fdecfefed240bc404
chromium-77.0.3865.75.tar.xz: dd83cde3aff99a87ea57a054633de6778834b97a
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

196
chromium-40-sorenson-spark.patch
View file

@ -1,7 +1,7 @@
diff -up chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg chromium-62.0.3192.0/media/base/mime_util_internal.h
--- chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg 2017-08-30 15:52:00.602204610 +0200
+++ chromium-62.0.3192.0/media/base/mime_util_internal.h 2017-08-30 15:52:00.616204356 +0200
@@ -48,7 +48,19 @@ class MEDIA_EXPORT MimeUtil {
@@ -48,7 +48,20 @@ class MEDIA_EXPORT MimeUtil {
MP2,
MPEG4_SP,
MPEG4_ASP,
@ -13,7 +13,8 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg chromium
+ WMV8,
+ WMV9,
+ VC1,
+ WMA,
+ WMA1,
+ WMA2,
+ VP6,
+ MPEG1,
+ MPEG2,
@ -25,6 +26,28 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.h.wmvflvmpg chromium
diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc
--- chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 2016-03-23 18:22:20.227596097 +0100
+++ chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc 2016-03-23 18:22:20.245595771 +0100
@@ -120,6 +120,10 @@ AudioCodec CodecIDToAudioCodec(AVCodecID
return kCodecMP2;
case AV_CODEC_ID_DTS:
return kCodecDTS;
+ case AV_CODEC_ID_WMAV1:
+ return kCodecWMA1;
+ case AV_CODEC_ID_WMAV2:
+ return kCodecWMA2;
default:
DVLOG(1) << "Unknown audio CodecID: " << codec_id;
}
@@ -179,6 +183,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec
return AV_CODEC_ID_MP2;
case kCodecDTS:
return AV_CODEC_ID_DTS;
+ case kCodecWMA1:
+ return AV_CODEC_ID_WMAV1;
+ case kCodecWMA2:
+ return AV_CODEC_ID_WMAV2;
default:
DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
}
@@ -197,6 +197,28 @@
return kCodecVP9;
case AV_CODEC_ID_AV1:
@ -85,6 +108,24 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
}
--- chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc.bak.2 2016-12-01 23:42:15.717317808 +0100
+++ chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc 2016-12-01 23:44:59.695754038 +0100
@@ -60,6 +60,8 @@ base::Optional<AudioCodec> ToMediaAudioC
CASE_RETURN_OTHER(kCodecMpegHAudio);
CASE_RETURN_OTHER(kCodecMP2);
CASE_RETURN_OTHER(kCodecDTS);
+ CASE_RETURN_OTHER(kCodecWMA1);
+ CASE_RETURN_OTHER(kCodecWMA2);
}
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
@@ -89,6 +91,8 @@ base::Optional<pb::AudioDecoderConfig::C
CASE_RETURN_OTHER(kCodecMpegHAudio);
CASE_RETURN_OTHER(kCodecMP2);
CASE_RETURN_OTHER(kCodecDTS);
+ CASE_RETURN_OTHER(kCodecWMA1);
+ CASE_RETURN_OTHER(kCodecWMA2);
}
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
@@ -227,6 +227,15 @@
CASE_RETURN_OTHER(kCodecHEVC);
CASE_RETURN_OTHER(kCodecDolbyVision);
@ -119,6 +160,15 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
}
--- chromium-56.0.2924.10/media/remoting/media_remoting_rpc.proto.bak.2 2016-12-02 02:15:05.660562641 +0100
+++ chromium-56.0.2924.10/media/remoting/media_remoting_rpc.proto 2016-12-02 02:15:48.885796867 +0100
@@ -69,6 +69,8 @@ message AudioDecoderConfig {
kCodecMpegHAudio = 17;
kCodecMP2 = 18;
kCodecDTS = 19;
+ kCodecWMA1 = 20;
+ kCodecWMA2 = 21;
}
// Proto version of media::SampleFormat.
@@ -154,6 +154,15 @@
kCodecHEVC = 8;
kCodecDolbyVision = 9;
@ -171,7 +221,7 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
+ case kCodecMSMPEG4V2:
+ return "msmpeg4v2";
+ case kCodecMSMPEG4V3:
+ return "msmpeg4v2";
+ return "msmpeg4v3";
+ case kCodecWMV7:
+ return "wmv1";
+ case kCodecWMV8:
@ -195,7 +245,7 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
+ return kCodecMSMPEG4V1;
+ if (codec_id == "msmpeg4v2")
+ return kCodecMSMPEG4V2;
+ if (codec_id == "msmpeg4v2")
+ if (codec_id == "msmpeg4v3")
+ return kCodecMSMPEG4V3;
+ if (codec_id == "wmv1")
+ return kCodecWMV7;
@ -236,6 +286,24 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
--- chromium-73.0.3683.75/media/base/supported_types.cc.flv 2019-03-17 18:44:45.934825471 +0100
+++ chromium-73.0.3683.75/media/base/supported_types.cc 2019-03-17 18:44:50.562746764 +0100
@@ -150,6 +150,8 @@ bool IsAudioCodecProprietary(AudioCodec
case kCodecGSM_MS:
case kCodecALAC:
case kCodecMpegHAudio:
+ case kCodecWMA1:
+ case kCodecWMA2:
return true;
case kCodecFLAC:
@@ -189,6 +191,8 @@ bool IsDefaultSupportedAudioType(const A
case kCodecALAC:
case kCodecAC3:
case kCodecDTS:
+ case kCodecWMA1:
+ case kCodecWMA2:
return true;
case kCodecAMR_NB:
@@ -217,6 +217,15 @@ bool IsVideoCodecProprietary(VideoCodec
case kCodecMPEG4:
case kCodecHEVC:
@ -252,19 +320,111 @@ diff -up chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.flv1 chromium-51.0.2
return true;
case kUnknownVideoCodec:
case kCodecTheora:
@@ -255,6 +254,15 @@ bool IsDefaultSupportedVideoType(const V
case media::kCodecMPEG2:
case media::kCodecMPEG4:
case media::kCodecHEVC:
+ case media::kCodecMSMPEG4V1:
+ case media::kCodecMSMPEG4V2:
+ case media::kCodecMSMPEG4V3:
+ case media::kCodecWMV7:
+ case media::kCodecWMV8:
+ case media::kCodecWMV9:
+ case media::kCodecVP6:
+ case media::kCodecMPEG1:
+ case media::kCodecSorensonSpark:
@@ -254,6 +263,15 @@ bool IsDefaultSupportedVideoType(const V
case kCodecMPEG2:
case kCodecHEVC:
case kCodecMPEG4:
+ case kCodecMSMPEG4V1:
+ case kCodecMSMPEG4V2:
+ case kCodecMSMPEG4V3:
+ case kCodecWMV7:
+ case kCodecWMV8:
+ case kCodecWMV9:
+ case kCodecVP6:
+ case kCodecMPEG1:
+ case kCodecSorensonSpark:
return true;
case media::kUnknownVideoCodec:
case kUnknownVideoCodec:
--- chromium-74.0.3729.40/media/base/audio_codecs.cc.wma 2019-03-29 22:57:18.887316626 +0100
+++ chromium-74.0.3729.40/media/base/audio_codecs.cc 2019-03-29 23:15:45.965274473 +0100
@@ -50,6 +50,10 @@ std::string GetCodecName(AudioCodec code
return "mp2";
case kCodecDTS:
return "dts";
+ case kCodecWMA1:
+ return "wma1";
+ case kCodecWMA2:
+ return "wma2";
}
NOTREACHED();
return "";
@@ -80,6 +84,10 @@ AudioCodec StringToAudioCodec(const std:
return kCodecMP2;
if (codec_id == "dts")
return kCodecDTS;
+ if (codec_id == "wma1")
+ return kCodecWMA1;
+ if (codec_id == "wma2")
+ return kCodecWMA2;
return kUnknownAudioCodec;
}
--- chromium-74.0.3729.40/media/base/audio_codecs.h.wma 2019-03-29 22:57:18.889316591 +0100
+++ chromium-74.0.3729.40/media/base/audio_codecs.h 2019-03-29 23:17:16.560724846 +0100
@@ -35,13 +35,15 @@ enum AudioCodec {
kCodecMpegHAudio = 17,
kCodecMP2 = 18,
kCodecDTS = 19,
+ kCodecWMA1 = 20,
+ kCodecWMA2 = 21,
// DO NOT ADD RANDOM AUDIO CODECS!
//
// The only acceptable time to add a new codec is if there is production code
// that uses said codec in the same CL.
// Must always be equal to the largest entry ever logged.
- kAudioCodecMax = kCodecDTS,
+ kAudioCodecMax = kCodecWMA2,
};
std::string MEDIA_EXPORT GetCodecName(AudioCodec codec);
--- chromium-74.0.3729.40/media/base/mime_util_internal.cc.wma 2019-03-29 22:57:18.903316352 +0100
+++ chromium-74.0.3729.40/media/base/mime_util_internal.cc 2019-03-29 23:29:55.405768520 +0100
@@ -100,6 +100,8 @@ const StringToCodecMap& GetStringToCodec
{"vc-1", MimeUtil::VC1},
{"vp6", MimeUtil::VP6},
{"mpeg1", MimeUtil::MPEG1},
+ {"wma1", MimeUtil::WMA1},
+ {"wma2", MimeUtil::WMA2},
});
return *kStringToCodecMap;
@@ -180,6 +181,10 @@ AudioCodec MimeUtilToAudioCodec(MimeUtil
return kCodecDTS;
case MimeUtil::MP2:
return kCodecMP2;
+ case MimeUtil::WMA1:
+ return kCodecWMA1;
+ case MimeUtil::WMA2:
+ return kCodecWMA2;
default:
break;
}
@@ -307,6 +312,8 @@ void MimeUtil::AddSupportedMediaFormats(
matroska_audio_codecs.emplace(MPEG4_AAC);
matroska_audio_codecs.emplace(PCM);
matroska_audio_codecs.emplace(FLAC);
+ matroska_audio_codecs.emplace(WMA1);
+ matroska_audio_codecs.emplace(WMA2);
CodecSet matroska_video_codecs;
matroska_video_codecs.emplace(THEORA);
--- chromium-74.0.3729.40/media/base/media_types.cc.gcc8 2019-03-27 19:50:19.000000000 +0100
+++ chromium-74.0.3729.40/media/base/media_types.cc 2019-03-30 21:18:15.797174455 +0100
@@ -36,6 +36,15 @@ VideoType VideoType::FromDecoderConfig(c
case kCodecVC1:
case kCodecMPEG2:
case kCodecMPEG4:
+ case kCodecMSMPEG4V1:
+ case kCodecMSMPEG4V2:
+ case kCodecMSMPEG4V3:
+ case kCodecWMV7:
+ case kCodecWMV8:
+ case kCodecWMV9:
+ case kCodecVP6:
+ case kCodecMPEG1:
+ case kCodecSorensonSpark:
break;
case kCodecH264:
case kCodecVP9:

5
chromium-40-wmvflvmpg.patch
View file

@ -1,7 +1,7 @@
diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg chromium-62.0.3192.0/media/base/mime_util_internal.cc
--- chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg 2017-08-30 15:52:00.602204610 +0200
+++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 16:08:19.855437935 +0200
@@ -91,6 +91,16 @@
@@ -91,6 +91,15 @@
{"mp2", MimeUtil::MP2},
{"mp4v.20.8", MimeUtil::MPEG4_SP},
{"mp4v.20.240", MimeUtil::MPEG4_ASP},
@ -12,7 +12,6 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg chromiu
+ {"wmv8", MimeUtil::WMV8},
+ {"wmv9", MimeUtil::WMV9},
+ {"vc-1", MimeUtil::VC1},
+ {"wma", MimeUtil::WMA},
+ {"vp6", MimeUtil::VP6},
+ {"mpeg1", MimeUtil::MPEG1},
});
@ -30,7 +29,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg chromiu
CodecSet mp4_codecs(mp4_audio_codecs);
mp4_codecs.insert(mp4_video_codecs.begin(), mp4_video_codecs.end());
+ const CodecSet wma_codecs{WMA};
+ const CodecSet wma_codecs{WMA1, WMA2};
+
+ CodecSet wmv_codecs(wma_codecs);
+ wmv_codecs.emplace(MSMPEG4v1);

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

@ -316,71 +316,70 @@ diff -up chromium-62.0.3192.0/net/base/mime_util.cc.extra-media chromium-62.0.31
--- chromium-73.0.3683.75/media/base/supported_types.cc.extra-media 2019-03-11 23:00:59.000000000 +0100
+++ chromium-73.0.3683.75/media/base/supported_types.cc 2019-03-17 18:40:07.610556592 +0100
@@ -144,6 +144,7 @@ bool IsAudioCodecProprietary(AudioCodec
case media::kCodecAAC:
case media::kCodecAC3:
case media::kCodecEAC3:
+ case media::kCodecDTS:
case media::kCodecAMR_NB:
case media::kCodecAMR_WB:
case media::kCodecGSM_MS:
case kCodecAAC:
case kCodecAC3:
case kCodecEAC3:
+ case kCodecDTS:
case kCodecAMR_NB:
case kCodecAMR_WB:
case kCodecGSM_MS:
@@ -152,6 +153,7 @@ bool IsAudioCodecProprietary(AudioCodec
return true;
case media::kCodecFLAC:
+ case media::kCodecMP2:
case media::kCodecMP3:
case media::kCodecOpus:
case media::kCodecVorbis:
case kCodecFLAC:
+ case kCodecMP2:
case kCodecMP3:
case kCodecOpus:
case kCodecVorbis:
@@ -174,6 +176,7 @@ bool IsDefaultSupportedAudioType(const A
switch (type.codec) {
case media::kCodecAAC:
case media::kCodecFLAC:
+ case media::kCodecMP2:
case media::kCodecMP3:
case media::kCodecOpus:
case media::kCodecPCM:
case kCodecAAC:
case kCodecFLAC:
+ case kCodecMP2:
case kCodecMP3:
case kCodecOpus:
case kCodecPCM:
@@ -182,6 +185,10 @@ bool IsDefaultSupportedAudioType(const A
case media::kCodecPCM_S24BE:
case media::kCodecPCM_ALAW:
case media::kCodecVorbis:
+ case media::kCodecEAC3:
+ case media::kCodecALAC:
+ case media::kCodecAC3:
+ case media::kCodecDTS:
case kCodecPCM_S24BE:
case kCodecPCM_ALAW:
case kCodecVorbis:
+ case kCodecEAC3:
+ case kCodecALAC:
+ case kCodecAC3:
+ case kCodecDTS:
return true;
case media::kCodecAMR_NB:
case kCodecAMR_NB:
@@ -193,9 +200,6 @@ bool IsDefaultSupportedAudioType(const A
return false;
#endif
- case media::kCodecEAC3:
- case media::kCodecALAC:
- case media::kCodecAC3:
case media::kCodecMpegHAudio:
case media::kUnknownAudioCodec:
- case kCodecEAC3:
- case kCodecALAC:
- case kCodecAC3:
case kCodecMpegHAudio:
case kUnknownAudioCodec:
return false;
@@ -245,21 +245,15 @@
case media::kCodecH264:
case media::kCodecVP8:
case media::kCodecTheora:
@@ -246,21 +250,15 @@ bool IsDefaultSupportedVideoType(const V
case kCodecH264:
case kCodecVP8:
case kCodecTheora:
- return true;
-
- case media::kUnknownVideoCodec:
case media::kCodecVC1:
case media::kCodecMPEG2:
+ case media::kCodecMPEG4:
case media::kCodecHEVC:
- case media::kCodecDolbyVision:
- case kUnknownVideoCodec:
case kCodecVC1:
case kCodecMPEG2:
case kCodecHEVC:
- case kCodecDolbyVision:
- return false;
-
- case media::kCodecMPEG4:
case kCodecMPEG4:
-#if defined(OS_CHROMEOS)
return true;
-#else
+
+ case media::kUnknownVideoCodec:
+ case media::kCodecDolbyVision:
+ case kUnknownVideoCodec:
+ case kCodecDolbyVision:
return false;
-#endif
}

2
chromium-61-gcc5.patch
View file

@ -6,6 +6,6 @@
-#include <math.h>
+#include <cmath>
#include <algorithm>
#include <numeric>
#include <vector>

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

@ -3,10 +3,10 @@ diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent c
+++ 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() {
#elif defined(OS_MACOSX)
"Macintosh; ";
return "Macintosh; ";
#elif defined(USE_X11) || defined(USE_OZONE)
- "X11; "; // strange, but that's what Firefox uses
+ "X11; OS ROSA; "; // strange, but that's what Firefox uses
- return "X11; "; // strange, but that's what Firefox uses
+ return "X11; OS ROSA; "; // strange, but that's what Firefox uses
#elif defined(OS_ANDROID)
"Linux; ";
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
return "Linux; ";
#elif defined(OS_POSIX)

7
chromium-browser-stable.spec
View file

@ -34,7 +34,7 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 76.0.3809.132
Version: 77.0.3865.75
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -99,7 +99,7 @@ Patch601: chromium-62-include-cstdlib.patch
# https://github.com/RussianFedora/chromium/blob/fedora-stable/chromium-66.0.3359.81-system-clang.patch
Patch603: chromium-66.0.3359.81-system-clang.patch
# ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/
# https://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/
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
@ -486,8 +486,10 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/node' \
'third_party/node/linux' \
'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \
'third_party/one_euro_filter' \
'third_party/openh264' \
'third_party/openscreen' \
'third_party/openscreen/src/third_party/tinycbor/src/src' \
'third_party/opus' \
'third_party/ots' \
'third_party/pdfium' \
@ -531,6 +533,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/swiftshader/third_party/llvm-7.0' \
'third_party/swiftshader/third_party/llvm-subzero' \
'third_party/swiftshader/third_party/subzero' \
'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1' \
'third_party/tcmalloc' \
'third_party/test_fonts' \
'third_party/unrar' \

13
chromium-compiler-r4.patch
View file

@ -30,19 +30,6 @@
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
@@ -1431,6 +1415,12 @@ config("default_warnings") {
"-Wno-narrowing",
]
+ # -Wno-class-memaccess warns about hash table and vector in blink.
+ # But the violation is intentional.
+ if (!is_nacl) {
+ cflags_cc += [ "-Wno-class-memaccess" ]
+ }
+
# -Wunused-local-typedefs is broken in gcc,
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
cflags += [ "-Wno-unused-local-typedefs" ]
@@ -1525,7 +1515,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}

4
chromium-third-party-cookies-off-by-default.patch
View file

@ -7,5 +7,5 @@
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
registry->RegisterBooleanPref(
prefs::kCookieControlsEnabled, false,