summaryrefslogtreecommitdiff
path: root/www-client/chromium/files
diff options
context:
space:
mode:
authorPawel Hajdan, Jr <phajdan.jr@gentoo.org>2016-09-10 00:40:25 +0200
committerPawel Hajdan, Jr <phajdan.jr@gentoo.org>2016-09-10 00:40:34 +0200
commit6c0c212e131585bb38acf37eeb287430fe55c238 (patch)
tree301269a74aac67efb4936b2d5c31cffb0a07817e /www-client/chromium/files
parent27453728fb993224c9fdf4fae774a72acf223e4d (diff)
downloadgentoo-6c0c212e131585bb38acf37eeb287430fe55c238.tar.gz
gentoo-6c0c212e131585bb38acf37eeb287430fe55c238.tar.xz
www-client/chromium: dev channel bump (55.0.2853.0)
Package-Manager: portage-2.2.28
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-system-ffmpeg-r4.patch48
-rw-r--r--www-client/chromium/files/chromium-system-jinja-r14.patch31
2 files changed, 79 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
new file mode 100644
index 00000000000..3abfc163e8a
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
@@ -0,0 +1,48 @@
+--- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000
++++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000
+@@ -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 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,
+@@ -35,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>
+--- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000
++++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000
+@@ -1185,24 +1185,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());
+
diff --git a/www-client/chromium/files/chromium-system-jinja-r14.patch b/www-client/chromium/files/chromium-system-jinja-r14.patch
new file mode 100644
index 00000000000..4dba04433eb
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r14.patch
@@ -0,0 +1,31 @@
+--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
++++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
+@@ -9,10 +9,6 @@
+ _scripts_dir = "//third_party/WebKit/Source/build/scripts"
+
+ scripts_for_in_files = [
+- # jinja2/__init__.py contains version string, so sufficient as
+- # dependency for whole jinja2 package
+- "//third_party/jinja2/__init__.py",
+- "//third_party/markupsafe/__init__.py", # jinja2 dep
+ "$_scripts_dir/hasher.py",
+ "$_scripts_dir/in_file.py",
+ "$_scripts_dir/in_generator.py",
+--- a/third_party/WebKit/Source/bindings/scripts/scripts.gni.orig 2016-09-09 13:40:51.971660406 +0000
++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni 2016-09-09 13:41:15.472141236 +0000
+@@ -9,15 +9,9 @@
+ bindings_scripts_output_dir = "$root_gen_dir/blink/bindings/scripts"
+
+ jinja_module_files = [
+- "//third_party/jinja2/__init__.py",
+- "//third_party/markupsafe/__init__.py", # jinja2 dep
+ ]
+
+ idl_lexer_parser_files = get_path_info([
+- # PLY (Python Lex-Yacc)
+- "//third_party/ply/lex.py",
+- "//third_party/ply/yacc.py",
+-
+ # Web IDL lexer/parser (base parser)
+ "//tools/idl_parser/idl_lexer.py",
+ "//tools/idl_parser/idl_node.py",