[arch-commits] Commit in opera-ffmpeg-codecs/repos/community-x86_64 (11 files)
Ike Devolder
idevolder at archlinux.org
Sun Apr 1 14:27:52 UTC 2018
Date: Sunday, April 1, 2018 @ 14:27:51
Author: idevolder
Revision: 313740
archrelease: copy trunk to community-x86_64
Added:
opera-ffmpeg-codecs/repos/community-x86_64/PKGBUILD
(from rev 313739, opera-ffmpeg-codecs/trunk/PKGBUILD)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-FORTIFY_SOURCE-r2.patch
(from rev 313739, opera-ffmpeg-codecs/trunk/chromium-FORTIFY_SOURCE-r2.patch)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-last-commit-position-r1.patch
(from rev 313739, opera-ffmpeg-codecs/trunk/chromium-last-commit-position-r1.patch)
Deleted:
opera-ffmpeg-codecs/repos/community-x86_64/PKGBUILD
opera-ffmpeg-codecs/repos/community-x86_64/chromium-FORTIFY_SOURCE-r2.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-angle-r0.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-gcc5-r2.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-gcc5-r4.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-gn-bootstrap-r17.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-last-commit-position-r1.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-memcpy-r0.patch
----------------------------------------+
PKGBUILD | 137 +++++++++++++++----------------
chromium-FORTIFY_SOURCE-r2.patch | 60 ++++++-------
chromium-angle-r0.patch | 89 --------------------
chromium-gcc5-r2.patch | 36 --------
chromium-gcc5-r4.patch | 98 ----------------------
chromium-gn-bootstrap-r17.patch | 68 ---------------
chromium-last-commit-position-r1.patch | 52 +++++------
chromium-memcpy-r0.patch | 35 -------
8 files changed, 123 insertions(+), 452 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-01 14:27:43 UTC (rev 313739)
+++ PKGBUILD 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,70 +0,0 @@
-# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgname=opera-ffmpeg-codecs
-pkgver=64.0.3282.186
-pkgrel=1
-pkgdesc="additional support for proprietary codecs for opera"
-arch=('x86_64')
-url="https://ffmpeg.org/"
-license=('LGPL2.1')
-depends=('glibc')
-makedepends=(
- 'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
- 'xdg-utils'
-)
-options=('!strip')
-source=(
- "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
- 'chromium-last-commit-position-r1.patch'
- 'chromium-FORTIFY_SOURCE-r2.patch'
- 'chromium-memcpy-r0.patch'
- 'chromium-angle-r0.patch'
-)
-sha512sums=('a8a435ee8506cfefaaf2df7447010df5db69fa6907844872d00643f55723a9bd7771649658f5151c857ac037adcbc8bdf2a5375dd105f78d068277ef021af7d8'
- '8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
- '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c'
- '1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a'
- 'c5fa18dbaa82a0fc089c6c88857089f19c83f6d3ff7c7034e6ca3cde20f1615cd84ac13fde14b55dcfa7d3c85eb0f023fbe337bb96d7d8199b5729b269a5ccc7')
-
-prepare() {
- cd "$srcdir/chromium-$pkgver"
-
- # Use Python 2
- find . -name '*.py' -exec sed -r 's|/usr/bin/python$|&2|g' -i {} +
- find . -name '*.py' -exec sed -r 's|/usr/bin/env python$|&2|g' -i {} +
- # There are still a lot of relative calls which need a workaround
- [[ -d "$srcdir/python2-path" ]] && rm -rf "$srcdir/python2-path"
- mkdir "$srcdir/python2-path"
- ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-
- # chromium 46 gives an error about a missing file
- # workaround create empty
- touch chrome/test/data/webui/i18n_process_css_test.html
-
- patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
- patch -p1 -i "$srcdir/chromium-FORTIFY_SOURCE-r2.patch"
- patch -p1 -i "$srcdir/chromium-memcpy-r0.patch"
- patch -p1 -i "$srcdir/chromium-angle-r0.patch"
-}
-
-build() {
- cd "$srcdir/chromium-$pkgver"
-
- export PATH="$srcdir/python2-path:$PATH"
-
- local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_pulseaudio=false link_pulseaudio=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false"
-
- python2 tools/gn/bootstrap/bootstrap.py -v -s
- out/Release/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
-
- ninja -C out/Release -v media/ffmpeg
-}
-
-package() {
- cd "$srcdir/chromium-$pkgver"
-
- install -Dm644 out/Release/libffmpeg.so \
- "$pkgdir/usr/lib/opera/lib_extra/libffmpeg.so"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: opera-ffmpeg-codecs/repos/community-x86_64/PKGBUILD (from rev 313739, opera-ffmpeg-codecs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-01 14:27:51 UTC (rev 313740)
@@ -0,0 +1,67 @@
+# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
+
+pkgname=opera-ffmpeg-codecs
+pkgver=65.0.3325.181
+pkgrel=1
+pkgdesc="additional support for proprietary codecs for opera"
+arch=('x86_64')
+url="https://ffmpeg.org/"
+license=('LGPL2.1')
+depends=('glibc')
+makedepends=(
+ 'gtk3' 'libexif' 'libxss' 'ninja' 'nss' 'pciutils' 'python2'
+ 'xdg-utils'
+)
+options=('!strip')
+source=(
+ "https://repo.herecura.eu/herecura/x86_64/ncurses5-compat-libs-6.1-1-x86_64.pkg.tar.xz"
+ "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz"
+ 'chromium-last-commit-position-r1.patch'
+ 'chromium-FORTIFY_SOURCE-r2.patch'
+)
+sha512sums=('c2bc35f4a7a571c51b5ea0b3307094209ba663d1ef519ca61dadd8bc570128793c18a1d317a54c98ac58737f6c87a61aca262b7c01797f4df9a838cc40191b4f'
+ '52472127b46da48699f401ab9c64f80975398bc3e97d032c517736babc327bfa0a0ce6415831ff3f585cd309e2e05e48d5252b15d0873fee118adf70f54d1a05'
+ '8f63366ca998e3ee06a79c6df5b4454707bd9865913ecde2f79fcb49fdd86d291f678b9f21807e4eb61d15497cdbe4a4bdc06637882e708f34f6804453bdfd41'
+ '2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c')
+
+prepare() {
+ cd "$srcdir/chromium-$pkgver"
+
+ # Use Python 2
+ find -name '*.py' | xargs sed -e 's|env python|&2|g' -e 's|bin/python|&2|g' -i
+
+ # force some 'older' binaries in the path
+ [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
+ mkdir "$srcdir/path"
+ ln -s /usr/bin/python2 "$srcdir/path/python"
+
+ patch -p1 -i "$srcdir/chromium-last-commit-position-r1.patch"
+ patch -p1 -i "$srcdir/chromium-FORTIFY_SOURCE-r2.patch"
+}
+
+build() {
+ cd "$srcdir/chromium-$pkgver"
+
+ python2 tools/clang/scripts/update.py --without-android
+
+ cp -a "$srcdir/usr/lib/libncursesw.so.5.9" 'third_party/llvm-build/Release+Asserts/lib/'
+ ( cd 'third_party/llvm-build/Release+Asserts/lib/'; ln -s libncursesw.so.5.9 libtinfo.so.5 )
+
+ export PATH="$srcdir/path:$PATH"
+
+ local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=true clang_use_chrome_plugins=true is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
+
+ python2 tools/gn/bootstrap/bootstrap.py -v -s
+ out/Release/gn gen out/Release -v --args="$args" --script-executable=/usr/bin/python2
+
+ ninja -C out/Release -v media/ffmpeg
+}
+
+package() {
+ cd "$srcdir/chromium-$pkgver"
+
+ install -Dm644 out/Release/libffmpeg.so \
+ "$pkgdir/usr/lib/opera/lib_extra/libffmpeg.so"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: chromium-FORTIFY_SOURCE-r2.patch
===================================================================
--- chromium-FORTIFY_SOURCE-r2.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-FORTIFY_SOURCE-r2.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,30 +0,0 @@
-Drop _FORTIFY_SOURCE=2 from defines
-
-Gentoo toolchains enable this by default. Removing this prevents spammy
-warnings about the macro being redefined.
-
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1213,22 +1213,6 @@
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # Non-chromium code is not guaranteed to compile cleanly with
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
-- # disabled, so only do that for Release build.
-- defines += [ "_FORTIFY_SOURCE=2" ]
-- }
--
- if (is_mac || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
Copied: opera-ffmpeg-codecs/repos/community-x86_64/chromium-FORTIFY_SOURCE-r2.patch (from rev 313739, opera-ffmpeg-codecs/trunk/chromium-FORTIFY_SOURCE-r2.patch)
===================================================================
--- chromium-FORTIFY_SOURCE-r2.patch (rev 0)
+++ chromium-FORTIFY_SOURCE-r2.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -0,0 +1,30 @@
+Drop _FORTIFY_SOURCE=2 from defines
+
+Gentoo toolchains enable this by default. Removing this prevents spammy
+warnings about the macro being redefined.
+
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1213,22 +1213,6 @@
+ "__STDC_FORMAT_MACROS",
+ ]
+
+- if (!is_debug && !using_sanitizer &&
+- (!is_linux || !is_clang || is_official_build) &&
+- current_cpu != "s390x" && current_cpu != "s390" &&
+- current_cpu != "ppc64" && current_cpu != "ppc64" &&
+- current_cpu != "mips" && current_cpu != "mips64") {
+- # _FORTIFY_SOURCE isn't really supported by Clang now, see
+- # http://llvm.org/bugs/show_bug.cgi?id=16821.
+- # It seems to work fine with Ubuntu 12 headers though, so use it in
+- # official builds.
+- #
+- # Non-chromium code is not guaranteed to compile cleanly with
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+- # disabled, so only do that for Release build.
+- defines += [ "_FORTIFY_SOURCE=2" ]
+- }
+-
+ if (is_mac || is_ios) {
+ cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+ cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
Deleted: chromium-angle-r0.patch
===================================================================
--- chromium-angle-r0.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-angle-r0.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,89 +0,0 @@
-From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
-From: Kai Ninomiya <kainino at 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 at chromium.org>
-Commit-Queue: Kai Ninomiya <kainino at 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; }
Deleted: chromium-gcc5-r2.patch
===================================================================
--- chromium-gcc5-r2.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-gcc5-r2.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,36 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/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;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
Deleted: chromium-gcc5-r4.patch
===================================================================
--- chromium-gcc5-r4.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-gcc5-r4.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/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;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
- static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
- static base::span<const float> matrix(const cc::FilterOperation& operation) {
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
- return base::span<const float>();
-- return operation.matrix();
-+ return base::make_span(operation.matrix());
- }
-
- static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
- static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
- const viz::TextureDrawQuad* quad =
- viz::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const viz::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
Deleted: chromium-gn-bootstrap-r17.patch
===================================================================
--- chromium-gn-bootstrap-r17.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-gn-bootstrap-r17.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,68 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
- {
-+ 'ENABLE_LOCATION_SOURCE': 'false',
- 'ENABLE_PROFILING': 'false',
- 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
- })
-@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
- root_gen_dir, options)
-- cmd = ['ninja', '-C', tempdir]
-+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
-
-@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/bucket_ranges.cc',
- 'base/metrics/field_trial.cc',
- 'base/metrics/field_trial_param_associator.cc',
-+ 'base/metrics/field_trial_params.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
-@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_lock_impl.cc',
- 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
- 'base/task_scheduler/scheduler_worker.cc',
-+ 'base/task_scheduler/scheduler_worker_pool.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/scoped_blocking_call.cc',
- 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
-@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
-- 'base/value_iterators.cc',
- 'base/vlog.cc',
- ])
-
-@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- static_libraries['base']['sources'].extend([
- 'base/memory/shared_memory_handle_posix.cc',
- 'base/memory/shared_memory_posix.cc',
-- 'base/memory/shared_memory_tracker.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
- 'base/process/memory_linux.cc',
-@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
- check_call(cmd)
-
-- cmd = ['ninja', '-C', build_dir]
-+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
- cmd.append('gn')
Deleted: chromium-last-commit-position-r1.patch
===================================================================
--- chromium-last-commit-position-r1.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-last-commit-position-r1.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,26 +0,0 @@
---- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
-+++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
-
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
-
- namespace {
-
---- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
-+++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
-
- deps = [
- ":gn_lib",
-- ":last_commit_position",
- "//base",
- "//build/config/sanitizers:deps",
- ]
Copied: opera-ffmpeg-codecs/repos/community-x86_64/chromium-last-commit-position-r1.patch (from rev 313739, opera-ffmpeg-codecs/trunk/chromium-last-commit-position-r1.patch)
===================================================================
--- chromium-last-commit-position-r1.patch (rev 0)
+++ chromium-last-commit-position-r1.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -0,0 +1,26 @@
+--- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
++++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
+@@ -11,13 +11,7 @@
+ #include "tools/gn/standard_out.h"
+ #include "tools/gn/switches.h"
+
+-// Only the GN-generated build makes this header for now.
+-// TODO(brettw) consider adding this if we need it in GYP.
+-#if defined(GN_BUILD)
+-#include "tools/gn/last_commit_position.h"
+-#else
+ #define LAST_COMMIT_POSITION "UNKNOWN"
+-#endif
+
+ namespace {
+
+--- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
++++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
+@@ -227,7 +227,6 @@
+
+ deps = [
+ ":gn_lib",
+- ":last_commit_position",
+ "//base",
+ "//build/config/sanitizers:deps",
+ ]
Deleted: chromium-memcpy-r0.patch
===================================================================
--- chromium-memcpy-r0.patch 2018-04-01 14:27:43 UTC (rev 313739)
+++ chromium-memcpy-r0.patch 2018-04-01 14:27:51 UTC (rev 313740)
@@ -1,35 +0,0 @@
-From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
-From: Tomas Popela <tomas.popela at 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 at chromium.org>
-Reviewed-by: vmpstr <vmpstr at chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson at 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
-
More information about the arch-commits
mailing list