Packman Build Service PMBS

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

chromium-ffmpeg-extra.spec Changed

@@ -17,7 +17,7 @@
 
 
 Name:           chromium-ffmpeg-extra
-Version:        61.0.3163.100
+Version:        64.0.3282.134
 Release:        0
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
 License:        BSD-3-Clause and LGPL-2.1+
@@ -26,14 +26,14 @@
 Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
 Source1:        BUILD.gn
 Patch0:         chromium-last-commit-position-r0.patch
-Patch1:         gcc60-fixes.diff 
-Patch2:         chromium-dma-buf.patch
-Patch3:         chromium-gcc5.patch
-Patch4:         fix-gn-bootstrap.diff
+Patch1:         chromium-dma-buf.patch
+Patch2:         chromium-angle.patch
+Patch3:         chromium-memcpy.patch
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
-BuildRequires:  pkgconfig
+BuildRequires:  python-xml
+BuildRequires:  pkgconfig(dri)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libexif)
@@ -56,7 +56,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 mkdir toolchain
 cp %{SOURCE1} toolchain/BUILD.gn
@@ -66,10 +65,23 @@
 fi
 
 %build
+ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g / /g' -e 's/ -g / /g' -e 's/ -g$//g'`"
+export CFLAGS="${ARCH_FLAGS} -std=gnu11 -fpermissive"
+export CXXFLAGS="${ARCH_FLAGS} -fpermissive"
+%if 0%{?suse_version} < 1330
+export CC=gcc-7
+export CXX=g++-7
+# some still call gcc/g++
+mkdir -p "$HOME/bin/"
+ln -sfn /usr/bin/$CC $HOME/bin/gcc
+ln -sfn /usr/bin/$CXX $HOME/bin/g++
+export PATH="$HOME/bin/:$PATH"
+%else
 export CC=gcc
 export CXX=g++
-export CFLAGS="$(echo "%{optflags} -std=gnu99" | sed 's/\ \-\<g\>//')"
-export CXXFLAGS="$(echo ${CFLAGS} | sed 's/\ \-std=gnu99//')"
+%endif
+
+ninjaproc="%{?jobs:%{jobs}}"
 
 myconf_gn=""
 myconf_gn+=" custom_toolchain=\"./toolchain:default\""
@@ -92,11 +104,12 @@
 myconf_gn+=" is_component_build=true"
 myconf_gn+=" is_debug=false"
 myconf_gn+=" symbol_level=0"
+myconf_gn+=" enable_vulkan=false" # fails to compile now
 
 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
 out/Release/gn gen --args="${myconf_gn}" out/Release
 out/Release/gn args --list out/Release/
-ninja -j 1 -C out/Release media/ffmpeg
+ninja -j $ninjaproc -C out/Release media/ffmpeg
 
 %install
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so

chromium-angle.patch Added

