From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1213759CB4 for ; Wed, 20 Apr 2016 20:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC23821C0E2; Wed, 20 Apr 2016 20:06:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6398121C0E2 for ; Wed, 20 Apr 2016 20:06:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5626340967 for ; Wed, 20 Apr 2016 20:06:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 614E8188 for ; Wed, 20 Apr 2016 20:06:09 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1461182733.9a0ccf7a1680ab65b17c87baf6ff3826edf47825.phajdan.jr@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/Manifest www-client/chromium/chromium-51.0.2700.0.ebuild www-client/chromium/chromium-51.0.2704.19.ebuild www-client/chromium/files/chromium-system-ffmpeg-r3.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: Paweł Hajdan X-VCS-Revision: 9a0ccf7a1680ab65b17c87baf6ff3826edf47825 X-VCS-Branch: master Date: Wed, 20 Apr 2016 20:06:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 53c53253-207a-4b74-b20a-e2833aa46211 X-Archives-Hash: 14c648139ee7b285b03db47af9e80316 commit: 9a0ccf7a1680ab65b17c87baf6ff3826edf47825 Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Wed Apr 20 20:05:33 2016 +0000 Commit: Paweł Hajdan gentoo org> CommitDate: Wed Apr 20 20:05:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0ccf7a www-client/chromium: dev channel bump (51.0.2704.19); fix build with system ffmpeg (bug #576372) Package-Manager: portage-2.2.26 www-client/chromium/Manifest | 2 +- ....2700.0.ebuild => chromium-51.0.2704.19.ebuild} | 3 +- .../chromium/files/chromium-system-ffmpeg-r3.patch | 73 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 81dc68d..4455712 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,3 @@ DIST chromium-50.0.2661.75.tar.xz 531558012 SHA256 c12d644e711ec85c800ab61a749d1f03ba7999e0c3cd20f8495a674d39a643da SHA512 cc44a052a858d9f43052d825bac891bb44bb5ec4261f4c7a560d9f0798edd9c0ec2c174dd3a61f6adcf01976838e97c49d93973b8c926c6ef5cd8c92ee1672f3 WHIRLPOOL 8ec8164fd305f0a67bf433f46294d06e16ac3d0c2b2e5d5531c213f1c471aedc51f2b61215f507677ad3cd40c529cb72547facdeba3ce3c4cc081c3727ef97aa -DIST chromium-51.0.2700.0.tar.xz 460037268 SHA256 5942ee28ae24196654fb107f6b98ccca7014aa891cb572b54f261394ce99baf0 SHA512 a17772a46639f963d6fc7179e17704b7eccd09ed49aaff24f0fe26e799ec521f4c26880c581a87c7cbf893a0c6c81a1eb2a6b75c51ff6971c9b97e7d52908bad WHIRLPOOL 0404236abcfe7fdde71f00dc003281e3dc001448e56fe09a42b6dce579b08cb265d7bfe71795e08f0944bd84a85b4c85b059cc018944645371667f661df0d43c +DIST chromium-51.0.2704.19.tar.xz 459662212 SHA256 515846fadd3fb4a539c5b368854ba918aeeff910f83e346e2f2515e9251f2ef3 SHA512 86aca654f4ba1c6704748cb41c53273513f6de80a0482e1ae95d02306cc967b7d9d87cba8e9b4984287a4f38b821611fe42c3870c2c9f79997d6a5f8a00004ca WHIRLPOOL 5bf091f52335f7ba29f1acf78e0666673c5c4304e83d7537781691fdd483c45b6466333d64f756ce99ef47578b31fd2828f4124fda492cb62bc6974e71de67d9 DIST chromium-51.0.2704.7.tar.xz 459684340 SHA256 1597514c47ff7c09c2a6002adb60b9a4aba6b1eab3dd53fea7438a0cdbe3d8e1 SHA512 dd2a177e8309a6ddee92edecac866d6a1bcecb476df42d4b8823921b8457563238bae76ddfb360a536787b81547f063f054d0582ddc2ac5545b0d4d3b62bc10e WHIRLPOOL 39b703f60dea0a2c33ad4c1da68b5340782a845f2f25496d5829f2a2ba9733cf3b689907de33024d3f8dc3582153e7f9f969bfd2591ae845948c012ac207f1f4 diff --git a/www-client/chromium/chromium-51.0.2700.0.ebuild b/www-client/chromium/chromium-51.0.2704.19.ebuild similarity index 99% rename from www-client/chromium/chromium-51.0.2700.0.ebuild rename to www-client/chromium/chromium-51.0.2704.19.ebuild index 1816372..565ab68 100644 --- a/www-client/chromium/chromium-51.0.2700.0.ebuild +++ b/www-client/chromium/chromium-51.0.2704.19.ebuild @@ -188,7 +188,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch" + epatch "${FILESDIR}/${PN}-system-ffmpeg-r3.patch" epatch "${FILESDIR}/${PN}-system-jinja-r8.patch" epatch "${FILESDIR}/${PN}-widevine-r1.patch" epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch" @@ -296,7 +296,6 @@ src_prepare() { 'third_party/mesa' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ - 'third_party/npapi' \ 'third_party/openh264' \ 'third_party/openmax_dl' \ 'third_party/opus' \ diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch new file mode 100644 index 0000000..8be1735 --- /dev/null +++ b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch @@ -0,0 +1,73 @@ +--- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000 ++++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000 +@@ -19,10 +19,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, +@@ -36,7 +32,6 @@ + MSVC_PUSH_DISABLE_WARNING(4244); + #include + #include +-#include + #include + #include + #include +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index 155e980..7ba327a 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -1034,24 +1034,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; +- } +- } + + AVStream* audio_stream = NULL; + AudioDecoderConfig audio_config; +Index: build/linux/unbundle/ffmpeg.gyp +diff --git a/build/linux/unbundle/ffmpeg.gyp b/build/linux/unbundle/ffmpeg.gyp +index e3c3723894ceae651920154dbb65cf83aa4d3d40..b86a1c4dc71c55d86a0bb66664f27cfe4f243fbc 100644 +--- a/build/linux/unbundle/ffmpeg.gyp ++++ b/build/linux/unbundle/ffmpeg.gyp +@@ -41,6 +41,17 @@ + 'USE_SYSTEM_FFMPEG', + ], + }, ++ 'variables': { ++ 'headers_root_path': '.', ++ 'header_filenames': [ ++ 'libavcodec/avcodec.h', ++ 'libavformat/avformat.h', ++ 'libavutil/imgutils.h', ++ ], ++ }, ++ 'includes': [ ++ '../../build/shim_headers.gypi', ++ ], + 'link_settings': { + 'ldflags': [ + '