[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/

["Paweł Hajdan" <phajdan.jr@gentoo.org>]

commit:     d6f5e46dd704331624ee41bd85cfe8f8bfb871e3
Author:     Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 16:58:29 2017 +0000
Commit:     Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 17:21:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f5e46d

www-client/chromium: dev channel bump (59.0.3063.4)

 www-client/chromium/Manifest                       |  2 +-
 ...0.3047.0.ebuild => chromium-59.0.3063.4.ebuild} |  8 ++-
 .../chromium/files/chromium-system-ffmpeg-r5.patch | 66 ++++++++++++++++++++++
 .../files/chromium-system-libjpeg-r1.patch         |  9 +++
 4 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7c54b5d3a98..62ce4fb1584 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-57.0.2987.133.tar.xz 525240460 SHA256 70011770a7e522c92826a3af48d3fd28a46bf8042897d072d20c748cbf828cf7 SHA512 b53fb357d3f11b45a46b3fe52a10b0d20cf8f3fedc8454ceca6b8d1ea9c526493cfeeb4472766e3f23ceba5cd53b089a2639d6a166fbfa91db05153571b59039 WHIRLPOOL 25854c4c1c9b9fde2c0bd9af7c374fe3fe78a19a34703cf54cb157a257c7408bf1bf58c199afbc16009e99bc4a3cdc578e907e78fc45bc781e59ab39b877c374
 DIST chromium-58.0.3029.14.tar.xz 509043400 SHA256 b7a02ec45d61516552f7377bd066ee1d77a4ededc03c4c53c18373797dc8d8c4 SHA512 b84c422965c694eee4159bd4f8c102fda5e7d8012adf195c2882f9ef3030a0433fac666de85bfcdd4e635d82a57dfa9f3d4e8000dfb8ada2e068348190a4524c WHIRLPOOL dc47733b3344f58fa1a3bc3f1dcac5088d9bbfcffa1c395547ff42367d2164f51cced3f9ad4afc7157834339dbe3fbe6790c835345533c917013770fe11ebec7
 DIST chromium-58.0.3029.19.tar.xz 509050504 SHA256 ffe5b52faf219bee7675460ac56b3d62a3ee9fd2001f4a854224a1445b8af5e6 SHA512 b1780d4920d14e4861b5e5895accf49d7b65d49345ec243d7d1042ca1d0246cb3b4fcfa383ea3a6ef9a2145bc526be71286af156051a058f4f699b64cce772cb WHIRLPOOL e5e57370aa06ef8ef7b1e923f684148a1035dc3c4282e6a327cbe4f6e7a472ed724e5c4edb3e5ea91ed3620ea6a9d9f23c5ddb52246ff840b7997e3b00bebc8a
-DIST chromium-59.0.3047.0.tar.xz 517288828 SHA256 721fab5df661df892880c63b6b3b8a89978f6874afe3de4506e3e762d7cf3ba3 SHA512 0259aeecd25e734d5d8fcbc51bf976b71ef1a9332852a836c233a413856f319746d7181e3b8315729f08ca7a0959a2a67966ea6ac14442697ab73f27af0067c7 WHIRLPOOL 6a93d595ec023b2d4d008e163fec660a54d9d1013d36b2a466f5a35b81e37f6313e961bac49780f0a90eb3f6173da99a2acb09a6976e0ba3c43a9a8bd4937aa4
 DIST chromium-59.0.3053.3.tar.xz 516942144 SHA256 55126fa8954093d513a77191ff32b194647f119a0dfbf101c636e5d557c28252 SHA512 5a5d0f6d06ffbaf13e6e1e7442a86418f07ed00654926fad9ba1ae3458f0a67374da3a43d8235abd5a6db0827f57c25a631d537e6475c23488ffc272a65fbfee WHIRLPOOL 1df35cffa2160fdd95f834df10b6f6e07703b9070bd46b7d5631dca66ab0ec4b2d6d947ad9e0c80f0a8f6380b1bf9afd23df6842f827005638b6e710eda8aa3c
+DIST chromium-59.0.3063.4.tar.xz 519742312 SHA256 3ed3240fca23675f59d0bbf32884ba7c1b6d2288cf499b27d7792d499d8d6d60 SHA512 4dfb4948f4632f813b35eed3935cd771c435dce4dfbd77b698c6e7df7a19af037368293d2cd91d44353aa15de0c47cb809fa144258324116b8c18e2fde16ebff WHIRLPOOL cb183a61ce92d3e99befd2b7503100a63eaa64e33b8ae049571138cbe01d768757dc50555111d4ac11546d1cd8f73717d9904a794a3146c54d3afa1420986dc4

