[chromium-libs-media-freeworld: 25/35] Merge branch 'master' into f24
commit b5aa03dc2da3ac8bcc34c4da70e2080087b0dbd6
Merge: 3739ffe 850545e
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue May 16 08:44:34 2017 -0400
Merge branch 'master' into f24
.gitignore | 2 +
...sktop.service => chrome-remote-desktop@.service | 1 +
chromium-52.0.2743.82-widevinefix.patch | 25 ---
chromium-56.0.2924.87-gcc-49.patch | 12 --
chromium-56.0.2924.87-unique-ptr-fix.patch | 12 --
chromium-57.0.2987.110-gtk_ui-gcc-fix.patch | 12 --
...patch => chromium-58.0.3029.81-enable-mp3.patch | 82 ++++++----
chromium-58.0.3029.81-ffmpeg-stdatomic.patch | 14 ++
chromium-58.0.3029.81-fix-gn.patch | 11 ++
chromium-58.0.3029.81-use_system_harfbuzz.patch | 12 ++
...-b794998819088f76b4cf44c8db6940240c563cf4.patch | 19 +++
chromium.spec | 71 +++++----
clean_ffmpeg.sh | 3 +-
sources | 5 +-
stdatomic.h | 173 ---------------------
15 files changed, 151 insertions(+), 303 deletions(-)
---