Request 4016 (accepted)

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.

Overview

Request 4016 (accepted)

No description set

Created by awissu about 7 years ago
In state accepted
Package maintainer: awissu

Submit chromium-ffmpeg-extra

Submit package home:awis...es:Extra / chromium-...eg-extra to package Extra / chromium-ffmpeg-extra

chromium-ffmpeg-extra.changes Changed

chromium-ffmpeg-extra.spec Changed

@@ -16,19 +16,20 @@
 #
 
 
-%define srcname chromium
 Name:           chromium-ffmpeg-extra
-Version:        59.0.3071.104
+Version:        61.0.3163.100
 Release:        0
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
 License:        BSD-3-Clause and LGPL-2.1+
 Group:          Productivity/Networking/Web/Browsers
 Url:            http://code.google.com/p/chromium/
-Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/%{srcname}-%{version}.tar.xz
+Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
 Source1:        BUILD.gn
 Patch0:         chromium-last-commit-position-r0.patch
-Patch1:			chromium-gcc7.patch
-Patch2:			chromium-dma-buf.patch
+Patch1:         gcc60-fixes.diff 
+Patch2:         chromium-dma-buf.patch
+Patch3:         chromium-gcc5.patch
+Patch4:         fix-gn-bootstrap.diff
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
@@ -50,10 +51,12 @@
 (audio and video tags).
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n chromium-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 mkdir toolchain
 cp %{SOURCE1} toolchain/BUILD.gn
@@ -65,15 +68,16 @@
 %build
 export CC=gcc
 export CXX=g++
-CFLAGS="%{optflags}"
-export CFLAGS="${CFLAGS/-g /}"
-export CXXFLAGS="${CFLAGS}"
+export CFLAGS="$(echo "%{optflags} -std=gnu99" | sed 's/\ \-\<g\>//')"
+export CXXFLAGS="$(echo ${CFLAGS} | sed 's/\ \-std=gnu99//')"
 
 myconf_gn=""
 myconf_gn+=" custom_toolchain=\"./toolchain:default\""
 myconf_gn+=" ffmpeg_branding=\"Chrome\""
 myconf_gn+=" proprietary_codecs=true"
+myconf_gn+=" enable_swiftshader=false"
 myconf_gn+=" enable_hevc_demuxing=true"
+myconf_gn+=" use_custom_libcxx=false"
 myconf_gn+=" use_gconf=false"
 myconf_gn+=" use_gio=false"
 myconf_gn+=" use_gnome_keyring=false"
@@ -89,10 +93,10 @@
 myconf_gn+=" is_debug=false"
 myconf_gn+=" symbol_level=0"
 
-
 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${myconf_gn}"
 out/Release/gn gen --args="${myconf_gn}" out/Release
-ninja -C out/Release media/ffmpeg
+out/Release/gn args --list out/Release/
+ninja -j 1 -C out/Release media/ffmpeg
 
 %install
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so

chromium-dma-buf.patch Changed

@@ -1,21 +1,22 @@
---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2017-03-29 15:08:58.079790070 +0000
-+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc	2017-03-29 15:09:10.068039324 +0000
-@@ -17,7 +17,6 @@
+Index: chromium-60.0.3088.3/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+===================================================================
+--- chromium-60.0.3088.3.orig/ui/gfx/linux/client_native_pixmap_dmabuf.cc
++++ chromium-60.0.3088.3/ui/gfx/linux/client_native_pixmap_dmabuf.cc
+@@ -19,9 +19,6 @@
  #include "base/strings/stringprintf.h"
  #include "base/trace_event/trace_event.h"
  
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-#include <linux/dma-buf.h>
+-#else
  #include <linux/types.h>
  
