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

Updated to 59.0.3071.115

Browse source
This commit is contained in:
Алзим 2017-07-28 21:55:58 +03:00
parent 6df66034d9
commit 7f3c2d4d39
17 changed files with 387 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,5 +1,6 @@
sources:
chromium-57.0.2987.110.tar.xz: 3507370918371431971503099ee0d7dadf3eec2b
chromium-59.0.3071.115.tar.xz: 78d2fbded029f7bcb9b51e6aa0f2d99c4df935c2
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
freetype2-5a3490e054bda8a318ebde482c7fb30213cab3d9.tar.xz: 017a2252d1363ae1a1e9c5ebf325a91a2018be1b
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

9
chromium-43-no-ffmpeg-internal.patch
View file

@ -12,7 +12,7 @@ diff -up chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal ch
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
@@ -1223,29 +1223,6 @@
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
@ -28,8 +28,13 @@ diff -up chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal
- 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])
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }

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

@ -1,8 +1,9 @@
--- chromium-57.0.2987.98/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc-orig 2017-03-09 23:05:29.000000000 +0300
+++ chromium-57.0.2987.98/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc 2017-03-10 20:49:34.403305556 +0300
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"
@ -11,17 +12,17 @@
+#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
} // extern "C"
#include "webrtc/api/video/i420_buffer.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"
#include "webrtc/common_video/h264/h264_bitstream_parser.h"

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

