[chromium-libs-media-freeworld: 8/8] Merge 'fedora/master' 5922b5c, 60.0.3112.101-1
commit 4495c9437a58f02d100ccbab642a4b075589a177
Merge: 487bae1 5922b5c
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Aug 23 20:58:16 2017 +0200
Merge 'fedora/master' 5922b5c, 60.0.3112.101-1
.gitignore | 1 +
chromium-60.0.3112.101-camfix.patch | 25 +++++++++++++++++++++++++
chromium-60.0.3112.90-init-list-hack.patch | 27 +++++++++++++++++++++++++++
chromium-60.0.3112.90-vulkan-force-c99.patch | 11 +++++++++++
chromium-libs-media-freeworld.spec | 24 ++++++++++++++++++++++--
sources | 2 +-
6 files changed, 87 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 8bad827,428fd64..c2a7b5e
--- a/.gitignore
+++ b/.gitignore
@@@ -20,15 -20,10 +20,16 @@@
/chromium-57.0.2987.133-clean.tar.xz
/chromium-58.0.3029.81-clean.tar.xz
/chromium-58.0.3029.110-clean.tar.xz
+/chromium-58.0.3029.110.tar.xz
/chromium-59.0.3071.86-clean.tar.xz
+/chromium-59.0.3071.86.tar.xz
/chromium-59.0.3071.104-clean.tar.xz
+/chromium-59.0.3071.104.tar.xz
/chromium-59.0.3071.109-clean.tar.xz
+/chromium-59.0.3071.109.tar.xz
/chromium-59.0.3071.115-clean.tar.xz
/chromium-59.0.3071.109-freetype.tar.bz2
+/chromium-59.0.3071.115.tar.xz
/chromium-60.0.3112.90-clean.tar.xz
-/chromium-60.0.3112.101-clean.tar.xz
+/chromium-60.0.3112.90.tar.xz
++/chromium-60.0.3112.101.tar.xz
diff --cc sources
index 13c5ce7,9309b9e..9816669
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,3 @@@
-SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (policy_templates.zip) =
4d2a7162adb3ca224f3e1bf1d2936ae395603e8ffa3fda7753e666a16c42c7ba54c7acfcfdc742e22978ace37e471ed099d222063708d4d8a299da3daf135f15
-SHA512 (chromium-60.0.3112.101-clean.tar.xz) =
3ed13c6a32752294898fa72f2333f32fcf081eef7328307645dbc09baae95aca762d3083d2ae053fc903a0b4dc92e04da91a810d267aab21dea196362ed6abc6
+a6495be59bdbc20b2524d7c1356e82ac policy_templates.zip
+49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
- 75f9199e5e0b31e9fbfbaf1f3071b411 chromium-60.0.3112.90.tar.xz
++9fe9af85faeaf617cb61997c431a02e2 chromium-60.0.3112.101.tar.xz