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

Updated to 55.0.28.83.75

Browse source
This commit is contained in:
Алзим 2016-12-06 19:54:52 +03:00
parent bf1f8f2cd4
commit e7ebd303cc
15 changed files with 414 additions and 712 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.abf.yml
View file

@ -1,5 +1,5 @@
sources:
"icons.tar.bz2": a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
chromium-55.0.2883.75.tar.xz: 8a36da476a83068871ea0e6b1a92cb52b7f049be
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
chromium-54.0.2840.100.tar.xz: bf51814c569110714a4b1266f96c5bbc45af1a80
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

11
PNGImageDecoder.patch
View file

@ -1,11 +0,0 @@
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg 2016-05-01 15:22:46.103607522 +0800
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-01 15:25:14.459753876 +0800
@@ -234,7 +234,7 @@
#endif
png_uint_32 profileLength = 0;
if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+ setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
}
}
#endif // PNG_iCCP_SUPPORTED

15
chromium-25.0.1364.172-sandbox-pie.patch
View file

@ -1,15 +0,0 @@
diff -urN chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi
--- chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi 2013-03-24 23:58:19.000000000 +0400
+++ chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi 2013-03-25 00:05:45.874570662 +0400
@@ -109,7 +109,10 @@
],
'cflags': [
# For ULLONG_MAX
- '-std=gnu99',
+ '-std=gnu99 -fPIE',
+ ],
+ 'ldflags': [
+ '-pie',
],
'include_dirs': [
'../..',

39
chromium-43-no-ffmpeg-internal.patch Normal file
View file

@ -0,0 +1,39 @@
diff -up chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h
--- chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal 2016-10-01 13:50:19.637104288 +0200
+++ chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h 2016-10-01 13:50:19.680103748 +0200
@@ -27,7 +27,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
diff -up chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc
--- chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal 2016-10-01 13:50:19.682103722 +0200
+++ chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc 2016-10-01 13:54:34.142904717 +0200
@@ -1186,24 +1186,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
- start_time_estimates[stream->index] = packet_pts;
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());

28
chromium-50-system-ffmpeg-3.patch Normal file
View file

@ -0,0 +1,28 @@
diff -up chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.system-ffmpeg-3 chromium-51.0.2687.0/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
--- 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>
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
} // extern "C"
#include "webrtc/base/checks.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
@@ -17,7 +17,7 @@
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
} // extern "C"
#include "webrtc/common_video/include/i420_buffer_pool.h"

256
chromium-52-pdfium-system-libtiff-libpng.patch
View file

