Merge branch 'master' into f25

2017-08-16 17:21:42 -04:00 · 2017-08-16 17:21:42 -04:00 · 00b7151be8
parent 52e2970033 5922b5cfc9
commit 00b7151be8
6 changed files with 87 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -26,3 +26,4 @@
 /chromium-59.0.3071.115-clean.tar.xz
 /chromium-59.0.3071.109-freetype.tar.bz2
 /chromium-60.0.3112.90-clean.tar.xz
+/chromium-60.0.3112.101-clean.tar.xz
--- a/chromium-60.0.3112.101-camfix.patch
+++ b/chromium-60.0.3112.101-camfix.patch
@ -0,0 +1,25 @@
+diff -up chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+--- chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc.camfix	2017-08-16 17:02:07.177832503 -0400
+++ chromium-60.0.3112.101/content/browser/renderer_host/media/media_devices_dispatcher_host.cc	2017-08-16 17:02:56.378883520 -0400
+@@ -6,6 +6,7 @@
+ 
+ #include <stddef.h>
+ 
+#include <algorithm>
+ #include <utility>
+ #include <vector>
+ 
+@@ -454,6 +455,13 @@ media::VideoCaptureFormats MediaDevicesD
+ 
+   media_stream_manager_->video_capture_manager()->GetDeviceSupportedFormats(
+       device_id, &formats);
+  // Remove formats that have zero resolution.
+  formats.erase(std::remove_if(formats.begin(), formats.end(),
+                               [](const media::VideoCaptureFormat& format) {
+                                 return format.frame_size.GetArea() <= 0;
+                               }),
+                formats.end());
+
+   return formats;
+ }
+ 
--- a/chromium-60.0.3112.90-init-list-hack.patch
+++ b/chromium-60.0.3112.90-init-list-hack.patch
@ -0,0 +1,27 @@
+diff -up chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
+--- chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc.tryfix	2017-08-09 14:45:17.619172987 -0400
+++ chromium-60.0.3112.90/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc	2017-08-11 10:24:10.635245642 -0400
+@@ -381,8 +381,9 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
+   }
+ 
+   NGLogicalOffset child_bfc_offset = curr_bfc_offset_;
+-  child_bfc_offset.inline_offset +=
+-      {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+  LayoutUnit sum_inline_starts = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+
+  child_bfc_offset.inline_offset += sum_inline_starts;
+ 
+   // Append the current margin strut with child's block start margin.
+   // Non empty border/padding, and new FC use cases are handled inside of the
+@@ -395,9 +396,8 @@ NGLogicalOffset NGBlockLayoutAlgorithm::
+ 
+   // Should collapse margins if our child is a legacy block.
+   if (IsLegacyBlock(*child)) {
+-    curr_bfc_offset_ +=
+-        {border_and_padding_.inline_start + curr_child_margins_.inline_start,
+-         curr_margin_strut_.Sum()};
+    LayoutUnit sum_inline_starts2 = {border_and_padding_.inline_start + curr_child_margins_.inline_start};
+    curr_bfc_offset_ += {sum_inline_starts2, curr_margin_strut_.Sum()};
+     MaybeUpdateFragmentBfcOffset(ConstraintSpace(), curr_bfc_offset_,
+                                  &container_builder_);
+     PositionPendingFloats(curr_bfc_offset_.block_offset, &container_builder_,
--- a/chromium-60.0.3112.90-vulkan-force-c99.patch
+++ b/chromium-60.0.3112.90-vulkan-force-c99.patch
@ -0,0 +1,11 @@
+diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn
+--- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99	2017-08-14 10:40:48.028799820 -0400
+++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn	2017-08-14 10:41:43.054734910 -0400
+@@ -180,6 +180,7 @@ config("vulkan_internal_config") {
+     cflags += [ "-Wno-ignored-attributes" ]
+   }
+   if (is_linux) {
+    cflags += [ "-std=c99" ]
+     defines += [
+       "SYSCONFDIR=\"/etc\"",
+       "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
--- a/chromium.spec
+++ b/chromium.spec
@ -115,7 +115,7 @@ Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3112.90
+Version:	%{majorversion}.0.3112.101
 Release:	1%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
@ -197,7 +197,11 @@ Patch43:	chromium-60.0.3112.78-jpeg-nomangle.patch
 Patch44:	chromium-60.0.3112.78-gtk2fix.patch
 # Do not mangle zlib
 Patch45:	chromium-60.0.3112.78-no-zlib-mangle.patch
-
+# Apply these changes to work around EPEL7 compiler issues
+Patch46:	chromium-60.0.3112.90-init-list-hack.patch
+Patch47:	chromium-60.0.3112.90-vulkan-force-c99.patch
+# https://chromium.googlesource.com/chromium/src/+/9c77470ff34bac937ceb765a27cee1703f0f2426
+Patch48:	chromium-60.0.3112.101-camfix.patch

 ### Chromium Tests Patches ###
 Patch100:	chromium-46.0.2490.86-use_system_opus.patch
@ -625,6 +629,11 @@ udev.
 %patch43 -p1 -b .nomangle
 %patch44 -p1 -b .gtk2fix
 %patch45 -p1 -b .nozmangle
+%if 0%{?rhel} == 7
+%patch46 -p1 -b .oldgcc
+%patch47 -p1 -b .c99
+%endif
+%patch48 -p1 -b .camfix

 ### Chromium Tests Patches ###
 %patch100 -p1 -b .use_system_opus
@ -1832,6 +1841,17 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt


 %changelog
+* Wed Aug 16 2017 Tom Callaway <spot@fedoraproject.org> 60.0.3112.101-1
+- update to 60.0.3112.101
+- apply upstream fix for cameras which report zero resolution formats
+  (bz1465357)
+
+* Mon Aug 14 2017 Tom Callaway <spot@fedoraproject.org> 60.0.3112.90-3
+- apply more workarounds to coax code to build with epel7 gcc
+
+* Wed Aug  9 2017 Tom Callaway <spot@fedoraproject.org> 60.0.3112.90-2
+- apply post 60 code commit to get code building on epel7
+
 * Fri Aug  4 2017 Tom Callaway <spot@fedoraproject.org> 60.0.3112.90-1
 - update to 60.0.3112.90

--- a/2
+++ b/2
@ -1,3 +1,3 @@
 SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-60.0.3112.90-clean.tar.xz) = 3b1579037b3debc0f714e5de3e02bd5fc1c8aa7482479ffc20b824653b11191ed558cef147633b30da16ffd8c26d5eacb95b93610041a44a6ea84606702f7ac1
 SHA512 (policy_templates.zip) = 4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
+SHA512 (chromium-60.0.3112.101-clean.tar.xz) = 3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6