diff --git a/network/web/chromium-browser/actions.py b/network/web/chromium-browser/actions.py index 37aac5f573..cbd5f67ad7 100644 --- a/network/web/chromium-browser/actions.py +++ b/network/web/chromium-browser/actions.py @@ -48,6 +48,7 @@ def setup(): proprietary_codecs=true \ link_pulseaudio=true \ use_pulseaudio=true \ + use_vulcanize=false \ use_gtk3=false' shelltools.system("tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt) diff --git a/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch b/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch new file mode 100644 index 0000000000..1a771c9f7e --- /dev/null +++ b/network/web/chromium-browser/files/chromium-58.0.3029.81-system_ffmpeg-1.patch @@ -0,0 +1,56 @@ +Submitted By: DJ Lucas +Date: 2017-03-18 +Initial Package Version: 57.0.2987.110 +Upstream Status: Not submitted +Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch +Description: Allows building with system provided ffmpeg. + + +--- 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 + #include +-#include + #include + #include + #include +--- 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 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(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast(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(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 media_tracks(new MediaTracks()); + diff --git a/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch b/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch new file mode 100644 index 0000000000..76287e1a56 --- /dev/null +++ b/network/web/chromium-browser/files/chromium-gn-bootstrap-r2.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/base_switches.cc', + 'base/build_time.cc', + 'base/callback_internal.cc', ++ 'base/callback_helpers.cc', + 'base/command_line.cc', + 'base/debug/activity_tracker.cc', + 'base/debug/alias.cc', diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index a700bfb16e..3851700607 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -13,7 +13,7 @@ app:gui A WebKit powered web browser Chromium-browser is an open-source web browser, powered by WebKit. - https://commondatastorage.googleapis.com/chromium-browser-official/chromium-55.0.2883.75.tar.xz + https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.81.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -84,14 +84,19 @@ libffi-devel yasm-devel usbutils + nodejs + glibc-devel + glib2-devel - chromium-52.0.2743.116-unset-madv_free.patch + chromium-widevine.patch - chromium-icu58.patch + pisilinux/gfx_jpeg_codec.patch pisilinux/fix_build_with_newer_gcc.patch pisilinux/last_commit_position.patch + chromium-58.0.3029.81-system_ffmpeg-1.patch + chromium-gn-bootstrap-r2.patch @@ -119,6 +124,8 @@ libXrender libXScrnSaver libXtst + libxcb + libxslt minizip mit-kerberos nss @@ -138,7 +145,9 @@ libpng snappy freetype - harfbuzz + harfbuzz + nodejs + glibc /etc @@ -157,6 +166,13 @@ + + 2017-04-30 + 58.0.3029.81 + Version Bump + Ergün Salman + poyraz76@pisilinux.org + 2016-12-12 55.0.2883.75