From 5922b5cfc93c9d5de2fe2258364697ea0cae6de5 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 16 Aug 2017 17:20:49 -0400
Subject: [PATCH] update to 60.0.3112.101, apply upstream fix for cameras which
 report zero resolution formats (bz1465357)

---
 .gitignore                          |  1 +
 chromium-60.0.3112.101-camfix.patch | 25 +++++++++++++++++++++++++
 chromium.spec                       | 13 ++++++++++---
 sources                             |  2 +-
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 chromium-60.0.3112.101-camfix.patch

diff --git a/.gitignore b/.gitignore
index 19bd92f3..428fd64b 100644
--- 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
diff --git a/chromium-60.0.3112.101-camfix.patch b/chromium-60.0.3112.101-camfix.patch
new file mode 100644
index 00000000..0dd59d49
--- /dev/null
+++ 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;
+ }
+ 
diff --git a/chromium.spec b/chromium.spec
index 8e2d7b06..c99bb84a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -115,8 +115,8 @@ Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3112.90
-Release:	3%{?dist}
+Version:	%{majorversion}.0.3112.101
+Release:	1%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
 License:	BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -200,7 +200,8 @@ 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
@@ -632,6 +633,7 @@ udev.
 %patch46 -p1 -b .oldgcc
 %patch47 -p1 -b .c99
 %endif
+%patch48 -p1 -b .camfix
 
 ### Chromium Tests Patches ###
 %patch100 -p1 -b .use_system_opus
@@ -1839,6 +1841,11 @@ 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
 
diff --git a/sources b/sources
index 24b41dfa..9309b9e4 100644
--- a/sources
+++ b/sources
@@ -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