mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 01:52:45 +00:00
Updated to 56.0.2924.76
This commit is contained in:
Алзим
parent
02ea3c9cab
commit
ab574930e5
8 changed files with 43 additions and 146 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,5 +1,5 @@
|
|||
sources:
|
||||
chromium-55.0.2883.87.tar.xz: 47545a688caa388b1eb2098d273cd9c9f556ebf1
|
||||
chromium-56.0.2924.76.tar.xz: 7f40746a894635692e82dffca2fb8e58a92a8c3f
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
|
||||
|
|
|
|||
|
|
@ -42,25 +42,24 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_fl
|
|||
|
||||
extern "C" {
|
||||
static void* my_alloc_func(void* opaque,
|
||||
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
|
||||
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
|
||||
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2016-10-15 12:31:50.153215350 +0200
|
||||
--- chromium-56.0.2924.76/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2017-01-30 22:08:13.942085030 +0300
|
||||
+++ chromium-56.0.2924.76/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2017-01-30 22:07:00.274088797 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "core/fxcodec/fx_codec.h"
|
||||
#include "core/fxcrt/fx_safe_types.h"
|
||||
#include "third_party/lcms2-2.6/include/lcms2.h"
|
||||
-#include "third_party/libopenjpeg20/openjpeg.h"
|
||||
+#include <openjpeg.h>
|
||||
|
||||
|
||||
static void fx_error_callback(const char* msg, void* client_data) {
|
||||
(void)client_data;
|
||||
@@ -761,7 +761,7 @@ FX_BOOL CJPX_Decoder::Init(const unsigne
|
||||
@@ -761,7 +761,7 @@ bool CJPX_Decoder::Init(const unsigned c
|
||||
image = nullptr;
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
- image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
+// image->pdfium_use_colorspace = !!m_ColorSpace;
|
||||
|
||||
|
||||
if (!parameters.nb_tile_to_decode) {
|
||||
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
|
||||
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp
|
||||
|
|
|
|||
|
|
@ -1,23 +1,22 @@
|
|||
diff -up chromium-53.0.2785.92/build/linux/libbrlapi/BUILD.gn.link_libgio chromium-53.0.2785.92/build/linux/libbrlapi/BUILD.gn
|
||||
--- chromium-53.0.2785.92/build/linux/libbrlapi/BUILD.gn.link_libgio 2016-09-02 21:02:02.000000000 +0200
|
||||
+++ chromium-53.0.2785.92/build/linux/libbrlapi/BUILD.gn 2016-09-09 14:26:52.224691284 +0200
|
||||
--- chromium-56.0.2924.76/build/linux/libbrlapi/BUILD.gn.link_libgio 2017-01-26 03:49:07.000000000 +0300
|
||||
+++ chromium-56.0.2924.76/build/linux/libbrlapi/BUILD.gn 2017-01-30 21:48:42.468219287 +0300
|
||||
@@ -2,6 +2,10 @@
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
|
||||
+declare_args() {
|
||||
+ linux_link_libbrlapi = false
|
||||
+}
|
||||
+
|
||||
import("//tools/generate_library_loader/generate_library_loader.gni")
|
||||
|
||||
config("brlapi_config") {
|
||||
@@ -15,6 +19,7 @@ generate_library_loader("libbrlapi") {
|
||||
|
||||
generate_library_loader("libbrlapi") {
|
||||
@@ -9,6 +13,7 @@ generate_library_loader("libbrlapi") {
|
||||
output_h = "libbrlapi.h"
|
||||
output_cc = "libbrlapi_loader.cc"
|
||||
header = "<brlapi.h>"
|
||||
config = ":brlapi_config"
|
||||
+ link_directly = linux_link_libbrlapi
|
||||
|
||||
|
||||
functions = [
|
||||
"brlapi_getHandleSize",
|
||||
diff -up chromium-53.0.2785.92/build/linux/libgio/BUILD.gn.link_libgio chromium-53.0.2785.92/build/linux/libgio/BUILD.gn
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme chromium-54.0.2840.90/chrome/browser/BUILD.gn
|
||||
--- chromium-54.0.2840.90/chrome/browser/BUILD.gn.fixme 2016-11-04 09:52:43.712072361 -0400
|
||||
+++ chromium-54.0.2840.90/chrome/browser/BUILD.gn 2016-11-04 09:53:21.495864624 -0400
|
||||
@@ -605,6 +605,7 @@ split_static_library("browser") {
|
||||
"//services/ui/public/cpp/input_devices",
|
||||
"//ui/aura",
|
||||
"//ui/compositor",
|
||||
+ "//ui/snapshot",
|
||||
"//ui/views/mus",
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- chromium-52.0.2716.0/media/base/mime_util_internal.cc 2016-04-27 08:42:25.933047659 +0200
|
||||
+++ chromium-52.0.2716.0/media/base/mime_util_internal.cc 2016-12-03 22:43:46.182795570 +0100
|
||||
@@ -78,7 +78,11 @@
|
||||
--- chromium-56.0.2924.76/media/base/mime_util_internal.cc.orig 2017-01-26 03:49:15.000000000 +0300
|
||||
+++ chromium-56.0.2924.76/media/base/mime_util_internal.cc 2017-01-30 22:39:02.827838684 +0300
|
||||
@@ -78,7 +78,11 @@ static const CodecIDMappings kUnambiguou
|
||||
{"opus", MimeUtil::OPUS},
|
||||
{"vp8", MimeUtil::VP8},
|
||||
{"vp8.0", MimeUtil::VP8},
|
||||
|
|
@ -10,10 +10,10 @@
|
|||
+ {"mp2", MimeUtil::MP2},
|
||||
+ {"mp4v.20.8", MimeUtil::MPEG4_SP},
|
||||
+ {"mp4v.20.240", MimeUtil::MPEG4_ASP}};
|
||||
|
||||
|
||||
// List of codec IDs that are ambiguous and don't provide
|
||||
// enough information to determine the codec and profile.
|
||||
@@ -289,6 +293,9 @@
|
||||
@@ -275,6 +279,9 @@ VideoCodec MimeUtilToVideoCodec(MimeUtil
|
||||
return kCodecVP9;
|
||||
case MimeUtil::THEORA:
|
||||
return kCodecTheora;
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
default:
|
||||
break;
|
||||
}
|
||||
@@ -357,6 +364,31 @@
|
||||
#endif // !defined(OS_ANDROID)
|
||||
@@ -357,6 +364,31 @@ void MimeUtil::AddSupportedMediaFormats(
|
||||
CodecSet ogg_codecs(ogg_audio_codecs);
|
||||
ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end());
|
||||
+
|
||||
|
||||
+ CodecSet matroska_audio_codecs;
|
||||
+ matroska_audio_codecs.insert(OPUS);
|
||||
+ matroska_audio_codecs.insert(VORBIS);
|
||||
|
|
@ -39,7 +38,7 @@
|
|||
+ matroska_audio_codecs.insert(MPEG2_AAC);
|
||||
+ matroska_audio_codecs.insert(MPEG4_AAC);
|
||||
+ matroska_audio_codecs.insert(PCM);
|
||||
+
|
||||
+
|
||||
+ CodecSet matroska_video_codecs;
|
||||
+ matroska_video_codecs.insert(THEORA);
|
||||
+ matroska_video_codecs.insert(VP8);
|
||||
|
|
@ -52,11 +51,12 @@
|
|||
+#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
||||
+ CodecSet matroska_codecs(matroska_audio_codecs);
|
||||
+ matroska_codecs.insert(matroska_video_codecs.begin(), matroska_video_codecs.end());
|
||||
|
||||
+
|
||||
CodecSet webm_audio_codecs;
|
||||
webm_audio_codecs.insert(OPUS);
|
||||
@@ -387,6 +419,8 @@
|
||||
|
||||
webm_audio_codecs.insert(VORBIS);
|
||||
@@ -386,6 +418,8 @@ void MimeUtil::AddSupportedMediaFormats(
|
||||
|
||||
CodecSet mp4_video_codecs;
|
||||
mp4_video_codecs.insert(H264);
|
||||
+ mp4_video_codecs.insert(MPEG4_SP);
|
||||
|
|
@ -64,25 +64,25 @@
|
|||
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
||||
mp4_video_codecs.insert(HEVC);
|
||||
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
||||
@@ -410,6 +444,9 @@
|
||||
// TODO(ddorwin): Should the application type support Opus?
|
||||
@@ -410,6 +444,9 @@ void MimeUtil::AddSupportedMediaFormats(
|
||||
AddContainerWithCodecs("application/ogg", ogg_codecs, false);
|
||||
|
||||
AddContainerWithCodecs("audio/flac", implicit_codec, false);
|
||||
|
||||
+ AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false);
|
||||
+ AddContainerWithCodecs("video/x-matroska", matroska_codecs, false);
|
||||
+
|
||||
#if defined(USE_PROPRIETARY_CODECS)
|
||||
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
|
||||
AddContainerWithCodecs("audio/mp3", implicit_codec, true);
|
||||
@@ -422,6 +459,7 @@
|
||||
@@ -422,6 +459,7 @@ void MimeUtil::AddSupportedMediaFormats(
|
||||
// support the codecs needed for compatibility.
|
||||
AddContainerWithCodecs("audio/x-m4a", aac, true);
|
||||
AddContainerWithCodecs("video/x-m4v", avc_and_aac, true);
|
||||
+ AddContainerWithCodecs("video/x-msvideo", matroska_codecs, true);
|
||||
|
||||
|
||||
#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
|
||||
// TODO(ddorwin): Exactly which codecs should be supported?
|
||||
@@ -765,9 +803,13 @@
|
||||
@@ -766,9 +804,13 @@ bool MimeUtil::IsCodecProprietary(Codec
|
||||
case MPEG4_AAC:
|
||||
case H264:
|
||||
case HEVC:
|
||||
|
|
@ -90,12 +90,12 @@
|
|||
+ case MPEG4_SP:
|
||||
+ case MPEG4_ASP:
|
||||
return true;
|
||||
|
||||
|
||||
case PCM:
|
||||
+ case MP2:
|
||||
case VORBIS:
|
||||
case OPUS:
|
||||
case VP8:
|
||||
case FLAC:
|
||||
--- chromium-52.0.2716.0/media/base/mime_util_internal.h.matroska-avi 2016-04-27 00:02:52.000000000 +0200
|
||||
+++ chromium-52.0.2716.0/media/base/mime_util_internal.h 2016-04-27 08:14:04.560330601 +0200
|
||||
@@ -39,7 +39,11 @@ class MEDIA_EXPORT MimeUtil {
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
diff -up chromium-55.0.2883.52/media/base/mime_util_internal.cc.flac chromium-55.0.2883.52/media/base/mime_util_internal.cc
|
||||
--- chromium-55.0.2883.52/media/base/mime_util_internal.cc.flac 2016-11-20 02:57:53.694441764 +0100
|
||||
+++ chromium-55.0.2883.52/media/base/mime_util_internal.cc 2016-11-20 13:02:12.683283042 +0100
|
||||
@@ -81,6 +81,7 @@
|
||||
{"theora", MimeUtil::THEORA},
|
||||
{"dts", MimeUtil::DTS},
|
||||
{"mp2", MimeUtil::MP2},
|
||||
+ {"flac", MimeUtil::FLAC},
|
||||
{"mp4v.20.8", MimeUtil::MPEG4_SP},
|
||||
{"mp4v.20.240", MimeUtil::MPEG4_ASP}};
|
||||
|
||||
@@ -368,6 +368,7 @@
|
||||
CodecSet ogg_audio_codecs;
|
||||
ogg_audio_codecs.insert(OPUS);
|
||||
ogg_audio_codecs.insert(VORBIS);
|
||||
+ ogg_audio_codecs.insert(FLAC);
|
||||
CodecSet ogg_video_codecs;
|
||||
#if !defined(OS_ANDROID)
|
||||
ogg_video_codecs.insert(THEORA);
|
||||
@@ -386,6 +387,7 @@
|
||||
matroska_audio_codecs.insert(MPEG2_AAC);
|
||||
matroska_audio_codecs.insert(MPEG4_AAC);
|
||||
matroska_audio_codecs.insert(PCM);
|
||||
+ matroska_audio_codecs.insert(FLAC);
|
||||
|
||||
CodecSet matroska_video_codecs;
|
||||
matroska_video_codecs.insert(THEORA);
|
||||
@@ -425,6 +427,7 @@
|
||||
|
||||
CodecSet mp4_audio_codecs(aac);
|
||||
mp4_audio_codecs.insert(MP3);
|
||||
+ mp4_audio_codecs.insert(FLAC);
|
||||
#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
|
||||
mp4_audio_codecs.insert(AC3);
|
||||
mp4_audio_codecs.insert(EAC3);
|
||||
@@ -487,6 +490,7 @@
|
||||
|
||||
AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs, false);
|
||||
AddContainerWithCodecs("video/x-matroska", matroska_codecs, false);
|
||||
+ AddContainerWithCodecs("audio/flac", implicit_codec, false);
|
||||
|
||||
#if defined(USE_PROPRIETARY_CODECS)
|
||||
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
|
||||
@@ -868,6 +872,7 @@
|
||||
case VP8:
|
||||
case VP9:
|
||||
case THEORA:
|
||||
+ case FLAC:
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -888,6 +893,11 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
+ if (mime_type_lower_case == "audio/flac") {
|
||||
+ *default_codec = MimeUtil::FLAC;
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
return false;
|
||||
}
|
||||
|
||||
diff -up chromium-55.0.2883.52/media/base/mime_util_internal.h.flac chromium-55.0.2883.52/media/base/mime_util_internal.h
|
||||
--- chromium-55.0.2883.52/media/base/mime_util_internal.h.flac 2016-11-20 02:57:53.694441764 +0100
|
||||
+++ chromium-55.0.2883.52/media/base/mime_util_internal.h 2016-11-20 12:40:30.938138723 +0100
|
||||
@@ -54,7 +54,8 @@ class MEDIA_EXPORT MimeUtil {
|
||||
MP2,
|
||||
MPEG4_SP,
|
||||
MPEG4_ASP,
|
||||
- LAST_CODEC = MPEG4_ASP
|
||||
+ FLAC,
|
||||
+ LAST_CODEC = FLAC
|
||||
};
|
||||
|
||||
// Platform configuration structure. Controls which codecs are supported at
|
||||
|
|
@ -12,9 +12,6 @@
|
|||
%define ffmpeg 1
|
||||
%define icu 0
|
||||
%define libva 0
|
||||
# disable gtk3 support to avoid
|
||||
# http://bugs.rosalinux.ru/show_bug.cgi?id=6826#c3
|
||||
%define gtk3 0
|
||||
|
||||
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
|
||||
# Note: these are for Mageia use ONLY.
|
||||
|
|
@ -25,10 +22,11 @@
|
|||
|
||||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 55.0.2883.87
|
||||
Release: 2
|
||||
Version: 56.0.2924.76
|
||||
Release: 1
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
Url: https://www.chromium.org/Home
|
||||
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
|
||||
Source1: chromium-wrapper
|
||||
Source2: chromium-browser.desktop
|
||||
|
|
@ -63,8 +61,6 @@ Patch30: chromium-52-pdfium-system-libtiff-libpng.patch
|
|||
Patch31: chromium-54-ffmpeg-2.8.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.
|
||||
Patch32: chromium-55-extra-media.patch
|
||||
# (cjw) report flac mimetype as supported ("probably") in HTML5 canPlayType()
|
||||
Patch33: chromium-55-flac.patch
|
||||
# (cjw) Do not use ffmpeg internal header(s)
|
||||
Patch34: chromium-43-no-ffmpeg-internal.patch
|
||||
# (cjw) fix webrtc build with system ffmpeg
|
||||
|
|
@ -73,7 +69,6 @@ Patch35: chromium-50-system-ffmpeg-3.patch
|
|||
# From Fedora
|
||||
Patch40: chromium-54.0.2840.90-setopaque.patch
|
||||
Patch41: chromium-54.0.2840.59-nullfix.patch
|
||||
Patch42: chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8
|
||||
Patch43: chromium-52.0.2743.116-unset-madv_free.patch
|
||||
|
||||
|
|
@ -132,9 +127,7 @@ BuildRequires: pkgconfig(glu)
|
|||
BuildRequires: pkgconfig(gnome-keyring-1)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
%if 0%{?gtk3}
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
%endif
|
||||
#BuildRequires: pkgconfig(harfbuzz)
|
||||
%if 0%{icu}
|
||||
BuildRequires: pkgconfig(icu-i18n)
|
||||
|
|
@ -274,7 +267,6 @@ members of the Chromium and WebDriver teams.
|
|||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
%patch33 -p1
|
||||
%if 0%{?ffmpeg}
|
||||
%patch34 -p1
|
||||
%patch35 -p1
|
||||
|
|
@ -282,12 +274,11 @@ members of the Chromium and WebDriver teams.
|
|||
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
%patch43 -p1
|
||||
|
||||
# new from debian
|
||||
%patch500 -p1
|
||||
%patch501 -p2
|
||||
%patch501 -p1
|
||||
|
||||
%if 0%{icu}
|
||||
%patch502 -p1 -b .system-icu
|
||||
|
|
@ -393,7 +384,7 @@ cmp $FILE $FILE.orig && exit 1
|
|||
%endif
|
||||
|
||||
# v NO TABS IN HERE!
|
||||
%define gn_config use_gconf=false\
|
||||
%define gn_config use_gconf=false \
|
||||
use_sysroot=false \
|
||||
system_libdir="%{_lib}" \
|
||||
icu_use_data_file=true \
|
||||
|
|
@ -414,7 +405,6 @@ cmp $FILE $FILE.orig && exit 1
|
|||
use_system_libjpeg=true \
|
||||
use_libjpeg_turbo=false \
|
||||
enable_widevine=true \
|
||||
enable_browser_cdms=true \
|
||||
pdf_enable_xfa=true \
|
||||
use_pulseaudio=true \
|
||||
use_allocator="none" \
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
description: add ps printing capability
|
||||
author: Salvatore Bonaccorso
|
||||
Index: sid/src/chrome/browser/printing/print_dialog_gtk.cc
|
||||
===================================================================
|
||||
--- sid.orig/src/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc 2014-02-13 15:45:02.563430585 +0100
|
||||
+++ sid/src/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc 2014-02-13 15:45:02.559430585 +0100
|
||||
@@ -245,6 +245,7 @@
|
||||
--- chromium-56.0.2924.76/chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-01-30 23:25:10.318135528 +0300
|
||||
+++ chromium-56.0.2924.76/chrome/browser/ui/libgtkui/print_dialog_gtk.cc 2017-01-30 23:23:51.453172506 +0300
|
||||
@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
|
||||
// Since we only generate PDF, only show printers that support PDF.
|
||||
// TODO(thestig) Add more capabilities to support?
|
||||
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue