We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 8
chromium-ffmpeg-extra.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Mon Oct 16 15:42:17 UTC 2017 - avvissu@yandex.by4
+5
+- Update to 61.0.3163.1006
+7
+-------------------------------------------------------------------8
Fri Jun 23 20:05:27 UTC 2017 - avvissu@yandex.by9
10
- Update to 59.0.3071.10411
chromium-ffmpeg-extra.spec
Changed
74
1
2
#3
4
5
-%define srcname chromium6
Name: chromium-ffmpeg-extra7
-Version: 59.0.3071.1048
+Version: 61.0.3163.1009
Release: 010
Summary: Extra ffmpeg codecs for browsers based on Chromium11
License: BSD-3-Clause and LGPL-2.1+12
Group: Productivity/Networking/Web/Browsers13
Url: http://code.google.com/p/chromium/14
-Source0: http://commondatastorage.googleapis.com/chromium-browser-official/%{srcname}-%{version}.tar.xz15
+Source0: http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz16
Source1: BUILD.gn17
Patch0: chromium-last-commit-position-r0.patch18
-Patch1: chromium-gcc7.patch19
-Patch2: chromium-dma-buf.patch20
+Patch1: gcc60-fixes.diff 21
+Patch2: chromium-dma-buf.patch22
+Patch3: chromium-gcc5.patch23
+Patch4: fix-gn-bootstrap.diff24
BuildRequires: gcc25
BuildRequires: gcc-c++26
BuildRequires: ninja27
28
(audio and video tags).29
30
%prep31
-%setup -q -n %{srcname}-%{version}32
+%setup -q -n chromium-%{version}33
%patch0 -p134
%patch1 -p135
%patch2 -p136
+%patch3 -p137
+%patch4 -p138
39
mkdir toolchain40
cp %{SOURCE1} toolchain/BUILD.gn41
42
%build43
export CC=gcc44
export CXX=g++45
-CFLAGS="%{optflags}"46
-export CFLAGS="${CFLAGS/-g /}"47
-export CXXFLAGS="${CFLAGS}"48
+export CFLAGS="$(echo "%{optflags} -std=gnu99" | sed 's/\ \-\<g\>//')"49
+export CXXFLAGS="$(echo ${CFLAGS} | sed 's/\ \-std=gnu99//')"50
51
myconf_gn=""52
myconf_gn+=" custom_toolchain=\"./toolchain:default\""53
myconf_gn+=" ffmpeg_branding=\"Chrome\""54
myconf_gn+=" proprietary_codecs=true"55
+myconf_gn+=" enable_swiftshader=false"56
myconf_gn+=" enable_hevc_demuxing=true"57
+myconf_gn+=" use_custom_libcxx=false"58
myconf_gn+=" use_gconf=false"59
myconf_gn+=" use_gio=false"60
myconf_gn+=" use_gnome_keyring=false"61
62
myconf_gn+=" is_debug=false"63
myconf_gn+=" symbol_level=0"64
65
-66
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"67
out/Release/gn gen --args="${myconf_gn}" out/Release68
-ninja -C out/Release media/ffmpeg69
+out/Release/gn args --list out/Release/70
+ninja -j 1 -C out/Release media/ffmpeg71
72
%install73
install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so74
chromium-dma-buf.patch
Changed
36
1
2
---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-03-29 15:08:58.079790070 +00003
-+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-03-29 15:09:10.068039324 +00004
-@@ -17,7 +17,6 @@5
+Index: chromium-60.0.3088.3/ui/gfx/linux/client_native_pixmap_dmabuf.cc6
+===================================================================7
+--- chromium-60.0.3088.3.orig/ui/gfx/linux/client_native_pixmap_dmabuf.cc8
++++ chromium-60.0.3088.3/ui/gfx/linux/client_native_pixmap_dmabuf.cc9
+@@ -19,9 +19,6 @@10
#include "base/strings/stringprintf.h"11
#include "base/trace_event/trace_event.h"12
13
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)14
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)15
+-#include <linux/dma-buf.h>16
+-#else17
#include <linux/types.h>18
19
- struct local_dma_buf_sync {20
-@@ -35,10 +34,6 @@21
- #define LOCAL_DMA_BUF_IOCTL_SYNC \22
- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync)23
+ struct dma_buf_sync {24
+@@ -36,7 +33,6 @@ struct dma_buf_sync {25
26
--#else27
--#include <linux/dma-buf.h>28
+ #define DMA_BUF_BASE 'b'29
+ #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)30
-#endif31
--32
+ 33
namespace gfx {34
35
- namespace {36
chromium-gcc7.patch -> chromium-gcc5.patch
Changed
104
1
2
-Index: chromium-59.0.3071.83/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h3
+Index: chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc4
===================================================================5
---- chromium-59.0.3071.83.orig/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h6
-+++ chromium-59.0.3071.83/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h7
-@@ -5,6 +5,7 @@8
- #include "platform/PlatformExport.h"9
- #include "platform/wtf/ThreadSpecific.h"10
+--- chromium-61.0.3163.79.orig/chrome/browser/devtools/devtools_file_system_indexer.cc11
++++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc12
+@@ -34,7 +34,6 @@ using base::TimeDelta;13
+ using base::TimeTicks;14
+ using content::BrowserThread;15
+ using std::map;16
+-using std::set;17
+ using std::string;18
+ using std::vector;19
20
-+#include <functional>21
- #include <memory>22
+@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str23
+ if (trigram != kUndefinedTrigram)24
+ trigrams.push_back(trigram);25
+ }26
+- set<FileId> file_ids;27
++ std::set<FileId> file_ids;28
+ bool first = true;29
+ vector<Trigram>::const_iterator it = trigrams.begin();30
+ for (; it != trigrams.end(); ++it) {31
+@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str32
+ first = false;33
+ continue;34
+ }35
+- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(36
++ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(37
+ file_ids, index_[trigram]);38
+ file_ids.swap(intersection);39
+ }40
+Index: chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h41
+===================================================================42
+--- chromium-61.0.3163.79.orig/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h43
++++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h44
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {45
+ allocation_length_(0),46
+ data_(data),47
+ data_length_(0),48
+- kind_(AllocationKind::kNormal),49
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),50
+ deleter_(deleter) {}51
+ DataHandle(void* allocation_base,52
+ size_t allocation_length,53
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {54
+ reinterpret_cast<uintptr_t>(allocation_base_) +55
+ allocation_length_);56
+ switch (kind_) {57
+- case AllocationKind::kNormal:58
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:59
+ DCHECK(deleter_);60
+ deleter_(data_);61
+ return;62
+- case AllocationKind::kReservation:63
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:64
+ ReleaseReservedMemory(allocation_base_, allocation_length_);65
+ return;66
+ }67
+Index: chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc68
+===================================================================69
+--- chromium-61.0.3163.79.orig/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc70
++++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc71
+@@ -10,7 +10,7 @@72
73
- namespace gpu {74
-Index: chromium-59.0.3071.83/v8/src/objects-body-descriptors.h75
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"76
+ 77
+-#include <math.h>78
++#include <cmath>79
+ #include <numeric>80
+ #include <vector>81
+ 82
+Index: chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc83
===================================================================84
---- chromium-59.0.3071.83.orig/v8/src/objects-body-descriptors.h85
-+++ chromium-59.0.3071.83/v8/src/objects-body-descriptors.h86
-@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public87
+--- chromium-61.0.3163.79.orig/cc/paint/paint_op_buffer.cc88
++++ chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc89
+@@ -207,7 +207,7 @@ TYPES(M);90
+ #undef TYPES91
92
- template <typename StaticVisitor>93
- static inline void IterateBody(HeapObject* obj, int object_size) {94
-- IterateBody(obj);95
-+ IterateBody<StaticVisitor>(obj);96
- }97
- };98
+ SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};99
+-const size_t PaintOp::kMaxSkip;100
++constexpr size_t PaintOp::kMaxSkip;101
102
+ std::string PaintOpTypeToString(PaintOpType type) {103
+ switch (type) {104
chromium-last-commit-position-r0.patch
Changed
32
1
2
---- a/tools/gn/gn_main.cc 2015-11-12 11:49:56.260549036 +00003
-+++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +00004
+Index: chromium-60.0.3107.4/tools/gn/gn_main.cc5
+===================================================================6
+--- chromium-60.0.3107.4.orig/tools/gn/gn_main.cc7
++++ chromium-60.0.3107.4/tools/gn/gn_main.cc8
@@ -12,13 +12,7 @@9
#include "tools/gn/standard_out.h"10
#include "tools/gn/switches.h"11
12
13
namespace {14
15
---- a/tools/gn/BUILD.gn 2015-11-12 11:50:43.513524769 +000016
-+++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +000017
-@@ -263,7 +263,6 @@18
+Index: chromium-60.0.3107.4/tools/gn/BUILD.gn19
+===================================================================20
+--- chromium-60.0.3107.4.orig/tools/gn/BUILD.gn21
++++ chromium-60.0.3107.4/tools/gn/BUILD.gn22
+@@ -268,7 +268,6 @@ executable("gn") {23
24
deps = [25
":gn_lib",26
- ":last_commit_position",27
"//base",28
- "//build/config/sanitizers:deps",29
+ "//build/config:exe_and_shlib_deps",30
"//build/win:default_exe_manifest",31
-32
fix-gn-bootstrap.diff
Added
29
1
2
+commit 96c271f8ab2be7ea4199078ea65ac50c6ada46853
+Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>4
+Date: Wed Jul 26 21:51:54 2017 +00005
+6
+ wip7
+8
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py9
+index 1390560f8e37..ff2ae57c46b0 10075510
+--- a/tools/gn/bootstrap/bootstrap.py11
++++ b/tools/gn/bootstrap/bootstrap.py12
+@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):13
+ 'base/metrics/histogram_base.cc',14
+ 'base/metrics/histogram_functions.cc',15
+ 'base/metrics/histogram_samples.cc',16
++ 'base/metrics/histogram_snapshot_manager.cc',17
+ 'base/metrics/metrics_hashes.cc',18
+ 'base/metrics/persistent_histogram_allocator.cc',19
+ 'base/metrics/persistent_memory_allocator.cc',20
+@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):21
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',22
+ 'base/trace_event/heap_profiler_allocation_register.cc',23
+ 'base/trace_event/heap_profiler_event_filter.cc',24
+- 'base/trace_event/heap_profiler_event_writer.cc',25
++ 'base/trace_event/heap_profiler_heap_dump_writer.cc',26
+ 'base/trace_event/heap_profiler_serialization_state.cc',27
+ 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',28
+ 'base/trace_event/heap_profiler_type_name_deduplicator.cc',29
gcc60-fixes.diff
Added
27
1
2
+--- a/build/config/compiler/BUILD.gn 2016-08-14 09:59:05.527738286 +02003
++++ b/build/config/compiler/BUILD.gn 2016-08-14 09:59:56.340463935 +02004
+@@ -389,6 +389,7 @@5
+ # TODO(thakis): Eventually switch this to c++11 instead,6
+ # http://crbug.com/4275847
+ cflags_cc += [ "-std=gnu++11" ]8
++ cflags_cc += [ "-fno-delete-null-pointer-checks" ]9
+ } else if (!is_win && !is_nacl) {10
+ # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++1111
+ # or c++11; we technically don't need this toolchain any more, but there12
+13
+diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h14
+index 99f230ce7e9a..de2415d402f5 10064415
+--- a/base/numerics/safe_math_shared_impl.h16
++++ b/base/numerics/safe_math_shared_impl.h17
+@@ -21,8 +21,7 @@18
+ #if !defined(__native_client__) && \19
+ ((defined(__clang__) && \20
+ ((__clang_major__ > 3) || \21
+- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \22
+- (defined(__GNUC__) && __GNUC__ >= 5))23
++ (__clang_major__ == 3 && __clang_minor__ >= 4))))24
+ #include "base/numerics/safe_math_clang_gcc_impl.h"25
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)26
+ #else27
chromium-59.0.3071.104.tar.xz -> chromium-61.0.3163.100.tar.xz
Changed