diff --git a/www-client/chromium/chromium-59.0.3047.0.ebuild b/www-client/chromium/chromium-59.0.3063.4.ebuild
similarity index 99%
rename from www-client/chromium/chromium-59.0.3047.0.ebuild
rename to www-client/chromium/chromium-59.0.3063.4.ebuild
index 06da96ed51c..9055ebfaf73 100644
--- a/www-client/chromium/chromium-59.0.3047.0.ebuild
+++ b/www-client/chromium/chromium-59.0.3063.4.ebuild
@@ -200,10 +200,11 @@ src_prepare() {
 		"${FILESDIR}/${PN}-widevine-r1.patch"
 		"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
 		"${FILESDIR}/skia-avx2.patch"
+		"${FILESDIR}/${PN}-dma-buf-r1.patch"
+		"${FILESDIR}/${PN}-system-ffmpeg-r5.patch"
+		"${FILESDIR}/${PN}-system-libjpeg-r1.patch"
 	)
 
-	use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" )
-
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -253,6 +254,7 @@ src_prepare() {
 		third_party/fips181
 		third_party/flatbuffers
 		third_party/flot
+		third_party/freetype
 		third_party/google_input_tools
 		third_party/google_input_tools/third_party/closure_library
 		third_party/google_input_tools/third_party/closure_library/third_party/closure
@@ -297,7 +299,6 @@ src_prepare() {
 		third_party/pdfium/third_party/libopenjpeg20
 		third_party/pdfium/third_party/libpng16
 		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
 		third_party/ply
 		third_party/polymer
 		third_party/protobuf
@@ -367,6 +368,7 @@ src_configure() {
 		flac
 		harfbuzz-ng
 		icu
+		libdrm
 		libjpeg
 		libpng
 		libwebp

diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
new file mode 100644
index 00000000000..cf82dd1bb40
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
@@ -0,0 +1,66 @@
+--- a/media/ffmpeg/ffmpeg_common.h.orig	2017-04-07 18:17:22.623538889 +0000
++++ b/media/ffmpeg/ffmpeg_common.h	2017-04-07 18:18:16.780656283 +0000
+@@ -23,10 +23,12 @@
+ 
+ // Include FFmpeg header files.
+ extern "C" {
++#if !defined(USE_SYSTEM_FFMPEG)
+ // 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
++#endif  // !defined(USE_SYSTEM_FFMPEG)
+ // 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,
+@@ -40,7 +42,9 @@
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
++#if !defined(USE_SYSTEM_FFMPEG)
+ #include <libavformat/internal.h>
++#endif  // !defined(USE_SYSTEM_FFMPEG)
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+--- a/media/filters/ffmpeg_demuxer.cc.orig	2017-04-07 18:15:14.776901183 +0000
++++ b/media/filters/ffmpeg_demuxer.cc	2017-04-07 18:15:54.813727201 +0000
+@@ -1223,6 +1223,7 @@
+   // If no estimate is found, the stream entry will be kInfiniteDuration.
+   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
+                                                     kInfiniteDuration);
++#if !defined(USE_SYSTEM_FFMPEG)
+   const AVFormatInternal* internal = format_context->internal;
+   if (internal && internal->packet_buffer &&
+       format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+@@ -1246,6 +1247,7 @@
+       packet_buffer = packet_buffer->next;
+     }
+   }
++#endif  // !defined(USE_SYSTEM_FFMPEG)
+ 
+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
+ 
+--- a/build/linux/unbundle/ffmpeg.gn.orig	2017-04-07 18:18:55.793461226 +0000
++++ b/build/linux/unbundle/ffmpeg.gn	2017-04-07 18:20:13.883072465 +0000
+@@ -13,6 +13,10 @@
+   ]
+ }
+ 
++config("using_system_ffmpeg") {
++  defines = [ "USE_SYSTEM_FFMPEG=1" ]
++}
++
+ shim_headers("ffmpeg_shim") {
+   root_path = "."
+   headers = [
+@@ -26,5 +30,8 @@
+   deps = [
+     ":ffmpeg_shim",
+   ]
+-  public_configs = [ ":system_ffmpeg" ]
++  public_configs = [
++    ":system_ffmpeg",
++    ":using_system_ffmpeg",
++  ]
+ }

diff --git a/www-client/chromium/files/chromium-system-libjpeg-r1.patch b/www-client/chromium/files/chromium-system-libjpeg-r1.patch
new file mode 100644
index 00000000000..3c5d0f7d151
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-libjpeg-r1.patch
@@ -0,0 +1,9 @@
+--- a/build/linux/unbundle/libjpeg.gn.orig	2017-04-07 18:43:28.687843142 +0000
++++ b/build/linux/unbundle/libjpeg.gn	2017-04-07 18:43:47.156224137 +0000
+@@ -21,3 +21,6 @@
+ 
+ source_set("simd_asm") {
+ }
++
++config("libjpeg_config") {
++}