@ -1,6 +1,6 @@
diff -up chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/BUILD.gn 2016-09-12 13:47:03.205588975 +0200
diff -up chromium-55.0.2883.11/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/BUILD.gn
--- chromium-55.0.2883.11/third_party/pdfium/BUILD.gn.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/BUILD.gn 2016-10-15 12:25:53.045704800 +0200
@@ -14,7 +14,6 @@ config("pdfium_common_config") {
"third_party/freetype/include/freetype",
]
@ -9,8 +9,8 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -553,7 +552,7 @@ static_library("fxcodec") {
deps = [
@@ -634,7 +633,7 @@ static_library("fxcodec") {
":fxcrt",
"third_party:fx_lcms2",
"third_party:fx_libopenjpeg",
- "third_party:fx_zlib",
@ -18,43 +18,43 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/BUILD.gn.pdfium-system-libtiff
# This is a generic JPEG library dependency.
"//third_party:jpeg",
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/codec_int.h 2016-09-12 13:47:03.205588975 +0200
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.046704787 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h 2016-10-15 12:31:21.588574456 +0200
@@ -16,7 +16,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp 2016-09-12 13:47:03.205588975 +0200
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.046704787 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp 2016-10-15 12:31:34.987406010 +0200
@@ -11,7 +11,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcrt/include/fx_ext.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_ext.h"
-#include "third_party/zlib_v128/zlib.h"
+#include <zlib.h>
extern "C" {
static void* my_alloc_func(void* opaque,
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jpx_opj.cpp 2016-09-12 13:47:03.206588962 +0200
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
@@ -13,7 +13,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxcrt/include/fx_safe_types.h"
#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;
@@ -752,7 +752,7 @@ FX_BOOL CJPX_Decoder::Init(const unsigne
@@ -761,7 +761,7 @@ FX_BOOL CJPX_Decoder::Init(const unsigne
image = nullptr;
return FALSE;
}
@ -63,12 +63,12 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_jp
if (!parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp 2016-09-12 13:47:03.207588950 +0200
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
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.047704775 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_png.cpp 2016-10-15 12:32:27.308748242 +0200
@@ -10,10 +10,7 @@
#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/include/fx_dib.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxge/fx_dib.h"
-extern "C" {
-#undef FAR
@ -78,11 +78,11 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_pn
static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
if (png_get_error_ptr(png_ptr)) {
diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp
--- chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp 2016-09-12 13:47:03.206588962 +0200
diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.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_tiff.cpp 2016-10-15 12:32:46.897501978 +0200
@@ -9,7 +9,7 @@
#include "core/fxge/include/fx_dib.h"
#include "core/fxge/fx_dib.h"
extern "C" {
-#include "third_party/libtiff/tiffiop.h"
@ -90,7 +90,7 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_ti
}
class CCodec_TiffContext {
@@ -139,7 +139,7 @@ TIFF* tiff_open(void* context, const cha
@@ -143,7 +143,7 @@ TIFF* tiff_open(void* context, const cha
tiff_write, tiff_seek, tiff_close, tiff_get_size,
tiff_map, tiff_unmap);
if (tif) {
@ -99,10 +99,10 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/core/fxcodec/codec/fx_codec_ti
}
return tif;
}
diff -up chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-09 00:03:48.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn 2016-09-12 13:47:03.206588962 +0200
@@ -355,7 +355,7 @@ component("skia") {
diff -up chromium-55.0.2883.11/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/skia/BUILD.gn
--- chromium-55.0.2883.11/third_party/pdfium/skia/BUILD.gn.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/skia/BUILD.gn 2016-10-15 12:25:53.047704775 +0200
@@ -304,7 +304,7 @@ component("skia") {
deps = [
":skia_opts",
@ -111,9 +111,9 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/skia/BUILD.gn.pdfium-system-li
]
if (is_linux) {
diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn
--- chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2016-09-12 13:47:03.207588950 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn 2016-09-12 13:56:06.995752607 +0200
diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn
--- chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn 2016-10-15 12:25:53.048704762 +0200
@@ -5,6 +5,7 @@
import("//build/config/arm.gni")
import("//build_overrides/build.gni")
@ -122,7 +122,7 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
group("third_party") {
deps = [
@@ -267,197 +267,34 @@ static_library("jpeg") {
@@ -273,197 +274,34 @@ static_library("jpeg") {
]
}
@ -337,183 +337,3 @@ diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
}
# Can not be a static library due to lack of .cc files.
diff -up chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp.pdfium-system-libtiff-libpng chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp
--- chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp.pdfium-system-libtiff-libpng 2016-09-09 00:03:49.000000000 +0200
+++ chromium-54.0.2840.16/third_party/pdfium/third_party/third_party.gyp 2016-09-12 13:57:09.603965515 +0200
@@ -156,6 +156,47 @@
},
},
{
+ 'target_name': 'fx_lpng',
+ 'type': 'none',
+ 'dependencies': [
+ '../../zlib/zlib.gyp:zlib',
+ ],
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags libpng)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other libpng)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l libpng)',
+ ],
+ },
+ },
+ {
+ 'target_name': 'fx_tiff',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_SYSTEM_LIBTIFF',
+ ],
+ 'conditions': [
+ ['os_bsd==1', {
+ 'include_dirs': [
+ '/usr/local/include',
+ ],
+ }],
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '-ltiff',
+ ],
+ },
+ },
+ {
'target_name': 'libjpeg',
'type': 'static_library',
'sources': [
@@ -265,65 +306,6 @@
],
},
{
- 'target_name': 'fx_lpng',
- 'type': 'static_library',
- 'sources': [
- 'libpng16/png.c',
- 'libpng16/png.h',
- 'libpng16/pngconf.h',
- 'libpng16/pngdebug.h',
- 'libpng16/pngerror.c',
- 'libpng16/pngget.c',
- 'libpng16/pnginfo.h',
- 'libpng16/pnglibconf.h',
- 'libpng16/pngmem.c',
- 'libpng16/pngpread.c',
- 'libpng16/pngprefix.h',
- 'libpng16/pngpriv.h',
- 'libpng16/pngread.c',
- 'libpng16/pngrio.c',
- 'libpng16/pngrtran.c',
- 'libpng16/pngrutil.c',
- 'libpng16/pngset.c',
- 'libpng16/pngstruct.h',
- 'libpng16/pngtrans.c',
- 'libpng16/pngwio.c',
- 'libpng16/pngwrite.c',
- 'libpng16/pngwtran.c',
- 'libpng16/pngwutil.c',
- ],
- 'msvs_disabled_warnings': [
- 4146, # Unary minus applied to unsigned type.
- # Warnings about conversion from 'size_t' to 'long', possible loss of
- # data.
- 4267,
- ],
- 'conditions': [
- # SSE optimizations
- [ 'target_arch=="ia32" or target_arch=="x64"', {
- 'defines': [
- 'PNG_INTEL_SSE_OPT=1',
- ],
- 'sources': [
- 'libpng16/contrib/intel/intel_init.c',
- 'libpng16/contrib/intel/filter_sse2_intrinsics.c',
- ],
- }],
-
- # ARM optimizations
- [ '(target_arch=="arm" or target_arch=="arm64") and OS!="ios" and arm_neon==1', {
- 'defines': [
- 'PNG_ARM_NEON_OPT=2',
- 'PNG_ARM_NEON_IMPLEMENTATION=1',
- ],
- 'sources': [
- 'libpng16/arm/arm_init.c',
- 'libpng16/arm/filter_neon_intrinsics.c',
- ],
- }],
- ],
- },
- {
'target_name': 'fx_zlib',
'type': 'static_library',
'sources': [
@@ -380,62 +362,6 @@
},
],
'conditions': [
- ['pdf_enable_xfa==1', {
- 'targets': [
- {
- 'target_name': 'fx_tiff',
- 'type': 'static_library',
- 'sources': [
- 'libtiff/tiffiop.h',
- 'libtiff/tiffvers.h',
- 'libtiff/tif_aux.c',
- 'libtiff/tif_close.c',
- 'libtiff/tif_codec.c',
- 'libtiff/tif_color.c',
- 'libtiff/tif_compress.c',
- 'libtiff/tif_dir.c',
- 'libtiff/tif_dirinfo.c',
- 'libtiff/tif_dirread.c',
- 'libtiff/tif_dirwrite.c',
- 'libtiff/tif_dumpmode.c',
- 'libtiff/tif_error.c',
- 'libtiff/tif_extension.c',
- 'libtiff/tif_fax3.c',
- 'libtiff/tif_fax3sm.c',
- 'libtiff/tif_flush.c',
- 'libtiff/tif_getimage.c',
- 'libtiff/tif_jpeg.c',
- 'libtiff/tif_luv.c',
- 'libtiff/tif_lzw.c',
- 'libtiff/tif_next.c',
- 'libtiff/tif_ojpeg.c',
- 'libtiff/tif_open.c',
- 'libtiff/tif_packbits.c',
- 'libtiff/tif_pixarlog.c',
- 'libtiff/tif_predict.c',
- 'libtiff/tif_print.c',
- 'libtiff/tif_read.c',
- 'libtiff/tif_strip.c',
- 'libtiff/tif_swab.c',
- 'libtiff/tif_thunder.c',
- 'libtiff/tif_tile.c',
- 'libtiff/tif_version.c',
- 'libtiff/tif_warning.c',
- 'libtiff/tif_write.c',
- 'libtiff/tif_zip.c',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'defines!': [
- # Need to undefine the macro since it is redefined in
- # tif_ojpeg.c and tif_jpeg.c.
- 'WIN32_LEAN_AND_MEAN',
- ],
- }],
- ],
- },
- ],
- }],
['pdf_use_skia!=1', {
'targets': [
{

41
chromium-53-breakiterator.patch
View file

@ -1,41 +0,0 @@
diff -up chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc.breakiterator chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc
--- chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc.breakiterator 2016-08-10 20:21:12.391496917 +0200
+++ chromium-53.0.2785.46/components/spellcheck/renderer/spellcheck_worditerator.cc 2016-08-10 20:21:36.684191516 +0200
@@ -332,8 +332,8 @@ bool SpellcheckWordIterator::Initialize(
if (rule.empty())
return false;
- std::unique_ptr<BreakIterator> iterator(
- new BreakIterator(base::string16(), rule));
+ std::unique_ptr<base::i18n::BreakIterator> iterator(
+ new base::i18n::BreakIterator(base::string16(), rule));
if (!iterator->Init()) {
// Since we're not passing in any text, the only reason this could fail
// is if we fail to parse the rules. Since the rules are hardcoded,
@@ -388,7 +388,7 @@ SpellcheckWordIterator::WordIteratorStat
const size_t start = iterator_->prev();
const size_t length = iterator_->pos() - start;
switch (iterator_->GetWordBreakStatus()) {
- case BreakIterator::IS_WORD_BREAK: {
+ case base::i18n::BreakIterator::IS_WORD_BREAK: {
if (Normalize(start, length, word_string)) {
*word_start = start;
*word_length = length;
@@ -396,7 +396,7 @@ SpellcheckWordIterator::WordIteratorStat
}
break;
}
- case BreakIterator::IS_SKIPPABLE_WORD: {
+ case base::i18n::BreakIterator::IS_SKIPPABLE_WORD: {
*word_string = iterator_->GetString();
*word_start = start;
*word_length = length;
@@ -404,7 +404,7 @@ SpellcheckWordIterator::WordIteratorStat
}
// |iterator_| is RULE_BASED so the break status should never be
// IS_LINE_OR_CHAR_BREAK.
- case BreakIterator::IS_LINE_OR_CHAR_BREAK: {
+ case base::i18n::BreakIterator::IS_LINE_OR_CHAR_BREAK: {
NOTREACHED();
break;
}

248
chromium-54-gn-system-icu.patch
View file

@ -1,248 +0,0 @@
--- /dev/null 2016-10-22 17:04:13.204827706 +0200
+++ chromium-55.0.2883.11/build/linux/unbundle/icu.gn 2016-10-14 00:02:10.000000000 +0200
@@ -0,0 +1,235 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+group("icu") {
+ public_deps = [
+ ":icui18n",
+ ":icuuc",
+ ]
+}
+
+config("icu_config") {
+ defines = [
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
+}
+
+pkg_config("system_icui18n") {
+ packages = [ "icu-i18n" ]
+}
+
+pkg_config("system_icuuc") {
+ packages = [ "icu-uc" ]
+}
+
+source_set("icui18n") {
+ deps = [
+ ":icui18n_shim",
+ ]
+ public_configs = [
+ ":icu_config",
+ ":system_icui18n",
+ ]
+}
+
+source_set("icuuc") {
+ deps = [
+ ":icuuc_shim",
+ ]
+ public_configs = [
+ ":icu_config",
+ ":system_icuuc",
+ ]
+}
+
+shim_headers("icui18n_shim") {
+ root_path = "source/i18n"
+ headers = [
+ # This list can easily be updated using the command below:
+ # find third_party/icu/source/i18n/unicode \
+ # -iname '*.h' -printf '"%p",\n' | \
+ # sed -e 's|third_party/icu/i18n/common/||' | sort -u
+ "unicode/alphaindex.h",
+ "unicode/basictz.h",
+ "unicode/calendar.h",
+ "unicode/choicfmt.h",
+ "unicode/coleitr.h",
+ "unicode/coll.h",
+ "unicode/compactdecimalformat.h",
+ "unicode/curramt.h",
+ "unicode/currpinf.h",
+ "unicode/currunit.h",
+ "unicode/datefmt.h",
+ "unicode/dcfmtsym.h",
+ "unicode/decimfmt.h",
+ "unicode/dtfmtsym.h",
+ "unicode/dtitvfmt.h",
+ "unicode/dtitvinf.h",
+ "unicode/dtptngen.h",
+ "unicode/dtrule.h",
+ "unicode/fieldpos.h",
+ "unicode/fmtable.h",
+ "unicode/format.h",
+ "unicode/fpositer.h",
+ "unicode/gender.h",
+ "unicode/gregocal.h",
+ "unicode/locdspnm.h",
+ "unicode/measfmt.h",
+ "unicode/measunit.h",
+ "unicode/measure.h",
+ "unicode/msgfmt.h",
+ "unicode/numfmt.h",
+ "unicode/numsys.h",
+ "unicode/plurfmt.h",
+ "unicode/plurrule.h",
+ "unicode/rbnf.h",
+ "unicode/rbtz.h",
+ "unicode/regex.h",
+ "unicode/region.h",
+ "unicode/reldatefmt.h",
+ "unicode/scientificnumberformatter.h",
+ "unicode/search.h",
+ "unicode/selfmt.h",
+ "unicode/simpletz.h",
+ "unicode/smpdtfmt.h",
+ "unicode/sortkey.h",
+ "unicode/stsearch.h",
+ "unicode/tblcoll.h",
+ "unicode/timezone.h",
+ "unicode/tmunit.h",
+ "unicode/tmutamt.h",
+ "unicode/tmutfmt.h",
+ "unicode/translit.h",
+ "unicode/tzfmt.h",
+ "unicode/tznames.h",
+ "unicode/tzrule.h",
+ "unicode/tztrans.h",
+ "unicode/ucal.h",
+ "unicode/ucol.h",
+ "unicode/ucoleitr.h",
+ "unicode/ucsdet.h",
+ "unicode/ucurr.h",
+ "unicode/udat.h",
+ "unicode/udateintervalformat.h",
+ "unicode/udatpg.h",
+ "unicode/udisplaycontext.h",
+ "unicode/ufieldpositer.h",
+ "unicode/uformattable.h",
+ "unicode/ugender.h",
+ "unicode/uldnames.h",
+ "unicode/ulocdata.h",
+ "unicode/umsg.h",
+ "unicode/unirepl.h",
+ "unicode/unum.h",
+ "unicode/unumsys.h",
+ "unicode/upluralrules.h",
+ "unicode/uregex.h",
+ "unicode/uregion.h",
+ "unicode/usearch.h",
+ "unicode/uspoof.h",
+ "unicode/utmscale.h",
+ "unicode/utrans.h",
+ "unicode/vtzone.h",
+ ]
+}
+
+shim_headers("icuuc_shim") {
+ root_path = "source/common"
+ headers = [
+ # This list can easily be updated using the command below:
+ # find third_party/icu/source/common/unicode \
+ # -iname '*.h' -printf '"%p",\n' | \
+ # sed -e 's|third_party/icu/source/common/||' | sort -u
+ "unicode/appendable.h",
+ "unicode/brkiter.h",
+ "unicode/bytestream.h",
+ "unicode/bytestrie.h",
+ "unicode/bytestriebuilder.h",
+ "unicode/caniter.h",
+ "unicode/chariter.h",
+ "unicode/dbbi.h",
+ "unicode/docmain.h",
+ "unicode/dtintrv.h",
+ "unicode/enumset.h",
+ "unicode/errorcode.h",
+ "unicode/filteredbrk.h",
+ "unicode/icudataver.h",
+ "unicode/icuplug.h",
+ "unicode/idna.h",
+ "unicode/listformatter.h",
+ "unicode/localpointer.h",
+ "unicode/locid.h",
+ "unicode/messagepattern.h",
+ "unicode/normalizer2.h",
+ "unicode/normlzr.h",
+ "unicode/parseerr.h",
+ "unicode/parsepos.h",
+ "unicode/platform.h",
+ "unicode/ptypes.h",
+ "unicode/putil.h",
+ "unicode/rbbi.h",
+ "unicode/rep.h",
+ "unicode/resbund.h",
+ "unicode/schriter.h",
+ "unicode/std_string.h",
+ "unicode/strenum.h",
+ "unicode/stringpiece.h",
+ "unicode/stringtriebuilder.h",
+ "unicode/symtable.h",
+ "unicode/ubidi.h",
+ "unicode/ubrk.h",
+ "unicode/ucasemap.h",
+ "unicode/ucat.h",
+ "unicode/uchar.h",
+ "unicode/ucharstrie.h",
+ "unicode/ucharstriebuilder.h",
+ "unicode/uchriter.h",
+ "unicode/uclean.h",
+ "unicode/ucnv.h",
+ "unicode/ucnv_cb.h",
+ "unicode/ucnv_err.h",
+ "unicode/ucnvsel.h",
+ "unicode/uconfig.h",
+ "unicode/udata.h",
+ "unicode/uenum.h",
+ "unicode/uidna.h",
+ "unicode/uiter.h",
+ "unicode/ulistformatter.h",
+ "unicode/uloc.h",
+ "unicode/umachine.h",
+ "unicode/umisc.h",
+ "unicode/unifilt.h",
+ "unicode/unifunct.h",
+ "unicode/unimatch.h",
+ "unicode/uniset.h",
+ "unicode/unistr.h",
+ "unicode/unorm.h",
+ "unicode/unorm2.h",
+ "unicode/uobject.h",
+ "unicode/urename.h",
+ "unicode/urep.h",
+ "unicode/ures.h",
+ "unicode/uscript.h",
+ "unicode/uset.h",
+ "unicode/usetiter.h",
+ "unicode/ushape.h",
+ "unicode/usprep.h",
+ "unicode/ustring.h",
+ "unicode/ustringtrie.h",
+ "unicode/utext.h",
+ "unicode/utf.h",
+ "unicode/utf16.h",
+ "unicode/utf32.h",
+ "unicode/utf8.h",
+ "unicode/utf_old.h",
+ "unicode/utrace.h",
+ "unicode/utypes.h",
+ "unicode/uvernum.h",
+ "unicode/uversion.h",
+ ]
+}
--- chromium-54.0.2840.71/build/linux/unbundle/replace_gn_files.py.gn-system-icu 2016-10-21 00:01:59.000000000 +0200
+++ chromium-54.0.2840.71/build/linux/unbundle/replace_gn_files.py 2016-10-22 21:31:25.859269944 +0200
@@ -20,6 +20,7 @@
'ffmpeg': 'third_party/ffmpeg/BUILD.gn',
'flac': 'third_party/flac/BUILD.gn',
'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
+ 'icu': 'third_party/icu/BUILD.gn',
'libevent': 'base/third_party/libevent/BUILD.gn',
'libjpeg': 'build/secondary/third_party/libjpeg_turbo/BUILD.gn',
'libpng': 'third_party/libpng/BUILD.gn',

38
chromium-54-no-ash.patch
View file

@ -1,38 +0,0 @@
--- chromium-54.0.2840.16/chrome/browser/extensions/api/tabs/tabs_api.cc.no-ash 2016-09-09 00:02:22.000000000 +0200
+++ chromium-54.0.2840.16/chrome/browser/extensions/api/tabs/tabs_api.cc 2016-09-13 06:30:44.958499013 +0200
@@ -260,6 +260,7 @@
return true;
}
+#if defined(USE_ASH)
bool IsHangoutsExtensionId(const std::string& extension_id) {
for (const char* id : extension_misc::kHangoutsExtensionIds) {
if (extension_id == id)
@@ -267,6 +268,7 @@
}
return false;
}
+#endif // defined(USE_ASH)
} // namespace
@@ -520,7 +522,9 @@
gfx::Rect window_bounds;
bool focused = true;
+#if defined(USE_ASH)
bool saw_focus_key = false;
+#endif // defined(USE_ASH)
std::string extension_id;
if (create_data) {
@@ -593,7 +597,9 @@
if (create_data->focused) {
focused = *create_data->focused;
+#if defined(USE_ASH)
saw_focus_key = true;
+#endif // defined(USE_ASH)
}
}

79
chromium-54-system-ffmpeg.patch
View file

@ -1,79 +0,0 @@
diff -urN chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.h chromium-54.0.2840.100-patched/media/ffmpeg/ffmpeg_common.h
--- chromium-54.0.2840.100/media/ffmpeg/ffmpeg_common.h 2016-11-11 06:02:15.000000000 +1000
+++ chromium-54.0.2840.100-patched/media/ffmpeg/ffmpeg_common.h 2016-11-22 00:06:06.293340600 +1000
@@ -22,10 +22,6 @@
// Include FFmpeg header files.
extern "C" {
-// Disable deprecated features which result in spammy compile warnings. This
-// list of defines must mirror those in the 'defines' section of BUILD.gn file &
-// ffmpeg.gyp file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
@@ -39,7 +35,6 @@
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
diff -urN chromium-54.0.2840.100/media/filters/ffmpeg_demuxer.cc chromium-54.0.2840.100-patched/media/filters/ffmpeg_demuxer.cc
--- chromium-54.0.2840.100/media/filters/ffmpeg_demuxer.cc 2016-11-11 06:02:15.000000000 +1000
+++ chromium-54.0.2840.100-patched/media/filters/ffmpeg_demuxer.cc 2016-11-22 00:06:56.544337004 +1000
@@ -1151,25 +1151,6 @@
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
- start_time_estimates[stream->index] = packet_pts;
- }
- packet_buffer = packet_buffer->next;
- }
- }
-
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
AVStream* audio_stream = NULL;
AudioDecoderConfig audio_config;
diff -urN chromium-54.0.2840.100/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc chromium-54.0.2840.100-patched/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
--- chromium-54.0.2840.100/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-11-11 06:03:06.000000000 +1000
+++ chromium-54.0.2840.100-patched/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2016-11-22 00:03:41.474350964 +1000
@@ -15,9 +15,9 @@
#include <limits>
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/libavformat/avformat.h"
-#include "third_party/ffmpeg/libavutil/imgutils.h"
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
} // extern "C"
#include "webrtc/base/checks.h"
diff -urN chromium-54.0.2840.100/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h chromium-54.0.2840.100-patched/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h
--- chromium-54.0.2840.100/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-11-11 06:03:06.000000000 +1000
+++ chromium-54.0.2840.100-patched/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h 2016-11-22 00:04:00.251349620 +1000
@@ -17,7 +17,7 @@
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
extern "C" {
-#include "third_party/ffmpeg/libavcodec/avcodec.h"
+#include <libavcodec/avcodec.h>
} // extern "C"
#include "webrtc/common_video/include/i420_buffer_pool.h"

213
chromium-55-extra-media.patch Normal file
View file

@ -0,0 +1,213 @@
--- 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 @@
{"opus", MimeUtil::OPUS},
{"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8},
- {"theora", MimeUtil::THEORA}};
+ {"theora", MimeUtil::THEORA},
+ {"dts", MimeUtil::DTS},
+ {"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 @@
return kCodecVP9;
case MimeUtil::THEORA:
return kCodecTheora;
+ case MimeUtil::MPEG4_SP:
+ case MimeUtil::MPEG4_ASP:
+ return kCodecMPEG4;
default:
break;
}
@@ -357,6 +364,31 @@
#endif // !defined(OS_ANDROID)
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);
+ matroska_audio_codecs.insert(AC3);
+ matroska_audio_codecs.insert(EAC3);
+ matroska_audio_codecs.insert(DTS);
+ matroska_audio_codecs.insert(MP3);
+ matroska_audio_codecs.insert(MP2);
+ 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);
+ matroska_video_codecs.insert(VP9);
+ matroska_video_codecs.insert(H264);
+ matroska_video_codecs.insert(MPEG4_SP);
+ matroska_video_codecs.insert(MPEG4_ASP);
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+ matroska_video_codecs.insert(HEVC);
+#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 @@
CodecSet mp4_video_codecs;
mp4_video_codecs.insert(H264);
+ mp4_video_codecs.insert(MPEG4_SP);
+ mp4_video_codecs.insert(MPEG4_ASP);
#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?
AddContainerWithCodecs("application/ogg", ogg_codecs, 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 @@
// 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 @@
case MPEG4_AAC:
case H264:
case HEVC:
+ case DTS:
+ case MPEG4_SP:
+ case MPEG4_ASP:
return true;
case PCM:
+ case MP2:
case VORBIS:
case OPUS:
case VP8:
--- 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 {
VP8,
VP9,
THEORA,
- LAST_CODEC = THEORA
+ DTS,
+ MP2,
+ MPEG4_SP,
+ MPEG4_ASP,
+ LAST_CODEC = MPEG4_ASP
};
// Platform configuration structure. Controls which codecs are supported at
--- chromium-52.0.2716.0/net/base/mime_util.cc.matroska-avi 2016-04-27 00:02:52.000000000 +0200
+++ chromium-52.0.2716.0/net/base/mime_util.cc 2016-04-27 08:14:04.561330581 +0200
@@ -78,6 +78,9 @@ static const MimeInfo kPrimaryMappings[]
{"audio/webm", "webm"},
{"audio/wav", "wav"},
{"audio/flac", "flac"},
+ {"video/x-matroska", "mkv"},
+ {"audio/x-matroska", "mkv"},
+ {"video/x-msvideo", "avi"},
{"application/xhtml+xml", "xhtml,xht,xhtm"},
{"application/x-chrome-extension", "crx"},
{"multipart/related", "mhtml,mht"}};
@@ -425,6 +428,7 @@ static const char* const kStandardAudioT
"audio/vorbis",
"audio/wav",
"audio/webm",
+ "audio/x-matroska",
"audio/x-m4a",
"audio/x-ms-wma",
"audio/vnd.rn-realaudio",
@@ -442,8 +446,10 @@ static const char* const kStandardVideoT
"video/webm",
"video/x-dv",
"video/x-m4v",
+ "video/x-matroska",
"video/x-mpeg",
"video/x-ms-asf",
+ "video/x-msvideo",
"video/x-ms-wmv"
};
--- chromium-51.0.2687.0/media/base/audio_codecs.cc.ac3-dts 2016-03-22 23:01:01.000000000 +0100
+++ chromium-51.0.2687.0/media/base/audio_codecs.cc 2016-03-23 18:19:14.903959089 +0100
@@ -43,6 +43,8 @@ std::string GetCodecName(AudioCodec code
return "alac";
case kCodecAC3:
return "ac3";
+ case kCodecDTS:
+ return "dts";
}
NOTREACHED();
return "";
--- chromium-51.0.2687.0/media/base/audio_codecs.h.ac3-dts 2016-03-22 23:01:01.000000000 +0100
+++ chromium-51.0.2687.0/media/base/audio_codecs.h 2016-03-23 18:18:33.765701074 +0100
@@ -32,13 +32,14 @@ enum AudioCodec {
kCodecPCM_ALAW = 14,
kCodecALAC = 15,
kCodecAC3 = 16,
+ kCodecDTS = 17,
// 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 = kCodecAC3,
+ kAudioCodecMax = kCodecDTS,
};
std::string MEDIA_EXPORT GetCodecName(AudioCodec codec);
--- chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc.ac3-dts 2016-03-22 23:01:01.000000000 +0100
+++ chromium-51.0.2687.0/media/ffmpeg/ffmpeg_common.cc 2016-03-23 18:13:42.226118362 +0100
@@ -117,6 +117,8 @@ static AudioCodec CodecIDToAudioCodec(AV
return kCodecOpus;
case AV_CODEC_ID_ALAC:
return kCodecALAC;
+ case AV_CODEC_ID_DTS:
+ return kCodecDTS;
default:
DVLOG(1) << "Unknown audio CodecID: " << codec_id;
}
@@ -168,6 +170,10 @@ AVCodecID AudioCodecToCodecID(AudioCodec
return AV_CODEC_ID_PCM_MULAW;
case kCodecOpus:
return AV_CODEC_ID_OPUS;
+ case kCodecAC3:
+ return AV_CODEC_ID_AC3;
+ case kCodecDTS:
+ return AV_CODEC_ID_DTS;
default:
DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
}
--- chromium-55.0.2883.52/content/renderer/media/render_media_client.cc.bak 2016-11-17 00:02:26.000000000 +0100
+++ chromium-55.0.2883.52/content/renderer/media/render_media_client.cc 2016-11-27 21:55:59.360854652 +0100
@@ -101,13 +101,13 @@
case media::kCodecVP8:
case media::kCodecVP9:
case media::kCodecTheora:
+ case media::kCodecMPEG4:
+ case media::kCodecHEVC:
return true;
case media::kUnknownVideoCodec:
case media::kCodecVC1:
case media::kCodecMPEG2:
- case media::kCodecMPEG4:
- case media::kCodecHEVC:
return false;
}

76
chromium-55-flac.patch Normal file
View file

@ -0,0 +1,76 @@
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

46
chromium-browser-stable.spec
View file

@ -25,8 +25,8 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 54.0.2840.100
Release: 5
Version: 55.0.2883.75
Release: 1
License: BSD, LGPL
Group: Networking/WWW
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
@ -45,23 +45,12 @@ Source999: new-system-icons.tar.xz
Source1000: README.urpmi
Patch0: chromium-54-no-deprecated-error.patch
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
# PATCH-FIX-UPSTREAM Add more charset aliases
Patch6: chromium-more-codec-aliases.patch
# PATCH-FIX-OPENSUSE Compile the sandbox with -fPIE settings
Patch15: chromium-25.0.1364.172-sandbox-pie.patch
# (cjw) fix build with system icu using gn
Patch21: chromium-54-gn-system-icu.patch
# (cjw) remove assertion on "chromium" branding in combination with enabled "proprietary codecs"
Patch22: chromium-54-proprietary-codecs-assert.patch
# (cjw) fix a compilation warning
Patch23: chromium-53-bignum-werror-fix.patch
# (cjw) add -Wno-error=depecated-declarations because ffmpeg deprecations cause the build to fail
Patch24: chromium-53-ffmpeg-no-deprecation-errors.patch
# (cjw) fix compilation warnings when built with ASH disabled
Patch25: chromium-54-no-ash.patch
# (cjw) fix BreakIterator ambiguity
Patch26: chromium-53-breakiterator.patch
# (cjw) link several libraries directly instead of loading them using dlopen()
Patch27: chromium-53-link-libgio-libpci-libudev-libbrlapi.patch
# (cjw) add missing unbundle gn files (1)
@ -72,6 +61,14 @@ Patch29: chromium-53-gn-system-opus.patch
Patch30: chromium-52-pdfium-system-libtiff-libpng.patch
# (cjw) fix build with ffmpeg 2.8.x
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
Patch35: chromium-50-system-ffmpeg-3.patch
# From Fedora
Patch40: chromium-54.0.2840.90-setopaque.patch
@ -97,9 +94,6 @@ Patch504: chromium-system-icu-r0.patch
# vaInitialize failed VA error: unknown libva error
Patch507: issue1688073002_40001.diff
# Fix build with system ffmpeg
Patch508: chromium-54-system-ffmpeg.patch
Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable
Conflicts: chromium-browser-beta
@ -271,21 +265,20 @@ members of the Chromium and WebDriver teams.
%patch0 -p1
%patch4 -p1 -b .prefs
%patch6 -p0
#patch14 -p1
%patch15 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%if 0%{?ffmpeg}
%patch34 -p1
%patch35 -p1
%endif
%patch40 -p1
%patch41 -p1
@ -306,10 +299,6 @@ members of the Chromium and WebDriver teams.
%patch507 -p1
%endif
%if 0%{?ffmpeg}
%patch508 -p1 -b .ffmpeg
%endif
# files we do not want from upstream source bundles
rm -rf breakpad/src/processor/testdata/
rm -rf chrome/app/test_data/dlls/
@ -467,7 +456,7 @@ mkdir -p %{buildroot}%{_crdir}/locales
mkdir -p %{buildroot}%{_crdir}/themes
mkdir -p %{buildroot}%{_crdir}/default_apps
mkdir -p %{buildroot}%{_mandir}/man1
install -m 755 %{_src}/chromium-wrapper %{buildroot}%{_crdir}/
install -m 755 %{SOURCE1} %{buildroot}%{_crdir}/chromium-wrapper
install -m 755 out/Release/chrome %{buildroot}%{_crdir}/
install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_crdir}/chrome-sandbox
cp -a out/Release/chromedriver %{buildroot}%{_crdir}/chromedriver
@ -512,4 +501,3 @@ find %{buildroot} -name "*.nexe" -exec strip {} \;
mkdir -p %{buildroot}%{_docdir}/%{name}
install -p -m755 %{SOURCE1000} %{buildroot}%{_docdir}/%{name}

13
chromium-fix-chromedriver-build.diff
View file

@ -1,13 +0,0 @@
--- chrome/test/chromedriver/embed_version_in_cpp.py 2013-09-25 03:49:53.000000000 +0200
+++ chrome/test/chromedriver/embed_version_in_cpp.py 2013-09-25 03:49:53.000000000 +0200
@@ -25,9 +25,8 @@
options, args = parser.parse_args()
version = open(options.version_file, 'r').read().strip()
- revision = lastchange.FetchVersionInfo(None).revision.strip()
global_string_map = {
- 'kChromeDriverVersion': version + '.' + revision
+ 'kChromeDriverVersion': version
}
cpp_source.WriteSource('version',
'chrome/test/chromedriver',

17
chromium-more-codec-aliases.patch
View file

@ -1,17 +0,0 @@
Index: src/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
===================================================================
--- third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (revision 101168)
+++ third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (working copy)
@@ -203,7 +203,11 @@
registrar("iso_8859-6", "ISO-8859-6");
registrar("iso_8859-7", "ISO-8859-7");
registrar("iso_8859-8", "ISO-8859-8");
+ registrar("ISO_8859-8-I", "ISO-8859-8-I");
registrar("iso_8859-9", "windows-1254");
+ registrar("ISO_8859-10", "ISO-8859-10");
+ registrar("ISO_8859-13", "ISO-8859-13");
+ registrar("ISO_8859-14", "ISO-8859-14");
registrar("iso_8859-15", "ISO-8859-15");
registrar("koi8_r", "KOI8-R");
registrar("x-cp1253", "windows-1253");