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 9
chromium-ffmpeg-extra.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Fri Feb 2 23:21:51 UTC 2018 - fisiu@opensuse.org4
+5
+- Update to 64.0.3282.1346
+- Drop fix-gn-bootstrap.diff: fixed upstream.7
+- Drop fix-gn-bootstrap.diff: build with gcc7.8
+- Add chromium-angle.patch: fix build issue.9
+- Add chromium-memcpy.patch: fix build issue.10
+11
+-------------------------------------------------------------------12
Mon Oct 16 15:42:17 UTC 2017 - avvissu@yandex.by13
14
- Update to 61.0.3163.10015
16
-------------------------------------------------------------------17
Fri Apr 28 05:04:38 UTC 2017 - avvissu@yandex.by18
19
-- Update to 58.0.3029.81 20
+- Update to 58.0.3029.8121
22
-------------------------------------------------------------------23
Tue Apr 11 05:24:41 UTC 2017 - avvissu@yandex.by24
chromium-ffmpeg-extra.spec
Changed
78
1
2
3
4
Name: chromium-ffmpeg-extra5
-Version: 61.0.3163.1006
+Version: 64.0.3282.1347
Release: 08
Summary: Extra ffmpeg codecs for browsers based on Chromium9
License: BSD-3-Clause and LGPL-2.1+10
11
Source0: http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz12
Source1: BUILD.gn13
Patch0: chromium-last-commit-position-r0.patch14
-Patch1: gcc60-fixes.diff 15
-Patch2: chromium-dma-buf.patch16
-Patch3: chromium-gcc5.patch17
-Patch4: fix-gn-bootstrap.diff18
+Patch1: chromium-dma-buf.patch19
+Patch2: chromium-angle.patch20
+Patch3: chromium-memcpy.patch21
BuildRequires: gcc22
BuildRequires: gcc-c++23
BuildRequires: ninja24
-BuildRequires: pkgconfig25
+BuildRequires: python-xml26
+BuildRequires: pkgconfig(dri)27
BuildRequires: pkgconfig(gtk+-2.0)28
BuildRequires: pkgconfig(gtk+-3.0)29
BuildRequires: pkgconfig(libexif)30
31
%patch1 -p132
%patch2 -p133
%patch3 -p134
-%patch4 -p135
36
mkdir toolchain37
cp %{SOURCE1} toolchain/BUILD.gn38
39
fi40
41
%build42
+ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"43
+export CFLAGS="${ARCH_FLAGS} -std=gnu11 -fpermissive"44
+export CXXFLAGS="${ARCH_FLAGS} -fpermissive"45
+%if 0%{?suse_version} < 133046
+export CC=gcc-747
+export CXX=g++-748
+# some still call gcc/g++49
+mkdir -p "$HOME/bin/"50
+ln -sfn /usr/bin/$CC $HOME/bin/gcc51
+ln -sfn /usr/bin/$CXX $HOME/bin/g++52
+export PATH="$HOME/bin/:$PATH"53
+%else54
export CC=gcc55
export CXX=g++56
-export CFLAGS="$(echo "%{optflags} -std=gnu99" | sed 's/\ \-\<g\>//')"57
-export CXXFLAGS="$(echo ${CFLAGS} | sed 's/\ \-std=gnu99//')"58
+%endif59
+60
+ninjaproc="%{?jobs:%{jobs}}"61
62
myconf_gn=""63
myconf_gn+=" custom_toolchain=\"./toolchain:default\""64
65
myconf_gn+=" is_component_build=true"66
myconf_gn+=" is_debug=false"67
myconf_gn+=" symbol_level=0"68
+myconf_gn+=" enable_vulkan=false" # fails to compile now69
70
tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"71
out/Release/gn gen --args="${myconf_gn}" out/Release72
out/Release/gn args --list out/Release/73
-ninja -j 1 -C out/Release media/ffmpeg74
+ninja -j $ninjaproc -C out/Release media/ffmpeg75
76
%install77
install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so78
chromium-angle.patch
Added
91
1
2
+From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 20013
+From: Kai Ninomiya <kainino@chromium.org>4
+Date: Wed, 06 Dec 2017 14:06:53 -08005
+Subject: [PATCH] Mark StaticType related functions as constexpr6
+7
+Fixes compilation on some versions of GCC and probably Clang.8
+9
+Follow-up to http://crrev.com/c/78631710
+11
+Bug: angleproject:143212
+Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e513
+Reviewed-on: https://chromium-review.googlesource.com/81222014
+Reviewed-by: Jamie Madill <jmadill@chromium.org>15
+Commit-Queue: Kai Ninomiya <kainino@chromium.org>16
+---17
+18
+diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h19
+index e26e5ff..30b391a 10064420
+--- a/third_party/angle/src/compiler/translator/StaticType.h21
++++ b/third_party/angle/src/compiler/translator/StaticType.h22
+@@ -160,7 +160,7 @@23
+ TPrecision precision,24
+ TQualifier qualifier,25
+ unsigned char secondarySize>26
+-const TType *GetForVecMatHelper(unsigned char primarySize)27
++constexpr const TType *GetForVecMatHelper(unsigned char primarySize)28
+ {29
+ static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||30
+ basicType == EbtBool,31
+@@ -186,7 +186,7 @@32
+ template <TBasicType basicType,33
+ TPrecision precision = EbpUndefined,34
+ TQualifier qualifier = EvqGlobal>35
+-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)36
++constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)37
+ {38
+ static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||39
+ basicType == EbtBool,40
+@@ -208,7 +208,7 @@41
+ }42
+ 43
+ template <TBasicType basicType, TPrecision precision = EbpUndefined>44
+-const TType *GetForVec(TQualifier qualifier, unsigned char size)45
++constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)46
+ {47
+ switch (qualifier)48
+ {49
+diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp50
+index adf1e4e..90d4c15 10064451
+--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp52
++++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp53
+@@ -236,7 +236,7 @@54
+ pop();55
+ }56
+ 57
+-bool IsGenType(const TType *type)58
++constexpr bool IsGenType(const TType *type)59
+ {60
+ if (type)61
+ {62
+@@ -248,7 +248,7 @@63
+ return false;64
+ }65
+ 66
+-bool IsVecType(const TType *type)67
++constexpr bool IsVecType(const TType *type)68
+ {69
+ if (type)70
+ {71
+diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h72
+index 04f46f1..a54d447 10064473
+--- a/third_party/angle/src/compiler/translator/Types.h74
++++ b/third_party/angle/src/compiler/translator/Types.h75
+@@ -142,13 +142,13 @@76
+ {77
+ }78
+ 79
+- TBasicType getBasicType() const { return type; }80
++ constexpr TBasicType getBasicType() const { return type; }81
+ void setBasicType(TBasicType t);82
+ 83
+ TPrecision getPrecision() const { return precision; }84
+ void setPrecision(TPrecision p) { precision = p; }85
+ 86
+- TQualifier getQualifier() const { return qualifier; }87
++ constexpr TQualifier getQualifier() const { return qualifier; }88
+ void setQualifier(TQualifier q) { qualifier = q; }89
+ 90
+ bool isInvariant() const { return invariant; }91
chromium-gcc5.patch
Deleted
85
1
2
-Index: chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc3
-===================================================================4
---- chromium-61.0.3163.79.orig/chrome/browser/devtools/devtools_file_system_indexer.cc5
-+++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc6
-@@ -34,7 +34,6 @@ using base::TimeDelta;7
- using base::TimeTicks;8
- using content::BrowserThread;9
- using std::map;10
--using std::set;11
- using std::string;12
- using std::vector;13
- 14
-@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str15
- if (trigram != kUndefinedTrigram)16
- trigrams.push_back(trigram);17
- }18
-- set<FileId> file_ids;19
-+ std::set<FileId> file_ids;20
- bool first = true;21
- vector<Trigram>::const_iterator it = trigrams.begin();22
- for (; it != trigrams.end(); ++it) {23
-@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str24
- first = false;25
- continue;26
- }27
-- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(28
-+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(29
- file_ids, index_[trigram]);30
- file_ids.swap(intersection);31
- }32
-Index: chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h33
-===================================================================34
---- chromium-61.0.3163.79.orig/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h35
-+++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h36
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {37
- allocation_length_(0),38
- data_(data),39
- data_length_(0),40
-- kind_(AllocationKind::kNormal),41
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),42
- deleter_(deleter) {}43
- DataHandle(void* allocation_base,44
- size_t allocation_length,45
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {46
- reinterpret_cast<uintptr_t>(allocation_base_) +47
- allocation_length_);48
- switch (kind_) {49
-- case AllocationKind::kNormal:50
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:51
- DCHECK(deleter_);52
- deleter_(data_);53
- return;54
-- case AllocationKind::kReservation:55
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:56
- ReleaseReservedMemory(allocation_base_, allocation_length_);57
- return;58
- }59
-Index: chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc60
-===================================================================61
---- chromium-61.0.3163.79.orig/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc62
-+++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc63
-@@ -10,7 +10,7 @@64
- 65
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"66
- 67
--#include <math.h>68
-+#include <cmath>69
- #include <numeric>70
- #include <vector>71
- 72
-Index: chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc73
-===================================================================74
---- chromium-61.0.3163.79.orig/cc/paint/paint_op_buffer.cc75
-+++ chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc76
-@@ -207,7 +207,7 @@ TYPES(M);77
- #undef TYPES78
- 79
- SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};80
--const size_t PaintOp::kMaxSkip;81
-+constexpr size_t PaintOp::kMaxSkip;82
- 83
- std::string PaintOpTypeToString(PaintOpType type) {84
- switch (type) {85
chromium-memcpy.patch
Added
37
1
2
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 20013
+From: Tomas Popela <tomas.popela@gmail.com>4
+Date: Thu, 7 Dec 2017 22:33:34 +00005
+Subject: [PATCH] memcpy used without including string.h6
+7
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using8
+memcpy without including string.h.9
+10
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel11
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a812
+Reviewed-on: https://chromium-review.googlesource.com/81373713
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>14
+Reviewed-by: vmpstr <vmpstr@chromium.org>15
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>16
+Cr-Commit-Position: refs/heads/master@{#522579}17
+---18
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++19
+ 1 file changed, 2 insertions(+)20
+21
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc22
+index 9e4660c685ee..95ad50b1a338 10064423
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc24
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc25
+@@ -4,6 +4,8 @@26
+ 27
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"28
+ 29
++#include <string.h>30
++31
+ namespace cc {32
+ 33
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(34
+-- 35
+2.15.136
+37
fix-gn-bootstrap.diff
Deleted
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
chromium-61.0.3163.100.tar.xz -> chromium-64.0.3282.134.tar.xz
Changed