@@ -0,0 +1,89 @@
+From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
+From: Kai Ninomiya <kainino@chromium.org>
+Date: Wed, 06 Dec 2017 14:06:53 -0800
+Subject: [PATCH] Mark StaticType related functions as constexpr
+
+Fixes compilation on some versions of GCC and probably Clang.
+
+Follow-up to http://crrev.com/c/786317
+
+Bug: angleproject:1432
+Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
+Reviewed-on: https://chromium-review.googlesource.com/812220
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Kai Ninomiya <kainino@chromium.org>
+---
+
+diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
+index e26e5ff..30b391a 100644
+--- a/third_party/angle/src/compiler/translator/StaticType.h
++++ b/third_party/angle/src/compiler/translator/StaticType.h
+@@ -160,7 +160,7 @@
+           TPrecision precision,
+           TQualifier qualifier,
+           unsigned char secondarySize>
+-const TType *GetForVecMatHelper(unsigned char primarySize)
++constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
+ {
+     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+                       basicType == EbtBool,
+@@ -186,7 +186,7 @@
+ template <TBasicType basicType,
+           TPrecision precision = EbpUndefined,
+           TQualifier qualifier = EvqGlobal>
+-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
++constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
+ {
+     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+                       basicType == EbtBool,
+@@ -208,7 +208,7 @@
+ }
+ 
+ template <TBasicType basicType, TPrecision precision = EbpUndefined>
+-const TType *GetForVec(TQualifier qualifier, unsigned char size)
++constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
+ {
+     switch (qualifier)
+     {
+diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+index adf1e4e..90d4c15 100644
+--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
++++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+@@ -236,7 +236,7 @@
+         pop();
+ }
+ 
+-bool IsGenType(const TType *type)
++constexpr bool IsGenType(const TType *type)
+ {
+     if (type)
+     {
+@@ -248,7 +248,7 @@
+     return false;
+ }
+ 
+-bool IsVecType(const TType *type)
++constexpr bool IsVecType(const TType *type)
+ {
+     if (type)
+     {
+diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
+index 04f46f1..a54d447 100644
+--- a/third_party/angle/src/compiler/translator/Types.h
++++ b/third_party/angle/src/compiler/translator/Types.h
+@@ -142,13 +142,13 @@
+     {
+     }
+ 
+-    TBasicType getBasicType() const { return type; }
++    constexpr TBasicType getBasicType() const { return type; }
+     void setBasicType(TBasicType t);
+ 
+     TPrecision getPrecision() const { return precision; }
+     void setPrecision(TPrecision p) { precision = p; }
+ 
+-    TQualifier getQualifier() const { return qualifier; }
++    constexpr TQualifier getQualifier() const { return qualifier; }
+     void setQualifier(TQualifier q) { qualifier = q; }
+ 
+     bool isInvariant() const { return invariant; }

chromium-gcc5.patch Deleted

@@ -1,83 +0,0 @@
-Index: chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc
-===================================================================
---- chromium-61.0.3163.79.orig/chrome/browser/devtools/devtools_file_system_indexer.cc
-+++ chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc
-@@ -34,7 +34,6 @@ using base::TimeDelta;
- using base::TimeTicks;
- using content::BrowserThread;
- using std::map;
--using std::set;
- using std::string;
- using std::vector;
- 
-@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const str
-     if (trigram != kUndefinedTrigram)
-       trigrams.push_back(trigram);
-   }
--  set<FileId> file_ids;
-+  std::set<FileId> file_ids;
-   bool first = true;
-   vector<Trigram>::const_iterator it = trigrams.begin();
-   for (; it != trigrams.end(); ++it) {
-@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const str
-       first = false;
-       continue;
-     }
--    set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
-+    std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
-         file_ids, index_[trigram]);
-     file_ids.swap(intersection);
-   }
-Index: chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-===================================================================
---- chromium-61.0.3163.79.orig/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
-Index: chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
-===================================================================
---- chromium-61.0.3163.79.orig/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
-+++ chromium-61.0.3163.79/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
-@@ -10,7 +10,7 @@
- 
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
- 
-Index: chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc
-===================================================================
---- chromium-61.0.3163.79.orig/cc/paint/paint_op_buffer.cc
-+++ chromium-61.0.3163.79/cc/paint/paint_op_buffer.cc
-@@ -207,7 +207,7 @@ TYPES(M);
- #undef TYPES
- 
- SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
--const size_t PaintOp::kMaxSkip;
-+constexpr size_t PaintOp::kMaxSkip;
- 
- std::string PaintOpTypeToString(PaintOpType type) {
-   switch (type) {

chromium-memcpy.patch Added

@@ -0,0 +1,35 @@
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Thu, 7 Dec 2017 22:33:34 +0000
+Subject: [PATCH] memcpy used without including string.h
+
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
+memcpy without including string.h.
+
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
+Reviewed-on: https://chromium-review.googlesource.com/813737
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: vmpstr <vmpstr@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#522579}
+---
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
+index 9e4660c685ee..95ad50b1a338 100644
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+ 
++#include <string.h>
++
+ namespace cc {
+ 
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+-- 
+2.15.1
+

fix-gn-bootstrap.diff Deleted

@@ -1,27 +0,0 @@
-commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
-Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>
-Date:   Wed Jul 26 21:51:54 2017 +0000
-
-    wip
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 1390560f8e37..ff2ae57c46b0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/metrics/histogram_base.cc',
-       'base/metrics/histogram_functions.cc',
-       'base/metrics/histogram_samples.cc',
-+      'base/metrics/histogram_snapshot_manager.cc',
-       'base/metrics/metrics_hashes.cc',
-       'base/metrics/persistent_histogram_allocator.cc',
-       'base/metrics/persistent_memory_allocator.cc',
-@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/trace_event/heap_profiler_allocation_context_tracker.cc',
-       'base/trace_event/heap_profiler_allocation_register.cc',
-       'base/trace_event/heap_profiler_event_filter.cc',
--      'base/trace_event/heap_profiler_event_writer.cc',
-+      'base/trace_event/heap_profiler_heap_dump_writer.cc',
-       'base/trace_event/heap_profiler_serialization_state.cc',
-       'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
-       'base/trace_event/heap_profiler_type_name_deduplicator.cc',

chromium-61.0.3163.100.tar.xz -> chromium-64.0.3282.134.tar.xz Changed