gentoo resync : 09.03.2018

2 files changed, 33 insertions, 0 deletions

diff --git a/www-client/chromium/files/chromium-clang-r4.patch b/www-client/chromium/files/chromium-clang-r4.patch
new file mode 100644
index 000000000000..8d5122f70c3d
--- /dev/null
+++ b/www-client/chromium/files/chromium-clang-r4.patch
@@ -0,0 +1,11 @@
+--- a/device/fido/u2f_ble_transaction.cc
++++ b/device/fido/u2f_ble_transaction.cc
+@@ -131,7 +131,7 @@
+ 
+ void U2fBleTransaction::OnError() {
+   request_frame_.reset();
+-  request_cont_fragments_ = {};
++  request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>();
+   response_frame_assembler_.reset();
+   std::move(callback_).Run(base::nullopt);
+ }
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
new file mode 100644
index 000000000000..53d61e8f38b8
--- /dev/null
+++ b/www-client/chromium/files/chromium-ffmpeg-r1.patch
@@ -0,0 +1,22 @@
+--- a/build/linux/unbundle/ffmpeg.gn
++++ b/build/linux/unbundle/ffmpeg.gn
+@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
+   ]
+ }
+ 
+-buildflag_header("ffmpeg_buildflags") {
+-  header = "ffmpeg_buildflags.h"
++buildflag_header("ffmpeg_features") {
++  header = "ffmpeg_features.h"
+   flags = [ "USE_SYSTEM_FFMPEG=true" ]
+ }
+ 
+@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
+ 
+ source_set("ffmpeg") {
+   deps = [
+-    ":ffmpeg_buildflags",
++    ":ffmpeg_features",
+     ":ffmpeg_shim",
+   ]
+   public_configs = [ ":system_ffmpeg" ]