Date: Monday, September 2, 2019 @ 18:39:16
Author: idevolder
Revision: 507069
archrelease: copy trunk to community-x86_64
Added:
opera-ffmpeg-codecs/repos/community-x86_64/PKGBUILD
(from rev 507068, opera-ffmpeg-codecs/trunk/PKGBUILD)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-0.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-0.patch)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-2.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-2.patch)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-3.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-3.patch)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-FORTIFY_SOURCE-r2.patch
(from rev 507068,
opera-ffmpeg-codecs/trunk/chromium-FORTIFY_SOURCE-r2.patch)
opera-ffmpeg-codecs/repos/community-x86_64/chromium-last-commit-position-r1.patch
(from rev 507068,
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-73-gcc-0.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-2.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-3.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-FORTIFY_SOURCE-r2.patch
opera-ffmpeg-codecs/repos/community-x86_64/chromium-last-commit-position-r1.patch
----------------------------------------+
PKGBUILD | 132 +++++++++---------
chromium-73-gcc-0.patch | 216 +++++++++++++++----------------
chromium-73-gcc-2.patch | 102 +++++++-------
chromium-73-gcc-3.patch | 138 +++++++++----------
chromium-FORTIFY_SOURCE-r2.patch | 60 ++++----
chromium-last-commit-position-r1.patch | 52 +++----
6 files changed, 350 insertions(+), 350 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-02 18:39:05 UTC (rev 507068)
+++ PKGBUILD 2019-09-02 18:39:16 UTC (rev 507069)
@@ -1,66 +0,0 @@
-# vim:set ft=sh:
-# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgname=opera-ffmpeg-codecs
-pkgver=76.0.3809.100
-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' 'gn'
-)
-options=('!strip')
-source=(
-
"https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz";
-)
-sha512sums=('63cfb45dc6bb0b1662ba4ffebc6313c24d65dae10a61752575e34a24d8d3d6f80e0422a984b560b259c299d6e493dfa177907201a1c1f785a7e294c9a03bd8a1')
-
-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"
-
-}
-
-build() {
- cd "$srcdir/chromium-$pkgver"
-
- python2 tools/clang/scripts/update.py
-
- export
PATH="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin:$srcdir/path:$PATH"
-
- export CC="clang"
- export CXX="clang++"
-
- local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true
enable_hevc_demuxing=true enable_ac3_eac3_audio_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"
-
- #(
- #cd third_party/ffmpeg
- #chromium/scripts/build_ffmpeg.py linux x64 --branding ChromeOS
- #chromium/scripts/copy_config.sh
- #chromium/scripts/generate_gn.py
- #)
-
- 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 507068,
opera-ffmpeg-codecs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-09-02 18:39:16 UTC (rev 507069)
@@ -0,0 +1,66 @@
+# vim:set ft=sh:
+# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
+
+pkgname=opera-ffmpeg-codecs
+pkgver=76.0.3809.132
+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' 'gn'
+)
+options=('!strip')
+source=(
+
"https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz";
+)
+sha512sums=('e267d4a975fdcc33125d8fed1597e2dc8ec37a78ee2f9a4e03a1aaf6b83b594b444280b7f2ee68b41d227e7daf31b9de91ab2f998f9146613ebd50651c0d16e8')
+
+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"
+
+}
+
+build() {
+ cd "$srcdir/chromium-$pkgver"
+
+ python2 tools/clang/scripts/update.py
+
+ export
PATH="${srcdir}/chromium-${pkgver}/third_party/llvm-build/Release+Asserts/bin:$srcdir/path:$PATH"
+
+ export CC="clang"
+ export CXX="clang++"
+
+ local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true
enable_hevc_demuxing=true enable_ac3_eac3_audio_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"
+
+ #(
+ #cd third_party/ffmpeg
+ #chromium/scripts/build_ffmpeg.py linux x64 --branding ChromeOS
+ #chromium/scripts/copy_config.sh
+ #chromium/scripts/generate_gn.py
+ #)
+
+ 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-73-gcc-0.patch
===================================================================
--- chromium-73-gcc-0.patch 2019-09-02 18:39:05 UTC (rev 507068)
+++ chromium-73-gcc-0.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -1,108 +0,0 @@
-From 2c3b57cafbbb38c13a519c9d2fda8b65691d9564 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Date: Thu, 7 Feb 2019 22:55:37 +0000
-Subject: [PATCH] allocator shim: Swap ALIGN_LINKAGE and SHIM_ALWAYS_EXPORT's
- positions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes the GCC build. GCC seems to be stricter with the position of the
-linkage specification, so just swap the terms to prevent an error that looks
-like:
-
-In file included from ../../base/allocator/allocator_shim.cc:333:
-../../base/allocator/allocator_shim_override_cpp_symbols.h:39:30: error:
expected unqualified-id before string constant
- #define ALIGN_LINKAGE extern "C"
- ^~~
-../../base/allocator/allocator_shim_override_cpp_symbols.h:99:20: note: in
expansion of macro ‘ALIGN_LINKAGE’
- SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
- ^~~~~~~~~~~~~
-
-Bug: 819294
-Change-Id: I0aa16ea88cead42e83796a1c86afad8b447ddc50
-Reviewed-on: https://chromium-review.googlesource.com/c/1458256
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Reviewed-by: Thomas Anderson <thomasander...@chromium.org>
-Reviewed-by: Primiano Tucci <primi...@chromium.org>
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Cr-Commit-Position: refs/heads/master@{#630084}
----
- .../allocator_shim_override_cpp_symbols.h | 20 +++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/base/allocator/allocator_shim_override_cpp_symbols.h
b/base/allocator/allocator_shim_override_cpp_symbols.h
-index 1228f5e33d28..01d25b7f6437 100644
---- a/base/allocator/allocator_shim_override_cpp_symbols.h
-+++ b/base/allocator/allocator_shim_override_cpp_symbols.h
-@@ -96,57 +96,57 @@ SHIM_ALWAYS_EXPORT void operator delete[](void* p, size_t)
__THROW {
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW(std::size_t size,
- ALIGN_VAL_T alignment) {
- return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_NOTHROW(
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_NOTHROW(
- std::size_t size,
- ALIGN_VAL_T alignment,
- const std::nothrow_t&) __THROW {
- return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW
{
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW
{
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_SIZED(void* p,
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_SIZED(void* p,
- std::size_t size,
- ALIGN_VAL_T) __THROW {
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
- ALIGN_DEL_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR(std::size_t size,
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR(std::size_t size,
- ALIGN_VAL_T alignment) {
- return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR_NOTHROW(
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR_NOTHROW(
- std::size_t size,
- ALIGN_VAL_T alignment,
- const std::nothrow_t&) __THROW {
- return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR(void* p,
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR(void* p,
- ALIGN_VAL_T) __THROW {
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR_SIZED(void* p,
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR_SIZED(void* p,
- std::size_t size,
- ALIGN_VAL_T)
__THROW {
- ShimCppDelete(p);
- }
-
--SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
-+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
- ALIGN_DEL_ARR_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
- ShimCppDelete(p);
- }
---
-2.20.1
-
Copied: opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-0.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-0.patch)
===================================================================
--- chromium-73-gcc-0.patch (rev 0)
+++ chromium-73-gcc-0.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -0,0 +1,108 @@
+From 2c3b57cafbbb38c13a519c9d2fda8b65691d9564 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Date: Thu, 7 Feb 2019 22:55:37 +0000
+Subject: [PATCH] allocator shim: Swap ALIGN_LINKAGE and SHIM_ALWAYS_EXPORT's
+ positions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the GCC build. GCC seems to be stricter with the position of the
+linkage specification, so just swap the terms to prevent an error that looks
+like:
+
+In file included from ../../base/allocator/allocator_shim.cc:333:
+../../base/allocator/allocator_shim_override_cpp_symbols.h:39:30: error:
expected unqualified-id before string constant
+ #define ALIGN_LINKAGE extern "C"
+ ^~~
+../../base/allocator/allocator_shim_override_cpp_symbols.h:99:20: note: in
expansion of macro ‘ALIGN_LINKAGE’
+ SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
+ ^~~~~~~~~~~~~
+
+Bug: 819294
+Change-Id: I0aa16ea88cead42e83796a1c86afad8b447ddc50
+Reviewed-on: https://chromium-review.googlesource.com/c/1458256
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Reviewed-by: Thomas Anderson <thomasander...@chromium.org>
+Reviewed-by: Primiano Tucci <primi...@chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Cr-Commit-Position: refs/heads/master@{#630084}
+---
+ .../allocator_shim_override_cpp_symbols.h | 20 +++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/base/allocator/allocator_shim_override_cpp_symbols.h
b/base/allocator/allocator_shim_override_cpp_symbols.h
+index 1228f5e33d28..01d25b7f6437 100644
+--- a/base/allocator/allocator_shim_override_cpp_symbols.h
++++ b/base/allocator/allocator_shim_override_cpp_symbols.h
+@@ -96,57 +96,57 @@ SHIM_ALWAYS_EXPORT void operator delete[](void* p, size_t)
__THROW {
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size,
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW(std::size_t size,
+ ALIGN_VAL_T alignment) {
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_NOTHROW(
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_NOTHROW(
+ std::size_t size,
+ ALIGN_VAL_T alignment,
+ const std::nothrow_t&) __THROW {
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW
{
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW
{
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_SIZED(void* p,
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_SIZED(void* p,
+ std::size_t size,
+ ALIGN_VAL_T) __THROW {
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
+ ALIGN_DEL_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR(std::size_t size,
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR(std::size_t size,
+ ALIGN_VAL_T alignment) {
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR_NOTHROW(
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR_NOTHROW(
+ std::size_t size,
+ ALIGN_VAL_T alignment,
+ const std::nothrow_t&) __THROW {
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment));
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR(void* p,
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR(void* p,
+ ALIGN_VAL_T) __THROW {
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR_SIZED(void* p,
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR_SIZED(void* p,
+ std::size_t size,
+ ALIGN_VAL_T)
__THROW {
+ ShimCppDelete(p);
+ }
+
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void
+ ALIGN_DEL_ARR_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW {
+ ShimCppDelete(p);
+ }
+--
+2.20.1
+
Deleted: chromium-73-gcc-2.patch
===================================================================
--- chromium-73-gcc-2.patch 2019-09-02 18:39:05 UTC (rev 507068)
+++ chromium-73-gcc-2.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -1,51 +0,0 @@
-From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Date: Fri, 8 Feb 2019 02:57:28 +0000
-Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes the build with libstdc++:
-
- ../../ui/gfx/color_utils.cc: In function ‘SkColor
color_utils::SetDarkestColorForTesting(SkColor)’:
- ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’
- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
- ^~~~~
- ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’
- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
- ^~~~~
- sqrt
-
-sqrtf() is not formally part of C++14 as far as I can see even though libc++
-has it in <cmath>. Additionally, we're only dealing with floats in all parts
-of the expression above, so using the float sqrt() overload should be
-harmless anyway.
-
-Bug: 819294
-Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d
-Reviewed-on: https://chromium-review.googlesource.com/c/1458193
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Reviewed-by: Peter Kasting <pkast...@chromium.org>
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Cr-Commit-Position: refs/heads/master@{#630140}
----
- ui/gfx/color_utils.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
-index c868cd54bac3..92ba1407d594 100644
---- a/ui/gfx/color_utils.cc
-+++ b/ui/gfx/color_utils.cc
-@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) {
- // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula
below
- // can be verified by plugging it into how GetContrastRatio() operates.
- g_luminance_midpoint =
-- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
-+ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
-
- return previous_darkest_color;
- }
---
-2.20.1
-
Copied: opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-2.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-2.patch)
===================================================================
--- chromium-73-gcc-2.patch (rev 0)
+++ chromium-73-gcc-2.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -0,0 +1,51 @@
+From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Date: Fri, 8 Feb 2019 02:57:28 +0000
+Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the build with libstdc++:
+
+ ../../ui/gfx/color_utils.cc: In function ‘SkColor
color_utils::SetDarkestColorForTesting(SkColor)’:
+ ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’
+ std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
+ ^~~~~
+ ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’
+ std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
+ ^~~~~
+ sqrt
+
+sqrtf() is not formally part of C++14 as far as I can see even though libc++
+has it in <cmath>. Additionally, we're only dealing with floats in all parts
+of the expression above, so using the float sqrt() overload should be
+harmless anyway.
+
+Bug: 819294
+Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d
+Reviewed-on: https://chromium-review.googlesource.com/c/1458193
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Reviewed-by: Peter Kasting <pkast...@chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Cr-Commit-Position: refs/heads/master@{#630140}
+---
+ ui/gfx/color_utils.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
+index c868cd54bac3..92ba1407d594 100644
+--- a/ui/gfx/color_utils.cc
++++ b/ui/gfx/color_utils.cc
+@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) {
+ // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula
below
+ // can be verified by plugging it into how GetContrastRatio() operates.
+ g_luminance_midpoint =
+- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) -
0.05f;
++ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
+
+ return previous_darkest_color;
+ }
+--
+2.20.1
+
Deleted: chromium-73-gcc-3.patch
===================================================================
--- chromium-73-gcc-3.patch 2019-09-02 18:39:05 UTC (rev 507068)
+++ chromium-73-gcc-3.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -1,69 +0,0 @@
-From c33e832cc145c696d2157796c7640e659740dafa Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Date: Fri, 8 Feb 2019 08:44:00 +0000
-Subject: [PATCH] quic_flags_impl: Fix GCC build after #618558
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
-base::NoDestructor<T<U>> and passing an initializer list of Us does not
-work if this is not done explicitly, as GCC incorrectly fails to determine
-which constructor overload to use:
-
- ../../net/third_party/quic/platform/impl/quic_flags_impl.cc: In member
function ‘bool quic::TypedQuicFlagHelper<T>::SetFlag(const string&) const [with
T = bool; std::__cxx11::string = std::__cxx11::basic_string<char>]’:
- ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:156:41: error:
call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is
ambiguous
- {"", "1", "t", "true", "y", "yes"});
- ^
- In file included from
../../net/third_party/quic/platform/impl/quic_flags_impl.h:16,
- from
../../net/third_party/quic/platform/impl/quic_flags_impl.cc:5:
- ../../base/no_destructor.h:62:3: note: candidate:
‘base::NoDestructor<T>::NoDestructor(const base::NoDestructor<T>&) [with T =
std::set<std::__cxx11::basic_string<char> >]’ <deleted>
- NoDestructor(const NoDestructor&) = delete;
- ^~~~~~~~~~~~
- ../../base/no_destructor.h:60:12: note: candidate:
‘base::NoDestructor<T>::NoDestructor(T&&) [with T =
std::set<std::__cxx11::basic_string<char> >]’
- explicit NoDestructor(T&& x) { new (storage_) T(std::move(x)); }
- ^~~~~~~~~~~~
- ../../base/no_destructor.h:59:12: note: candidate:
‘base::NoDestructor<T>::NoDestructor(const T&) [with T =
std::set<std::__cxx11::basic_string<char> >]’
- explicit NoDestructor(const T& x) { new (storage_) T(x); }
- ^~~~~~~~~~~~
-
-Explicitly use an std::initializer_list to make the build work everywhere.
-
-Bug: 819294
-Change-Id: I775be20e3766a88a656b58c94c40869cb1bee2a8
-Reviewed-on: https://chromium-review.googlesource.com/c/1458214
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Reviewed-by: Ryan Hamilton <r...@chromium.org>
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
-Cr-Commit-Position: refs/heads/master@{#630249}
----
- net/third_party/quic/platform/impl/quic_flags_impl.cc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/net/third_party/quic/platform/impl/quic_flags_impl.cc
b/net/third_party/quic/platform/impl/quic_flags_impl.cc
-index 5e6962d1e770..3fa45fc6892d 100644
---- a/net/third_party/quic/platform/impl/quic_flags_impl.cc
-+++ b/net/third_party/quic/platform/impl/quic_flags_impl.cc
-@@ -5,6 +5,7 @@
- #include "net/third_party/quic/platform/impl/quic_flags_impl.h"
-
- #include <algorithm>
-+#include <initializer_list>
- #include <iostream>
- #include <set>
-
-@@ -153,9 +154,9 @@ std::string QuicFlagRegistry::GetHelp() const {
- template <>
- bool TypedQuicFlagHelper<bool>::SetFlag(const std::string& s) const {
- static const base::NoDestructor<std::set<std::string>> kTrueValues(
-- {"", "1", "t", "true", "y", "yes"});
-+ std::initializer_list<std::string>({"", "1", "t", "true", "y", "yes"}));
- static const base::NoDestructor<std::set<std::string>> kFalseValues(
-- {"0", "f", "false", "n", "no"});
-+ std::initializer_list<std::string>({"0", "f", "false", "n", "no"}));
- if (kTrueValues->find(base::ToLowerASCII(s)) != kTrueValues->end()) {
- *flag_ = true;
- return true;
---
-2.20.1
-
Copied: opera-ffmpeg-codecs/repos/community-x86_64/chromium-73-gcc-3.patch
(from rev 507068, opera-ffmpeg-codecs/trunk/chromium-73-gcc-3.patch)
===================================================================
--- chromium-73-gcc-3.patch (rev 0)
+++ chromium-73-gcc-3.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -0,0 +1,69 @@
+From c33e832cc145c696d2157796c7640e659740dafa Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Date: Fri, 8 Feb 2019 08:44:00 +0000
+Subject: [PATCH] quic_flags_impl: Fix GCC build after #618558
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
+base::NoDestructor<T<U>> and passing an initializer list of Us does not
+work if this is not done explicitly, as GCC incorrectly fails to determine
+which constructor overload to use:
+
+ ../../net/third_party/quic/platform/impl/quic_flags_impl.cc: In member
function ‘bool quic::TypedQuicFlagHelper<T>::SetFlag(const string&) const [with
T = bool; std::__cxx11::string = std::__cxx11::basic_string<char>]’:
+ ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:156:41: error:
call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is
ambiguous
+ {"", "1", "t", "true", "y", "yes"});
+ ^
+ In file included from
../../net/third_party/quic/platform/impl/quic_flags_impl.h:16,
+ from
../../net/third_party/quic/platform/impl/quic_flags_impl.cc:5:
+ ../../base/no_destructor.h:62:3: note: candidate:
‘base::NoDestructor<T>::NoDestructor(const base::NoDestructor<T>&) [with T =
std::set<std::__cxx11::basic_string<char> >]’ <deleted>
+ NoDestructor(const NoDestructor&) = delete;
+ ^~~~~~~~~~~~
+ ../../base/no_destructor.h:60:12: note: candidate:
‘base::NoDestructor<T>::NoDestructor(T&&) [with T =
std::set<std::__cxx11::basic_string<char> >]’
+ explicit NoDestructor(T&& x) { new (storage_) T(std::move(x)); }
+ ^~~~~~~~~~~~
+ ../../base/no_destructor.h:59:12: note: candidate:
‘base::NoDestructor<T>::NoDestructor(const T&) [with T =
std::set<std::__cxx11::basic_string<char> >]’
+ explicit NoDestructor(const T& x) { new (storage_) T(x); }
+ ^~~~~~~~~~~~
+
+Explicitly use an std::initializer_list to make the build work everywhere.
+
+Bug: 819294
+Change-Id: I775be20e3766a88a656b58c94c40869cb1bee2a8
+Reviewed-on: https://chromium-review.googlesource.com/c/1458214
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Reviewed-by: Ryan Hamilton <r...@chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+Cr-Commit-Position: refs/heads/master@{#630249}
+---
+ net/third_party/quic/platform/impl/quic_flags_impl.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/net/third_party/quic/platform/impl/quic_flags_impl.cc
b/net/third_party/quic/platform/impl/quic_flags_impl.cc
+index 5e6962d1e770..3fa45fc6892d 100644
+--- a/net/third_party/quic/platform/impl/quic_flags_impl.cc
++++ b/net/third_party/quic/platform/impl/quic_flags_impl.cc
+@@ -5,6 +5,7 @@
+ #include "net/third_party/quic/platform/impl/quic_flags_impl.h"
+
+ #include <algorithm>
++#include <initializer_list>
+ #include <iostream>
+ #include <set>
+
+@@ -153,9 +154,9 @@ std::string QuicFlagRegistry::GetHelp() const {
+ template <>
+ bool TypedQuicFlagHelper<bool>::SetFlag(const std::string& s) const {
+ static const base::NoDestructor<std::set<std::string>> kTrueValues(
+- {"", "1", "t", "true", "y", "yes"});
++ std::initializer_list<std::string>({"", "1", "t", "true", "y", "yes"}));
+ static const base::NoDestructor<std::set<std::string>> kFalseValues(
+- {"0", "f", "false", "n", "no"});
++ std::initializer_list<std::string>({"0", "f", "false", "n", "no"}));
+ if (kTrueValues->find(base::ToLowerASCII(s)) != kTrueValues->end()) {
+ *flag_ = true;
+ return true;
+--
+2.20.1
+
Deleted: chromium-FORTIFY_SOURCE-r2.patch
===================================================================
--- chromium-FORTIFY_SOURCE-r2.patch 2019-09-02 18:39:05 UTC (rev 507068)
+++ chromium-FORTIFY_SOURCE-r2.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -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 507068, opera-ffmpeg-codecs/trunk/chromium-FORTIFY_SOURCE-r2.patch)
===================================================================
--- chromium-FORTIFY_SOURCE-r2.patch (rev 0)
+++ chromium-FORTIFY_SOURCE-r2.patch 2019-09-02 18:39:16 UTC (rev 507069)
@@ -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-last-commit-position-r1.patch
===================================================================
--- chromium-last-commit-position-r1.patch 2019-09-02 18:39:05 UTC (rev
507068)
+++ chromium-last-commit-position-r1.patch 2019-09-02 18:39:16 UTC (rev
507069)
@@ -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 507068,
opera-ffmpeg-codecs/trunk/chromium-last-commit-position-r1.patch)
===================================================================
--- chromium-last-commit-position-r1.patch (rev 0)
+++ chromium-last-commit-position-r1.patch 2019-09-02 18:39:16 UTC (rev
507069)
@@ -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",
+ ]