- struct local_dma_buf_sync {
-@@ -35,10 +34,6 @@
- #define LOCAL_DMA_BUF_IOCTL_SYNC \
-   _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync)
+ struct dma_buf_sync {
+@@ -36,7 +33,6 @@ struct dma_buf_sync {
  
--#else
--#include <linux/dma-buf.h>
+ #define DMA_BUF_BASE 'b'
+ #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
 -#endif
--
+ 
  namespace gfx {
  
- namespace {

chromium-gcc7.patch -> chromium-gcc5.patch Changed

@@ -1,25 +1,83 @@
-Index: chromium-59.0.3071.83/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
+Index: chromium-61.0.3163.79/chrome/browser/devtools/devtools_file_system_indexer.cc
 ===================================================================
---- chromium-59.0.3071.83.orig/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
-+++ chromium-59.0.3071.83/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h
-@@ -5,6 +5,7 @@
- #include "platform/PlatformExport.h"
- #include "platform/wtf/ThreadSpecific.h"
+--- 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;
  
-+#include <functional>
- #include <memory>
+@@ -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 @@
  
- namespace gpu {
-Index: chromium-59.0.3071.83/v8/src/objects-body-descriptors.h
+ #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-59.0.3071.83.orig/v8/src/objects-body-descriptors.h
-+++ chromium-59.0.3071.83/v8/src/objects-body-descriptors.h
-@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
+--- 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
  
-   template <typename StaticVisitor>
-   static inline void IterateBody(HeapObject* obj, int object_size) {
--    IterateBody(obj);
-+    IterateBody<StaticVisitor>(obj);
-   }
- };
+ 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-last-commit-position-r0.patch Changed

@@ -1,5 +1,7 @@
---- a/tools/gn/gn_main.cc	2015-11-12 11:49:56.260549036 +0000
-+++ b/tools/gn/gn_main.cc	2015-11-12 11:50:14.780931485 +0000
+Index: chromium-60.0.3107.4/tools/gn/gn_main.cc
+===================================================================
+--- chromium-60.0.3107.4.orig/tools/gn/gn_main.cc
++++ chromium-60.0.3107.4/tools/gn/gn_main.cc
 @@ -12,13 +12,7 @@
  #include "tools/gn/standard_out.h"
  #include "tools/gn/switches.h"
@@ -14,14 +16,15 @@
  
  namespace {
  
---- a/tools/gn/BUILD.gn	2015-11-12 11:50:43.513524769 +0000
-+++ b/tools/gn/BUILD.gn	2015-11-12 11:50:57.697817632 +0000
-@@ -263,7 +263,6 @@
+Index: chromium-60.0.3107.4/tools/gn/BUILD.gn
+===================================================================
+--- chromium-60.0.3107.4.orig/tools/gn/BUILD.gn
++++ chromium-60.0.3107.4/tools/gn/BUILD.gn
+@@ -268,7 +268,6 @@ executable("gn") {
  
    deps = [
      ":gn_lib",
 -    ":last_commit_position",
      "//base",
-     "//build/config/sanitizers:deps",
+     "//build/config:exe_and_shlib_deps",
      "//build/win:default_exe_manifest",
-

fix-gn-bootstrap.diff Added

@@ -0,0 +1,27 @@
+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',

gcc60-fixes.diff Added

@@ -0,0 +1,25 @@
+--- a/build/config/compiler/BUILD.gn    2016-08-14 09:59:05.527738286 +0200
++++ b/build/config/compiler/BUILD.gn    2016-08-14 09:59:56.340463935 +0200
+@@ -389,6 +389,7 @@
+     # TODO(thakis): Eventually switch this to c++11 instead,
+     # http://crbug.com/427584
+     cflags_cc += [ "-std=gnu++11" ]
++    cflags_cc += [ "-fno-delete-null-pointer-checks" ]
+   } else if (!is_win && !is_nacl) {
+     # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11
+     # or c++11; we technically don't need this toolchain any more, but there
+
+diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
+index 99f230ce7e9a..de2415d402f5 100644
+--- a/base/numerics/safe_math_shared_impl.h
++++ b/base/numerics/safe_math_shared_impl.h
+@@ -21,8 +21,7 @@
+ #if !defined(__native_client__) &&                         \
+     ((defined(__clang__) &&                                \
+       ((__clang_major__ > 3) ||                            \
+-       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+-     (defined(__GNUC__) && __GNUC__ >= 5))
++       (__clang_major__ == 3 && __clang_minor__ >= 4))))
+ #include "base/numerics/safe_math_clang_gcc_impl.h"
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
+ #else

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

Build Results
RPM Lint

Refresh

Comments for request 4016 0

Request History

awissu created request about 7 years ago

awissu accepted request about 7 years ago