summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/Manifest8
-rw-r--r--www-client/chromium/chromium-75.0.3770.100.ebuild3
-rw-r--r--www-client/chromium/chromium-76.0.3809.46.ebuild (renamed from www-client/chromium/chromium-76.0.3809.36.ebuild)3
-rw-r--r--www-client/chromium/files/chromium-76-lss.patch39
-rw-r--r--www-client/chromium/files/chromium-angle-inline.patch118
5 files changed, 126 insertions, 45 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 45f976006ebd..fa9d1e57811e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,8 +16,8 @@ AUX chromium-76-gcc-private.patch 3159 BLAKE2B 0b902c4f3e679af034cbe557b057cfd68
AUX chromium-76-gcc-pure-virtual.patch 2358 BLAKE2B e591bdeb128877e2d0ee1e873033220efd4c75f4130bf1cda940cd2596c7ccec92d8f39e6b57b55fc72c4a9c58ff3ca634b9cb66064b5e4eed6906ef24c97071 SHA512 0401d9c105a1e8d13018a1d06e15e163c4db40810188a8f2623808e5ef2c220b5a9da520e20ffac8a91220ee13f51f391a82401b8d1de47476557e30d853cb65
AUX chromium-76-gcc-uint32.patch 1203 BLAKE2B f87e17576c32cdebcb59d158bd102b12207549d553d94c05b397f357308eb89eb44a317f2368247670cd74b8ea17be2d6f81545da411f5b4ad3fe7d5cc27466c SHA512 ff840d0520b1515b64ba5c4e7d8f17f58ef783b8b9002f6952e194887dd7b78ca19c743e7c3c5ef8d427ee03559d3ad5b00bb518ef12e8688fa7335ef50b9dbc
AUX chromium-76-gcc-vulkan.patch 5870 BLAKE2B 3bbe5eca8b70d244a734e1c2b4e237dfb67f1782206d50663caf47035c53d422ab33c82ba13af9ee668463f2c55329b228f03cbce4152f0b809f7f486c2fa4bb SHA512 77ccefbed977e92dc1645760569a51c1602b0701aaaddf9141ea946f1762fa2eeb7e9e8b2486589e7a21822835ea70ca230dd9fa392d3a444efbf14afeaa746b
-AUX chromium-76-lss.patch 1714 BLAKE2B 1e4ea3b4557a1474f77e6fff5a4dc7329e278adc19cecbcf915c95aadd12cfcd72f7f3d909edf431aceec67e3e20e405989e152c929fd537aa0fb3b4481b741d SHA512 1d764dce289168e9a3a5fd92e0c821ade204afbc65f8c8bc94be54d32802c9a1dd83b0bef5047a1553cf08daf211afa6af51f7701912de80eba888ccd9b1d071
AUX chromium-76-quiche.patch 10020 BLAKE2B 54b2bd89ac3bdba6e770e55c03957af9149c6259ae33e1e57a50feb7fbc7d6b98f02f0a9212acab8a075f682121f4e8413b3f5cd03cf3a557ce0329c17a7f661 SHA512 759db973253687e915e446aa92ae882d0e9a030b10ac134bbae37c6b43b3e91cb47a11d50957a860e3d0c41f3ae07e091c917626d38a0eafa06b9fbb68f91915
+AUX chromium-angle-inline.patch 4775 BLAKE2B a4021ec1e11309bf901b09e6925d7bc90f1b30c4db08dae7d80d97a9ca4111f1f34c169465017b50f459f2c638b0ba8696fd8ddf01aa27bad3c2b3bfbf22ebb9 SHA512 ad413e8178b6004ec03887132d77d8648e5a0c9bf48552c8665f0782c8cb342d4ea417caabbae3a1e62d32046afaab0033574aff2399b0b74a721d44fcd257e3
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e
AUX chromium-compiler-r9.patch 6240 BLAKE2B c121cefea072e75ee7440ef61bcc79758b205d668de7ac6b3a19497908291c8fc78cda104bc483735a8e0b0123f2218fbe9fb28815657fe1ee8cf89d792d6f20 SHA512 9e526a56e5b7d3fd3b1d7701bfe9aeeabeeb47cd4a077d2943703f6d43a5fca58a798e16e051f6430a56255796004839982320f6ee6c2b921dae94befd952fac
@@ -27,8 +27,8 @@ AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bd
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
DIST chromium-75.0.3770.100.tar.xz 708247700 BLAKE2B 9d9872019ab37b51daf4f0367ef121aefa8897c73b611478608e7c9be2d1098bcaec1ff8b22ccf4793933e7beca95bb74007061acc1424e2ed46717236549a85 SHA512 83048f302eb4e5fa59da3149e156180b07e310a6549b83a0841c5d92fa7102dbf9d53c5243aa9c35f3747b3f0c2d02c1541385f10115373cb3125cc6d1be9a42
DIST chromium-75.0.3770.90.tar.xz 708212580 BLAKE2B e52149e8eea0734ec2704f176fed1911e6252cb0dab76894dcece7c826a0581e099b58e638324b115aecf61f26884ffdb8d5ea1c820bf0df2f49dbab1986d3f4 SHA512 5956ad1cf342f143c0587299bdd5497acfc958975e5b4878731c40e0e5db58280ea8b36ca077cafce7e812510356de57872f37753cb92de5258cb24578d2c327
-DIST chromium-76.0.3809.36.tar.xz 730385768 BLAKE2B ef621be6ca3680d797ad918b28cc1bd0d8fbe75dc32ff733ab88fb3021702a08d3e34ceac1c36390d58e0776a5863fab0316cb0ea5a78cbb73b01b10da0b3d96 SHA512 0f2d0ab535e68a9b5ca2a161f124d6803c2a4125ec37dbd4e79d1cb8040848c16aef5e4f427537f72fbc1c5b2417336c96b5a194add0731db506740f7d8865b1
-EBUILD chromium-75.0.3770.100.ebuild 21455 BLAKE2B 86e587737649879ee757d26104f2dc10b1be0291b6170346e0ec8530fdbfb280fca807ba7782679169b5acd0904609784ab4658890576d6b6b70d743dd70b578 SHA512 54a4dff20c6f9c9d5bcb558df83eaa71fea35069eaea80e530e486c4d18afad0ea5b523316f17ddf40075d16d58edc9b53a845c3bbe94fa1d53eb4625a4aaf05
+DIST chromium-76.0.3809.46.tar.xz 730245736 BLAKE2B de8038cd7eaa69bff576219bb2e66b66ce1d0220a7be7a7ded79677be7c35275ab0585e4d7796ebf90ae86aa310b7d1192b5359e222ca49f69575dc270dc08a5 SHA512 5fb9bef3944749185b19af10042aa902c956905c964730d2b99e3237b03908a77e9eb67b6e5e495bdd51e95c2ef39d0a71d2cffa8a87ba3a642e4a918603d056
+EBUILD chromium-75.0.3770.100.ebuild 21509 BLAKE2B d5e992f735a448152d292f85d1c3841e98dcd2259941dd3de17481b4a45bcfcb76ffd9cce95c35fe43bc0e670f413742826381558c245eae08c50d5b7189b17d SHA512 3e585c9f24f3581d858a1260b72a222f2de3148c68eab86f0df474773a55f80f5f754e6b4f54eeec8447872ac547de34b23d24cc6a02901f7eeed8c950ea4f46
EBUILD chromium-75.0.3770.90.ebuild 21454 BLAKE2B d650aab4566b11355c8bc48721ba283159a4c8ce87395ddc7c5dbaf0f75b5756cc8d7d8adb24b12b9a7d6064470c18c8deac948d5e12ea3fd85fca8c77458ad1 SHA512 5b66020565dc78014ba84dc211943bc17dfd7d954103e7a99d7e07b944408456be35b23b4eae67257a3651e1072f12f0f2bbd40eee4e3501c15a3887b16ba00c
-EBUILD chromium-76.0.3809.36.ebuild 22015 BLAKE2B c13f939bfe58befcd0c65888e526607f71e628297de4ecbb7b42f2046824d3af724783e1db17b80145440d9c88d47d83d0b29bb6afa2b6eba6ca0f554e08804a SHA512 9ef4680fe693b063d4b484be93e43a3b80011fed64ae0cc0163e435132610de92d5a348dbc3b51093f66a7564bb334b15beab9f0af594cf20e46a6eee789b15c
+EBUILD chromium-76.0.3809.46.ebuild 22069 BLAKE2B 8e53f4b52a216dd85237498aa136e8465f582bdd0ca70ac3e5f70191d38ca8cec90dc791eca492508ea7402fe3e75f1a6c745899de0a1915e3b39d2ac3325b88 SHA512 4fbde15efd3f1e2b3aa1002eea1746c22b68a2d9682100785fd2f64487f504b30e99b28f9d8d2514c35514196afcf0cc3d987a73b7f6438d77b906709b1313e1
MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-75.0.3770.100.ebuild b/www-client/chromium/chromium-75.0.3770.100.ebuild
index 0dde4528fb73..20bf2709a39f 100644
--- a/www-client/chromium/chromium-75.0.3770.100.ebuild
+++ b/www-client/chromium/chromium-75.0.3770.100.ebuild
@@ -144,10 +144,10 @@ PATCHES=(
"${FILESDIR}/chromium-compiler-r9.patch"
"${FILESDIR}/chromium-widevine-r4.patch"
"${FILESDIR}/chromium-fix-char_traits.patch"
+ "${FILESDIR}/chromium-angle-inline.patch"
"${FILESDIR}/chromium-75-fix-gn-gen.patch"
"${FILESDIR}/chromium-75-gcc-angle-fix.patch"
"${FILESDIR}/chromium-75-unique_ptr.patch"
- "${FILESDIR}/chromium-75-lss.patch"
"${FILESDIR}/chromium-75-noexcept.patch"
"${FILESDIR}/chromium-75-llvm8.patch"
"${FILESDIR}/chromium-75-pure-virtual.patch"
@@ -251,6 +251,7 @@ src_prepare() {
third_party/cld_3
third_party/closure_compiler
third_party/crashpad
+ third_party/crashpad/crashpad/third_party/lss
third_party/crashpad/crashpad/third_party/zlib
third_party/crc32c
third_party/cros_system_api
diff --git a/www-client/chromium/chromium-76.0.3809.36.ebuild b/www-client/chromium/chromium-76.0.3809.46.ebuild
index 5873a5a0710e..f785c3c3110e 100644
--- a/www-client/chromium/chromium-76.0.3809.36.ebuild
+++ b/www-client/chromium/chromium-76.0.3809.46.ebuild
@@ -144,8 +144,8 @@ PATCHES=(
"${FILESDIR}/chromium-compiler-r10.patch"
"${FILESDIR}/chromium-widevine-r4.patch"
"${FILESDIR}/chromium-fix-char_traits.patch"
+ "${FILESDIR}/chromium-angle-inline.patch"
"${FILESDIR}/chromium-76-quiche.patch"
- "${FILESDIR}/chromium-76-lss.patch"
"${FILESDIR}/chromium-76-gcc-vulkan.patch"
"${FILESDIR}/chromium-76-gcc-private.patch"
"${FILESDIR}/chromium-76-gcc-noexcept.patch"
@@ -261,6 +261,7 @@ src_prepare() {
third_party/cld_3
third_party/closure_compiler
third_party/crashpad
+ third_party/crashpad/crashpad/third_party/lss
third_party/crashpad/crashpad/third_party/zlib
third_party/crc32c
third_party/cros_system_api
diff --git a/www-client/chromium/files/chromium-76-lss.patch b/www-client/chromium/files/chromium-76-lss.patch
deleted file mode 100644
index 4d475b539584..000000000000
--- a/www-client/chromium/files/chromium-76-lss.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-index 008f858..69d0623 100644
---- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
-@@ -25,7 +25,7 @@
- #include "base/logging.h"
- #include "base/strings/stringprintf.h"
- #include "client/client_argv_handling.h"
--#include "third_party/lss/lss.h"
-+#include "third_party/lss/linux_syscall_support.h"
- #include "util/file/file_io.h"
- #include "util/linux/exception_handler_client.h"
- #include "util/linux/exception_information.h"
-diff --git a/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc b/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc
-index 911f6d3..11c1ffa 100644
---- a/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc
-+++ b/third_party/crashpad/crashpad/util/linux/proc_task_reader_test.cc
-@@ -19,7 +19,7 @@
- #include "base/strings/stringprintf.h"
- #include "gtest/gtest.h"
- #include "test/multiprocess_exec.h"
--#include "third_party/lss/lss.h"
-+#include "third_party/lss/linux_syscall_support.h"
- #include "util/synchronization/semaphore.h"
- #include "util/thread/thread.h"
-
-diff --git a/third_party/crashpad/crashpad/util/linux/socket.cc b/third_party/crashpad/crashpad/util/linux/socket.cc
-index 68efd57..d6e39f0 100644
---- a/third_party/crashpad/crashpad/util/linux/socket.cc
-+++ b/third_party/crashpad/crashpad/util/linux/socket.cc
-@@ -18,7 +18,7 @@
-
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
--#include "third_party/lss/lss.h"
-+#include "third_party/lss/linux_syscall_support.h"
-
- namespace crashpad {
-
diff --git a/www-client/chromium/files/chromium-angle-inline.patch b/www-client/chromium/files/chromium-angle-inline.patch
new file mode 100644
index 000000000000..e8975d74817c
--- /dev/null
+++ b/www-client/chromium/files/chromium-angle-inline.patch
@@ -0,0 +1,118 @@
+From 4c0a23611b3906855db7b93da2f34aec57930cdf Mon Sep 17 00:00:00 2001
+From: Geoff Lang <geofflang@chromium.org>
+Date: Tue, 25 Jun 2019 10:56:29 -0400
+Subject: [PATCH] Update ValidateSamplerParameterBase to use const parameters.
+
+ValidateSamplerParameterBase is called with both const and non-const
+parameter pointers which caused our explicit template instantiations to
+not cover all cases resulting in link errors. Force the parameters to
+always be const so that our instantiations cover everything.
+
+BUG=angleproject:3555
+
+Change-Id: Ibf92572ba80a689c75dcdc70e5153d9941da76f3
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1676305
+Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
+Commit-Queue: Geoff Lang <geofflang@chromium.org>
+---
+
+diff --git a/third_party/angle/src/libANGLE/validationES.cpp b/third_party/angle/src/libANGLE/validationES.cpp
+index 041803a..3f402f6 100644
+--- a/third_party/angle/src/libANGLE/validationES.cpp
++++ b/third_party/angle/src/libANGLE/validationES.cpp
+@@ -189,7 +189,9 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureWrapModeValue(Context *context, ParamType *params, bool restrictedWrapModes)
++bool ValidateTextureWrapModeValue(Context *context,
++ const ParamType *params,
++ bool restrictedWrapModes)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -223,7 +225,9 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureMinFilterValue(Context *context, ParamType *params, bool restrictedMinFilter)
++bool ValidateTextureMinFilterValue(Context *context,
++ const ParamType *params,
++ bool restrictedMinFilter)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -252,7 +256,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureMagFilterValue(Context *context, ParamType *params)
++bool ValidateTextureMagFilterValue(Context *context, const ParamType *params)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -269,7 +273,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureCompareModeValue(Context *context, ParamType *params)
++bool ValidateTextureCompareModeValue(Context *context, const ParamType *params)
+ {
+ // Acceptable mode parameters from GLES 3.0.2 spec, table 3.17
+ switch (ConvertToGLenum(params[0]))
+@@ -287,7 +291,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureCompareFuncValue(Context *context, ParamType *params)
++bool ValidateTextureCompareFuncValue(Context *context, const ParamType *params)
+ {
+ // Acceptable function parameters from GLES 3.0.2 spec, table 3.17
+ switch (ConvertToGLenum(params[0]))
+@@ -311,7 +315,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureSRGBDecodeValue(Context *context, ParamType *params)
++bool ValidateTextureSRGBDecodeValue(Context *context, const ParamType *params)
+ {
+ if (!context->getExtensions().textureSRGBDecode)
+ {
+@@ -5996,7 +6000,7 @@
+ GLenum pname,
+ GLsizei bufSize,
+ bool vectorParams,
+- ParamType *params)
++ const ParamType *params)
+ {
+ if (context->getClientMajorVersion() < 3)
+ {
+@@ -6099,8 +6103,13 @@
+ return true;
+ }
+
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
++template bool ValidateSamplerParameterBase(Context *,
++ GLuint,
++ GLenum,
++ GLsizei,
++ bool,
++ const GLfloat *);
++template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, const GLint *);
+ template bool ValidateSamplerParameterBase(Context *,
+ GLuint,
+ GLenum,
+diff --git a/third_party/angle/src/libANGLE/validationES.h b/third_party/angle/src/libANGLE/validationES.h
+index c61bda6..4b06d28 100644
+--- a/third_party/angle/src/libANGLE/validationES.h
++++ b/third_party/angle/src/libANGLE/validationES.h
+@@ -584,7 +584,7 @@
+ GLenum pname,
+ GLsizei bufSize,
+ bool vectorParams,
+- ParamType *params);
++ const ParamType *params);
+
+ bool ValidateGetInternalFormativBase(Context *context,
+ GLenum target,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 06:00:17 +0000