@ -1,23 +1,14 @@
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",
]
@@ -19,7 +19,6 @@
ldflags = []
include_dirs = [ "." ]
defines = [
- "OPJ_STATIC",
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -634,7 +633,7 @@ static_library("fxcodec") {
":fxcrt",
"third_party:fx_lcms2",
"third_party:fx_libopenjpeg",
- "third_party:fx_zlib",
+ "//third_party/zlib:zlib",
# This is a generic JPEG library dependency.
"//third_party:jpeg",
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
@ -30,40 +21,42 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/codec_int.h
class CPDF_ColorSpace;
--- chromium-57.0.2987.98/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp-orig 2017-03-09 23:05:26.000000000 +0300
+++ chromium-57.0.2987.98/third_party/pdfium/core/fxcodec/codec/fx_codec_flate.cpp 2017-03-10 20:05:23.383756424 +0300
@@ -14,7 +14,7 @@
#include "core/fxcodec/fx_codec.h"
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
@@ -15,7 +15,7 @@
#include "core/fxcrt/fx_ext.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
-#include "third_party/zlib_v128/zlib.h"
-#include "third_party/zlib/zlib.h"
+#include <zlib.h>
extern "C" {
static void* my_alloc_func(void* opaque,
--- 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"
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
@@ -17,7 +17,7 @@
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.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 @@ bool CJPX_Decoder::Init(const unsigned c
@@ -728,7 +728,7 @@
image = nullptr;
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
--- 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
--- chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp.pdfium-system-libtiff-libpng 2016-10-15 12:25:53.047704775 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_pngmodule.cpp 2016-10-15 12:32:27.308748242 +0200
@@ -10,10 +10,7 @@
#include "core/fxcodec/fx_codec.h"
#include "core/fxge/fx_dib.h"
@ -76,18 +69,19 @@ diff -up chromium-55.0.2883.11/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)) {
--- chromium-57.0.2987.98/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp-orig 2017-03-09 23:05:26.000000000 +0300
+++ chromium-57.0.2987.98/third_party/pdfium/core/fxcodec/codec/fx_codec_tiff.cpp 2017-03-10 20:22:13.380102877 +0300
@@ -14,7 +14,7 @@
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/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng 2016-10-14 00:04:44.000000000 +0200
+++ chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp 2016-10-15 12:32:46.897501978 +0200
@@ -9,7 +9,7 @@
#include "third_party/base/ptr_util.h"
extern "C" {
-#include "third_party/libtiff/tiffiop.h"
+#include <tiffio.h>
}
class CCodec_TiffContext {
@@ -171,7 +171,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) {
@ -96,18 +90,6 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/core/fxcodec/codec/fx_codec_pn
}
return tif;
}
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",
- "../third_party:fx_zlib",
+ "//third_party/zlib:zlib",
]
if (is_linux) {
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
@ -119,8 +101,8 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
group("third_party") {
deps = [
@@ -273,197 +274,34 @@ static_library("jpeg") {
]
@@ -318,164 +319,33 @@
}
}
-config("fx_libopenjpeg_warnings") {
@ -131,12 +113,8 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "/wd4018",
- ]
- }
+pkg_config("openjpeg_config") {
+ packages = [
+ "libopenjp2",
+ ]
}
-}
-
-static_library("fx_libopenjpeg") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
@ -166,9 +144,10 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "libopenjpeg20/t2.c",
- "libopenjpeg20/tcd.c",
- "libopenjpeg20/tgt.c",
- ]
+source_set("fx_libopenjpeg") {
+ public_configs = [ ":openjpeg_config" ]
+pkg_config("openjpeg_config") {
+ packages = [
+ "libopenjp2",
]
}
-static_library("fx_lpng") {
@ -176,10 +155,7 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
+pkg_config("fx_libpng_config") {
+ packages = [
+ "libpng",
]
- ]
- sources = [
- "libpng16/png.c",
- "libpng16/png.h",
@ -205,10 +181,24 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "libpng16/pngwtran.c",
- "libpng16/pngwutil.c",
- ]
-
+source_set("fx_libopenjpeg") {
+ public_configs = [ ":openjpeg_config" ]
+}
- defines = []
- cflags = []
-
- deps = [
- "//third_party/zlib",
+pkg_config("fx_libpng_config") {
+ packages = [
+ "libpng",
]
+}
+
+source_set("fx_lpng") {
+ public_configs = [ ":fx_libpng_config" ]
+}
- if (current_cpu == "x86" || current_cpu == "x64") {
- sources += [
- "libpng16/contrib/intel/filter_sse2_intrinsics.c",
@ -230,9 +220,11 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- # Unary minus applied to unsigned type.
- cflags += [ "/wd4146" ]
- }
+config("fx_tiff_config") {
+ libs = [ "tiff" ]
}
-if (pdf_enable_xfa) {
if (pdf_enable_xfa) {
- static_library("fx_tiff") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
@ -246,6 +238,7 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- }
- deps = [
- "//third_party:jpeg",
- "//third_party/zlib",
- ]
- sources = [
- "libtiff/tif_aux.c",
@ -286,51 +279,19 @@ diff -up chromium-55.0.2883.11/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "libtiff/tiffiop.h",
- "libtiff/tiffvers.h",
- ]
- }
+source_set("fx_lpng") {
+ public_configs = [ ":fx_libpng_config" ]
}
-# TODO(dsinclair): Remove if fixed upstream. https://crbug.com/507712
-config("fx_zlib_warnings") {
- visibility = [ ":*" ]
- if (is_clang) {
- cflags = [ "-Wno-shift-negative-value" ]
- }
+config("fx_tiff_config") {
+ libs = [ "tiff" ]
}
-static_library("fx_zlib") {
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
- ":pdfium_third_party_config",
-
- # Must be after no_chromium_code for warning flags to be ordered correctly.
- ":fx_zlib_warnings",
- ]
- sources = [
- "zlib_v128/adler32.c",
- "zlib_v128/compress.c",
- "zlib_v128/crc32.c",
- "zlib_v128/deflate.c",
- "zlib_v128/gzclose.c",
- "zlib_v128/gzlib.c",
- "zlib_v128/gzread.c",
- "zlib_v128/gzwrite.c",
- "zlib_v128/infback.c",
- "zlib_v128/inffast.c",
- "zlib_v128/inflate.c",
- "zlib_v128/inftrees.c",
- "zlib_v128/trees.c",
- "zlib_v128/uncompr.c",
- "zlib_v128/zutil.c",
- ]
+if (pdf_enable_xfa) {
+ source_set("fx_tiff") {
+ public_configs = [ ":fx_tiff_config" ]
+ }
}
}
# Can not be a static library due to lack of .cc files.
--- chromium-59.0.3071.86/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h.system-openjpg 2017-06-05 21:04:21.000000000 +0200
+++ chromium-59.0.3071.86/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h 2017-06-08 02:14:04.774234999 +0200
@@ -9,7 +9,7 @@
#include <vector>
-#include "third_party/libopenjpeg20/openjpeg.h"
+#include <openjpeg.h>
class CPDF_ColorSpace;

14
chromium-53-ffmpeg-no-deprecation-errors.patch
View file

@ -1,7 +1,7 @@
--- chromium-53.0.2785.46/build/linux/unbundle/ffmpeg.gn.ffmpeg-deprecation 2016-08-05 00:05:10.000000000 +0200
+++ chromium-53.0.2785.46/build/linux/unbundle/ffmpeg.gn 2016-08-09 21:22:45.143683293 +0200
@@ -13,6 +13,12 @@
]
@@ -17,6 +17,12 @@
defines = [ "USE_SYSTEM_FFMPEG=1" ]
}
+config("ffmpeg_deprecations") {
@ -13,10 +13,10 @@
shim_headers("ffmpeg_shim") {
root_path = "."
headers = [
@@ -26,5 +32,5 @@
deps = [
":ffmpeg_shim",
@@ -33,5 +39,6 @@
public_configs = [
":system_ffmpeg",
":using_system_ffmpeg",
+ ":ffmpeg_deprecations",
]
- public_configs = [ ":system_ffmpeg" ]
+ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ]
}

4
chromium-53-gn-system-icu-jsoncpp.patch
View file

@ -32,11 +32,11 @@ diff -up chromium-55.0.2873.0/build/linux/unbundle/jsoncpp.gn.gn-system-icu-json
diff -up chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py.gn-system-icu-jsoncpp chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py
--- chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py.gn-system-icu-jsoncpp 2016-10-01 16:21:27.343107786 +0200
+++ chromium-55.0.2873.0/build/linux/unbundle/replace_gn_files.py 2016-10-01 17:17:38.913721403 +0200
@@ -21,6 +21,7 @@ REPLACEMENTS = {
@@ -21,6 +21,7 @@
'flac': 'third_party/flac/BUILD.gn',
'harfbuzz-ng': 'third_party/harfbuzz-ng/BUILD.gn',
'icu': 'third_party/icu/BUILD.gn',
+ 'jsoncpp' : 'third_party/jsoncpp/BUILD.gn',
'libdrm': 'third_party/libdrm/BUILD.gn',
'libevent': 'base/third_party/libevent/BUILD.gn',
'libjpeg': 'build/secondary/third_party/libjpeg_turbo/BUILD.gn',
'libpng': 'third_party/libpng/BUILD.gn',

20
chromium-54-ffmpeg-2.8.patch
View file

@ -1,20 +0,0 @@
diff -up chromium-54.0.2840.71/media/ffmpeg/ffmpeg_common.cc.ffmpeg-2.8 chromium-54.0.2840.71/media/ffmpeg/ffmpeg_common.cc
--- chromium-54.0.2840.71/media/ffmpeg/ffmpeg_common.cc.ffmpeg-2.8 2016-10-31 19:26:32.599632709 +0100
+++ chromium-54.0.2840.71/media/ffmpeg/ffmpeg_common.cc 2016-11-03 21:36:28.282984313 +0100
@@ -792,7 +792,6 @@ TEST_PRIMARY(SMPTE170M);
TEST_PRIMARY(SMPTE240M);
TEST_PRIMARY(FILM);
TEST_PRIMARY(BT2020);
-TEST_PRIMARY(SMPTEST428_1);
TEST_TRANSFER(RESERVED0);
TEST_TRANSFER(BT709);
@@ -810,8 +809,6 @@ TEST_TRANSFER(BT1361_ECG);
TEST_TRANSFER(IEC61966_2_1);
TEST_TRANSFER(BT2020_10);
TEST_TRANSFER(BT2020_12);
-TEST_TRANSFER(SMPTEST2084);
-TEST_TRANSFER(SMPTEST428_1);
TEST_COLORSPACE(RGB);
TEST_COLORSPACE(BT709);

35
chromium-54.0.2840.59-nullfix.patch
View file

@ -1,35 +0,0 @@
diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn
--- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix 2016-10-13 16:49:26.844221023 -0400
+++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn 2016-10-13 16:50:49.882605484 -0400
@@ -31,6 +31,7 @@ gcc_toolchain("arm") {
ld = cxx
readelf = "${toolprefix}readelf"
nm = "${toolprefix}nm"
+ extra_cppflags = "-fno-delete-null-pointer-checks"
toolchain_args = {
current_cpu = "arm"
@@ -70,6 +71,7 @@ gcc_toolchain("x86") {
nm = "nm"
ar = "ar"
ld = cxx
+ extra_cppflags = "-fno-delete-null-pointer-checks"
toolchain_args = {
current_cpu = "x86"
@@ -109,6 +111,7 @@ gcc_toolchain("x64") {
nm = "nm"
ar = "ar"
ld = cxx
+ extra_cppflags = "-fno-delete-null-pointer-checks"
toolchain_args = {
current_cpu = "x64"
@@ -131,6 +134,7 @@ gcc_toolchain("mipsel") {
ld = cxx
readelf = "mipsel-linux-gnu-readelf"
nm = "mipsel-linux-gnu-nm"
+ extra_cppflags = "-fno-delete-null-pointer-checks"
toolchain_args = {
cc_wrapper = ""

13
chromium-54.0.2840.90-setopaque.patch
View file

@ -1,13 +0,0 @@
diff -up chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque chromium-54.0.2840.90/cc/blink/web_layer_impl.h
--- chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque 2016-11-03 09:07:03.422497483 -0400
+++ chromium-54.0.2840.90/cc/blink/web_layer_impl.h 2016-11-03 09:07:13.302307531 -0400
@@ -80,7 +80,7 @@ class WebLayerImpl : public blink::WebLa
blink::WebBlendMode blendMode() const override;
void setIsRootForIsolatedGroup(bool root) override;
bool isRootForIsolatedGroup() override;
- void setOpaque(bool opaque) override;
+ CC_BLINK_EXPORT void setOpaque(bool opaque) override;
bool opaque() const override;
void setPosition(const blink::WebFloatPoint& position) override;
blink::WebFloatPoint position() const override;
diff -up chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc.setopaque chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc

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

@ -1,32 +1,33 @@
--- 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},
--- 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
@@ -76,7 +76,11 @@
{"flac", MimeUtil::FLAC},
{"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8},
- {"theora", MimeUtil::THEORA}};
- {"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.
@@ -275,6 +279,9 @@ VideoCodec MimeUtilToVideoCodec(MimeUtil
return kCodecVP9;
case MimeUtil::THEORA:
+ {"mp4v.20.240", MimeUtil::MPEG4_ASP}
};
return kStringToCodecMap;
@@ -142,6 +146,9 @@
return kCodecTheora;
case MimeUtil::DOLBY_VISION:
return kCodecDolbyVision;
+ case MimeUtil::MPEG4_SP:
+ case MimeUtil::MPEG4_ASP:
+ return kCodecMPEG4;
default:
break;
}
@@ -357,6 +364,31 @@ void MimeUtil::AddSupportedMediaFormats(
@@ -234,6 +241,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);
@ -38,7 +39,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);
@ -51,12 +52,11 @@
+#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);
webm_audio_codecs.insert(VORBIS);
@@ -386,6 +418,8 @@ void MimeUtil::AddSupportedMediaFormats(
@@ -264,6 +296,8 @@
CodecSet mp4_video_codecs;
mp4_video_codecs.insert(H264);
+ mp4_video_codecs.insert(MPEG4_SP);
@ -64,33 +64,33 @@
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
mp4_video_codecs.insert(HEVC);
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
@@ -410,6 +444,9 @@ void MimeUtil::AddSupportedMediaFormats(
@@ -291,6 +325,9 @@
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)
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3".
AddContainerWithCodecs("audio/mp3", implicit_codec, true);
@@ -422,6 +459,7 @@ void MimeUtil::AddSupportedMediaFormats(
@@ -303,6 +340,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?
@@ -766,9 +804,13 @@ bool MimeUtil::IsCodecProprietary(Codec
case MPEG4_AAC:
@@ -721,9 +759,13 @@
case H264:
case HEVC:
case DOLBY_VISION:
+ case DTS:
+ case MPEG4_SP:
+ case MPEG4_ASP:
return true;
case PCM:
+ case MP2:
case VORBIS:
@ -98,11 +98,11 @@
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 {
VP8,
@@ -42,7 +42,11 @@
VP9,
THEORA,
- LAST_CODEC = THEORA
DOLBY_VISION,
- LAST_CODEC = DOLBY_VISION
+ DTS,
+ MP2,
+ MPEG4_SP,
@ -153,6 +153,15 @@
}
NOTREACHED();
return "";
@@ -72,6 +72,8 @@
return kCodecVorbis;
if (base::StartsWith(codec_id, "mp4a.40.", base::CompareCase::SENSITIVE))
return kCodecAAC;
+ if (codec_id == "dts")
+ return kCodecDTS;
return kUnknownAudioCodec;
}
--- 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 {
@ -193,11 +202,77 @@
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 @@
--- chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc.bak 2016-11-29 21:04:19.000000000 +0100
+++ chromium-56.0.2924.10/media/remoting/proto_enum_utils.cc 2016-12-01 23:42:15.717317808 +0100
@@ -57,6 +57,7 @@
CASE_RETURN_OTHER(kCodecPCM_ALAW);
CASE_RETURN_OTHER(kCodecALAC);
CASE_RETURN_OTHER(kCodecAC3);
+ CASE_RETURN_OTHER(kCodecDTS);
}
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
@@ -83,6 +83,7 @@
CASE_RETURN_OTHER(kCodecPCM_ALAW);
CASE_RETURN_OTHER(kCodecALAC);
CASE_RETURN_OTHER(kCodecAC3);
+ CASE_RETURN_OTHER(kCodecDTS);
}
return base::nullopt; // Not a 'default' to ensure compile-time checks.
}
--- chromium-56.0.2924.10/media/remoting/rpc.proto.bak 2016-11-29 21:04:19.000000000 +0100
+++ chromium-56.0.2924.10/media/remoting/rpc.proto 2016-12-02 02:15:05.660562641 +0100
@@ -64,6 +64,7 @@
kCodecPCM_ALAW = 14;
kCodecALAC = 15;
kCodecAC3 = 16;
+ kCodecDTS = 17;
}
// Proto version of media::SampleFormat.
--- chromium-56.0.2924.21/media/filters/ffmpeg_video_decoder.cc.extra_media 2016-12-09 00:02:25.000000000 +0100
+++ chromium-56.0.2924.21/media/filters/ffmpeg_video_decoder.cc 2016-12-10 20:33:18.005427356 +0100
@@ -57,7 +57,6 @@
case kUnknownVideoCodec:
case kCodecVC1:
case kCodecMPEG2:
- case kCodecHEVC:
case kCodecVP9:
case kCodecDolbyVision:
// We do not compile ffmpeg with support for any of these codecs.
@@ -70,6 +69,7 @@
case kCodecH264:
case kCodecMPEG4:
case kCodecVP8:
+ case kCodecHEVC:
// Normalize to three threads for 1080p content, then scale linearly
// with number of pixels.
// Examples:
--- chromium-59.0.3071.86/media/base/decode_capabilities.cc.extra-media 2017-06-05 21:03:08.000000000 +0200
+++ chromium-59.0.3071.86/media/base/decode_capabilities.cc 2017-06-06 06:40:15.679758574 +0200
@@ -114,6 +114,9 @@
case media::kCodecPCM_S24BE:
case media::kCodecPCM_ALAW:
case media::kCodecVorbis:
+ case media::kCodecEAC3:
+ case media::kCodecAC3:
+ case media::kCodecDTS:
return true;
case media::kCodecAMR_NB:
@@ -125,9 +127,7 @@
return false;
#endif
- case media::kCodecEAC3:
case media::kCodecALAC:
- case media::kCodecAC3:
case media::kUnknownAudioCodec:
return false;
}
@@ -147,13 +147,13 @@
case media::kCodecH264:
case media::kCodecVP8:
case media::kCodecVP9:
case media::kCodecTheora:
+ case media::kCodecMPEG4:
+ case media::kCodecHEVC:
@ -208,6 +283,6 @@
case media::kCodecMPEG2:
- case media::kCodecMPEG4:
- case media::kCodecHEVC:
case media::kCodecDolbyVision:
return false;
}

24
chromium-56-gcc4.patch
View file

@ -1,24 +0,0 @@
diff -urN chromium-56.0.2924.76.orig/remoting/host/security_key/fake_security_key_ipc_server.cc chromium-56.0.2924.76/remoting/host/security_key/fake_security_key_ipc_server.cc
--- chromium-56.0.2924.76.orig/remoting/host/security_key/fake_security_key_ipc_server.cc 2017-01-26 21:07:19.937348360 +0300
+++ chromium-56.0.2924.76/remoting/host/security_key/fake_security_key_ipc_server.cc 2017-01-26 21:10:34.481627009 +0300
@@ -130,7 +130,7 @@
ipc_server_map_[connection_id] = fake_ipc_server->AsWeakPtr();
- return fake_ipc_server;
+ return std::move(fake_ipc_server);
}
base::WeakPtr<FakeSecurityKeyIpcServer>
diff -urN chromium-56.0.2924.76.orig/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc chromium-56.0.2924.76/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
--- chromium-56.0.2924.76.orig/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc 2017-01-26 21:07:25.725445907 +0300
+++ chromium-56.0.2924.76/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc 2017-01-26 21:11:22.865332765 +0300
@@ -412,7 +412,7 @@
return nullptr;
}
- return capturer;
+ return std::move(capturer);
}
} // namespace webrtc

11
chromium-59-dma-buf-h.patch Normal file
View file

@ -0,0 +1,11 @@
--- chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc.dma-buf_h 2017-06-05 21:03:30.000000000 +0200
+++ chromium-59.0.3071.86/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-06-11 16:43:16.154326678 +0200
@@ -17,7 +17,7 @@
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
#include <linux/types.h>
struct local_dma_buf_sync {

42
chromium-59-gcc4.patch Normal file
View file

@ -0,0 +1,42 @@
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlinstruction.cpp-orig 2017-06-26 22:04:29.000000000 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlinstruction.cpp 2017-07-27 21:11:10.199479706 +0300
@@ -23,7 +23,7 @@
auto pClone = pdfium::MakeUnique<CFDE_XMLInstruction>(GetName());
pClone->SetAttributes(GetAttributes());
pClone->m_TargetData = m_TargetData;
- return pClone;
+ return std::move(pClone);
}
void CFDE_XMLInstruction::AppendData(const CFX_WideString& wsData) {
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlelement.cpp-orig 2017-07-27 23:42:24.853530256 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fde/xml/cfde_xmlelement.cpp 2017-07-27 23:39:40.148476817 +0300
@@ -38,7 +38,7 @@
pChild = pChild->m_pNext;
}
pClone->SetTextData(wsText);
- return pClone;
+ return std::move(pClone);
}
CFX_WideString CFDE_XMLElement::GetLocalTagName() const {
--- chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/xfa_fmparse.cpp-orig 2017-06-26 22:04:29.000000000 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/xfa/fxfa/fm2js/xfa_fmparse.cpp 2017-07-28 00:48:27.307139021 +0300
@@ -839,7 +839,7 @@
pExp = pdfium::MakeUnique<CXFA_FMBlockExpression>(line,
std::move(expressions));
}
- return pExp;
+ return std::move(pExp);
}
std::unique_ptr<CXFA_FMExpression> CXFA_FMParse::ParseIfExpression() {
@@ -896,7 +896,7 @@
std::move(pIfExpression),
std::move(pElseExpression));
}
- return pExp;
+ return std::move(pExp);
}
std::unique_ptr<CXFA_FMExpression> CXFA_FMParse::ParseWhileExpression() {

12
chromium-59.0.3071.115-pdfium-freetype.patch Normal file
View file

@ -0,0 +1,12 @@
diff -urN chromium-59.0.3071.115.orig/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp chromium-59.0.3071.115/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp
--- chromium-59.0.3071.115.orig/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp 2017-06-28 13:54:02.380847926 +0300
+++ chromium-59.0.3071.115/third_party/pdfium/core/fxge/freetype/fx_freetype.cpp 2017-06-28 13:54:59.089557933 +0300
@@ -6,7 +6,7 @@
#include "core/fxge/fx_freetype.h"
-#include "third_party/freetype/src/src/psnames/pstables.h"
+#include "third_party/freetype/src/psnames/pstables.h"
static int xyq_search_node(char* glyph_name,
int name_offset,

59
chromium-browser-stable.spec
View file

@ -22,7 +22,7 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 57.0.2987.110
Version: 59.0.3071.115
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -37,6 +37,8 @@ Source10: %{name}.rpmlintrc
Source30: master_preferences
Source31: default_bookmarks.html
Source32: chromium.default
# https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
Source50: freetype2-5a3490e054bda8a318ebde482c7fb30213cab3d9.tar.xz
Source100: icons.tar.bz2
Source997: depot_tools.tar.xz
Source999: new-system-icons.tar.xz
@ -55,18 +57,14 @@ Patch27: chromium-53-link-libgio-libpci-libudev-libbrlapi.patch
Patch28: chromium-53-gn-system-icu-jsoncpp.patch
# (cjw) build pdfium with system libtiff and libpng
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) 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
Patch41: chromium-54.0.2840.59-nullfix.patch
# new kernel header is not available in userspace
Patch36: chromium-59-dma-buf-h.patch
# New from Debian
Patch500: chromium-third-party-cookies-off-by-default.patch
@ -84,9 +82,15 @@ Patch504: chromium-system-icu-r0.patch
# fix https://bugs.chromium.org/p/chromium/issues/detail?id=585513
# vaInitialize failed VA error: unknown libva error
Patch507: issue1688073002_40001.diff
# Build failure with GCC 4.9.4
# https://bugs.chromium.org/p/chromium/issues/detail?id=682965
Patch508: chromium-56-gcc4.patch
Patch508: chromium-59-gcc4.patch
# This patch is required in addition to passing the enable_swiftshader=false build flag.
Patch509: really-disable-swiftshader-on-x86.patch
Patch600: fix_for_system_ffmpeg_ABI.patch
# https://bugs.chromium.org/p/pdfium/issues/detail?id=733
Patch601: chromium-59.0.3071.115-pdfium-freetype.patch
Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable
@ -98,6 +102,7 @@ BuildRequires: git
BuildRequires: gperf
BuildRequires: gyp
BuildRequires: ninja
BuildRequires: nodejs >= 6.7.0
BuildRequires: util-linux
BuildRequires: yasm
BuildRequires: atomic-devel
@ -127,6 +132,7 @@ BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(harfbuzz)
%if 0%{icu}
BuildRequires: pkgconfig(icu-i18n)
%endif
@ -198,12 +204,18 @@ your profile before changing channels.
%{_crdir}/themes
%{_crdir}/default_apps
%dir %{_crdir}/pepper
%{_crdir}/lib*.so*
#%{_crdir}/lib*.so*
%{_mandir}/man1/%{crname}*
%{_datadir}/applications/*.desktop
%{_iconsdir}/hicolor/*/apps/chromium*
%{_docdir}/%{name}/README.urpmi
# Remove chromium-browser-install package if we have it installed
if [ `rpm -q chromium-browser-install | wc -w` == 1 ]
then
rpm -e chromium-browser-install
fi
#----------------------------------------------------------------------------
%package -n chromium-browser
@ -244,8 +256,12 @@ members of the Chromium and WebDriver teams.
#----------------------------------------------------------------------------
%prep
%setup -q -T -c -n freetype -a 50
%setup -qn chromium-%{version} -a 997 -a 999
# https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
cp -a ../freetype/* third_party/freetype/
%patch0 -p1
%patch4 -p1 -b .prefs
@ -255,15 +271,12 @@ members of the Chromium and WebDriver teams.
%patch27 -p1
%patch28 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%if 0%{?ffmpeg}
%patch34 -p1
%patch35 -p1
%endif
%patch40 -p1
%patch41 -p1
%patch36 -p1
# new from debian
%patch500 -p1
@ -278,8 +291,11 @@ members of the Chromium and WebDriver teams.
%patch503 -p1 -b .vaapi
%patch507 -p1
%endif
%patch508 -p1
%patch509 -p1
%patch600 -p1
%patch601 -p1
# files we do not want from upstream source bundles
rm -rf breakpad/src/processor/testdata/
@ -320,7 +336,6 @@ rm -rf third_party/yasm/source/
rm -rf third_party/zlib/{*.[ch],contrib/minizip}
rm -rf tools/gyp/test/
#rm -rf v8/test/
rm -r third_party/pdfium/third_party/libjpeg/*.[ch]
rm -f third_party/pdfium/third_party/libtiff/*.[ch]
rm -f third_party/skia/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.jar
@ -342,6 +357,7 @@ rm -f third_party/closure_compiler/compiler/compiler.jar
rm -rf third_party/proguard/lib
rm -f third_party/checkstyle/checkstyle-6.5-all.jar
rm -rf third_party/sfntly/src/cpp/ext
#rm -rf third_party/node
# Remove bundled ICU; its header files appear to get picked up instead of
# the system ones, leading to errors during the final link stage.
@ -359,8 +375,12 @@ FILE=chrome/common/channel_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE
cmp $FILE $FILE.orig && exit 1
# setup node
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
%build
%define system_gn_list ffmpeg flac libxslt snappy yasm libpng zlib jsoncpp
%define system_gn_list ffmpeg flac harfbuzz-ng libxslt snappy yasm libpng zlib jsoncpp
# opus
# icu
# libevent
@ -407,7 +427,7 @@ cmp $FILE $FILE.orig && exit 1
use_libpci = true \
is_debug=false \
is_clang=false \
is_component_build=true \
enable_swiftshader=false \
google_api_key="%{google_api_key}" \
google_default_client_id="%{google_default_client_id}" \
google_default_client_secret="%{google_default_client_secret}"
@ -449,9 +469,6 @@ install -m 644 out/Release/*.pak %{buildroot}%{_crdir}/
install -m 644 out/Release/icudtl.dat %{buildroot}%{_crdir}/
cp -a out/Release/*_blob.bin %{buildroot}%{_crdir}/
# chromium components
cp -av out/Release/lib*.so* %{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/

46
fix_for_system_ffmpeg_ABI.patch Normal file
View file

@ -0,0 +1,46 @@
diff -up chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h
--- chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change 2015-11-18 13:16:05.867971946 +0100
+++ chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h 2015-11-18 13:19:20.130249467 +0100
@@ -22,18 +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 FFmpeg's
-// BUILD.gn 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,
-// but the upstream code does not yet compile with it disabled.
-// (In this case, the fix is replacing the call with a new function.)
-// In the meantime, we directly disable those warnings in the C file.
-//#define FF_API_AVPACKET_OLD_API 0
-
// Temporarily disable possible loss of data warning.
// TODO(scherkus): fix and upstream the compiler warnings.
MSVC_PUSH_DISABLE_WARNING(4244);
--- chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn.disable_ffmpeg_api_change 2016-09-28 07:51:54.000000000 +0200
+++ chromium-55.0.2873.0/third_party/ffmpeg/BUILD.gn 2016-10-01 13:44:59.429129847 +0200
@@ -169,21 +169,6 @@
"_POSIX_C_SOURCE=200112",
"_XOPEN_SOURCE=600",
"PIC",
-
- # Disable deprecated features that generate spammy warnings.
- # media/ffmpeg/ffmpeg_common.h defines these as well and must be kept
- # in sync with this file.
- "FF_API_CONVERGENCE_DURATION=0",
-
- # Upstream libavcodec/utils.c still uses the deprecated
- # av_dup_packet(), avcodec_encode_{audio,video}2(), and
- # libavformat/utils.c still accesses the deprecated AVStream.codec,
- # causing deprecation warnings.
- # The normal fix for such things is to disable the features like setting
- # "FF_API_AVPACKET_OLD_API=0", but the upstream code does not yet compile
- # with it disabled (in the case of av_dup_packet()), and has no FF_API*
- # gate for avcodec_encode_{audio,video}2() or AVStream.codec. In the
- # meantime, we directly disable those warnings locally in the C files.
]
# So we can append below and assume they're defined.

33
really-disable-swiftshader-on-x86.patch Normal file
View file

@ -0,0 +1,33 @@
Description: Do not build swiftshader on x86 on trusty
Swiftshader fails to build with fPIC and gcc < 5.
Trusty has gcc 4.8 and 4.9, and disabling fPIC results in another component
(re2::RE2::Init()) crashing at startup.
This patch is required in addition to passing the enable_swiftshader=false
build flag.
Bug-Ubuntu: https://launchpad.net/bugs/1697496
Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -392,8 +392,7 @@ group("gn_all") {
]
}
- if ((is_win || is_mac || is_linux) &&
- (target_cpu == "x86" || target_cpu == "x64")) {
+ if ((is_win || is_mac || is_linux) && (target_cpu == "x64")) {
deps += [ "//third_party/swiftshader" ]
}
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -1768,8 +1768,7 @@ source_set("browser") {
deps += [ "//ui/gfx/x" ]
}
- if (is_linux && !is_chromeos && use_x11 &&
- (target_cpu == "x86" || target_cpu == "x64")) {
+ if (is_linux && !is_chromeos && use_x11 && (target_cpu == "x64")) {
deps += [ "//third_party/swiftshader" ]
}