rpms
/
chromium
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 124.0.6367.60

Browse Source 
- fix waylang regression
- update GOST patches
- update Yandex patches
i9e changed/i9e/chromium-124.0.6367.60-2.el9.inferit
Arkady L. Shane 8 months ago
parent 83da45e127
commit 412c0260ec
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503
22 changed files with 981 additions and 952 deletions
Show Stats Download Patch File Download Diff File

6
.chromium.metadata
Unescape View File

@ -1,8 +1,8 @@
cbc565e94c1af7c031cc1e38dc1c096517be0e66 SOURCES/chromium-123.0.6312.122.tar.xz 093f58a167f54eaf611bb00dcfc36fe8d3f742e0 SOURCES/chromium-124.0.6367.60.tar.xz
dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz
769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz
3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz 3e94bb4f999c636293bc745b02d98e7925da5616 SOURCES/node-v20.6.1-linux-arm64.tar.xz
8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz 8e9bc55cce3899627b2810ecfe87116c5a9147b5 SOURCES/chromium-browser-gost-icons.tar.xz
89db6f7a8e5f9707e748e4027d95e1ad0b0871f2 SOURCES/msspi-70fdcec917ce3799f0786d635422e25a5def92a4.tar.xz 155cfe0e2b2e5ef5143fb8fabf25c615ec3bc482 SOURCES/msspi-192d2662e058453313e6f824099ace60ca6fd242.tar.xz
8b7f2a4daf8fe872b0c75f1946c0ced192a4930e SOURCES/Chromium-Gost-d23e9c19db1abf4887f67f3f7d3f91dd9963d964.tar.xz 456cf4558818f59e4c10d9b2c2f0b7ffddfa62a5 SOURCES/Chromium-Gost-b96d919186bcbb230c6f8dd19bc933bf717a9f59.tar.xz

248
SOURCES/0001-Add-PPC64-support-for-boringssl.patch
Unescape View File

@ -1,7 +1,7 @@
Index: chromium-123.0.6312.58/third_party/boringssl/src/cmake/perlasm.cmake Index: chromium-124.0.6367.60/third_party/boringssl/src/cmake/perlasm.cmake
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/cmake/perlasm.cmake --- chromium-124.0.6367.60.orig/third_party/boringssl/src/cmake/perlasm.cmake
+++ chromium-123.0.6312.58/third_party/boringssl/src/cmake/perlasm.cmake +++ chromium-124.0.6367.60/third_party/boringssl/src/cmake/perlasm.cmake
@@ -17,6 +17,7 @@ function(add_perlasm_target dest src) @@ -17,6 +17,7 @@ function(add_perlasm_target dest src)
DEPENDS DEPENDS
${src} ${src}
@ -18,12 +18,12 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/cmake/perlasm.cmake
+ add_perlasm_target("${dest}-linux.S" ${src} linux64le) + add_perlasm_target("${dest}-linux.S" ${src} linux64le)
+ append_to_parent_scope("${var}_ASM" "${dest}-linux.S") + append_to_parent_scope("${var}_ASM" "${dest}-linux.S")
elseif(arch STREQUAL "x86") elseif(arch STREQUAL "x86")
add_perlasm_target("${dest}-apple.S" ${src} macosx -fPIC -DOPENSSL_IA32_SSE2 ${ARGN}) add_perlasm_target("${dest}-apple.S" ${src} macosx -fPIC ${ARGN})
add_perlasm_target("${dest}-linux.S" ${src} elf -fPIC -DOPENSSL_IA32_SSE2 ${ARGN}) add_perlasm_target("${dest}-linux.S" ${src} elf -fPIC ${ARGN})
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/CMakeLists.txt Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/CMakeLists.txt
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/CMakeLists.txt --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/CMakeLists.txt
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/CMakeLists.txt +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/CMakeLists.txt
@@ -26,6 +26,7 @@ perlasm(CRYPTO_SOURCES aarch64 cipher_ex @@ -26,6 +26,7 @@ perlasm(CRYPTO_SOURCES aarch64 cipher_ex
perlasm(CRYPTO_SOURCES aarch64 test/trampoline-armv8 test/asm/trampoline-armv8.pl) perlasm(CRYPTO_SOURCES aarch64 test/trampoline-armv8 test/asm/trampoline-armv8.pl)
perlasm(CRYPTO_SOURCES arm chacha/chacha-armv4 chacha/asm/chacha-armv4.pl) perlasm(CRYPTO_SOURCES arm chacha/chacha-armv4 chacha/asm/chacha-armv4.pl)
@ -40,10 +40,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/CMakeLists.txt
crypto.c crypto.c
curve25519/curve25519.c curve25519/curve25519.c
curve25519/curve25519_64_adx.c curve25519/curve25519_64_adx.c
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/abi_self_test.cc Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/abi_self_test.cc
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/abi_self_test.cc --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/abi_self_test.cc
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/abi_self_test.cc +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/abi_self_test.cc
@@ -521,3 +521,289 @@ TEST(ABITest, AArch64) { @@ -521,3 +521,289 @@ TEST(ABITest, AArch64) {
CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper); CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper);
} }
@ -334,10 +334,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/abi_self_test.cc
+ CHECK_ABI_NO_UNWIND(abi_test_clobber_lr); + CHECK_ABI_NO_UNWIND(abi_test_clobber_lr);
+} +}
+#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST +#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/cpu_ppc64le.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/cpu_ppc64le.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/cpu_ppc64le.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/cpu_ppc64le.c
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+/* Copyright (c) 2016, Google Inc. +/* Copyright (c) 2016, Google Inc.
+ * + *
@ -377,10 +377,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/cpu_ppc64le.c
+} +}
+ +
+#endif // OPENSSL_PPC64LE +#endif // OPENSSL_PPC64LE
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/crypto.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/crypto.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/crypto.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/crypto.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/crypto.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/crypto.c
@@ -25,10 +25,12 @@ static_assert(sizeof(ossl_ssize_t) == si @@ -25,10 +25,12 @@ static_assert(sizeof(ossl_ssize_t) == si
"ossl_ssize_t should be the same size as size_t"); "ossl_ssize_t should be the same size as size_t");
@ -419,10 +419,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/crypto.c
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
#include <openssl/arm_arch.h> #include <openssl/arm_arch.h>
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/CMakeLists.txt
@@ -19,6 +19,8 @@ perlasm(BCM_SOURCES arm sha1-armv4-large @@ -19,6 +19,8 @@ perlasm(BCM_SOURCES arm sha1-armv4-large
perlasm(BCM_SOURCES arm sha256-armv4 sha/asm/sha256-armv4.pl) perlasm(BCM_SOURCES arm sha256-armv4 sha/asm/sha256-armv4.pl)
perlasm(BCM_SOURCES arm sha512-armv4 sha/asm/sha512-armv4.pl) perlasm(BCM_SOURCES arm sha512-armv4 sha/asm/sha512-armv4.pl)
@ -432,10 +432,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/CMakeL
perlasm(BCM_SOURCES x86 aesni-x86 aes/asm/aesni-x86.pl) perlasm(BCM_SOURCES x86 aesni-x86 aes/asm/aesni-x86.pl)
perlasm(BCM_SOURCES x86 bn-586 bn/asm/bn-586.pl) perlasm(BCM_SOURCES x86 bn-586 bn/asm/bn-586.pl)
perlasm(BCM_SOURCES x86 co-586 bn/asm/co-586.pl) perlasm(BCM_SOURCES x86 co-586 bn/asm/co-586.pl)
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
@@ -0,0 +1,3809 @@ @@ -0,0 +1,3809 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
@ -4246,10 +4246,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/as
+} +}
+ +
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
@@ -59,6 +59,12 @@ OPENSSL_INLINE int vpaes_capable(void) { @@ -59,6 +59,12 @@ OPENSSL_INLINE int vpaes_capable(void) {
OPENSSL_INLINE int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); } OPENSSL_INLINE int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); }
#endif #endif
@ -4263,10 +4263,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/aes/in
#endif #endif
#endif // !NO_ASM #endif // !NO_ASM
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bcm.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/bcm.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bcm.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/bcm.c
@@ -102,6 +102,7 @@ @@ -102,6 +102,7 @@
#include "self_check/fips.c" #include "self_check/fips.c"
#include "self_check/self_check.c" #include "self_check/self_check.c"
@ -4275,10 +4275,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bcm.c
#include "sha/sha1.c" #include "sha/sha1.c"
#include "sha/sha256.c" #include "sha/sha256.c"
#include "sha/sha512.c" #include "sha/sha512.c"
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
@@ -384,6 +384,23 @@ int bn_expand(BIGNUM *bn, size_t bits) { @@ -384,6 +384,23 @@ int bn_expand(BIGNUM *bn, size_t bits) {
} }
@ -4303,10 +4303,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/bn/bn.
if ((size_t)bn->width <= words) { if ((size_t)bn->width <= words) {
if (!bn_wexpand(bn, words)) { if (!bn_wexpand(bn, words)) {
return 0; return 0;
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
@@ -1455,6 +1455,8 @@ int EVP_has_aes_hardware(void) { @@ -1455,6 +1455,8 @@ int EVP_has_aes_hardware(void) {
return hwaes_capable() && crypto_gcm_clmul_enabled(); return hwaes_capable() && crypto_gcm_clmul_enabled();
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
@ -4316,10 +4316,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/cipher
#else #else
return 0; return 0;
#endif #endif
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
@@ -0,0 +1,671 @@ @@ -0,0 +1,671 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
@ -4992,10 +4992,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/
+} +}
+ +
+close STDOUT or die "error closing STDOUT: $!"; # enforce flush +close STDOUT or die "error closing STDOUT: $!"; # enforce flush
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
@@ -228,6 +228,13 @@ void CRYPTO_ghash_init(gmult_func *out_m @@ -228,6 +228,13 @@ void CRYPTO_ghash_init(gmult_func *out_m
*out_hash = gcm_ghash_neon; *out_hash = gcm_ghash_neon;
return; return;
@ -5010,10 +5010,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/
#endif #endif
gcm_init_nohw(out_table, H); gcm_init_nohw(out_table, H);
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
@@ -215,5 +215,15 @@ TEST(GCMTest, ABI) { @@ -215,5 +215,15 @@ TEST(GCMTest, ABI) {
} }
} }
@ -5030,10 +5030,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/
+#endif // GHASH_ASM_PPC64LE +#endif // GHASH_ASM_PPC64LE
} }
#endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM #endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
@@ -325,6 +325,13 @@ void aes_gcm_dec_kernel(const uint8_t *i @@ -325,6 +325,13 @@ void aes_gcm_dec_kernel(const uint8_t *i
const u128 Htable[16]); const u128 Htable[16]);
#endif #endif
@ -5048,10 +5048,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/modes/
#endif #endif
#endif // OPENSSL_NO_ASM #endif // OPENSSL_NO_ASM
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
#define EXPECTED_NR_getrandom 278 #define EXPECTED_NR_getrandom 278
#elif defined(OPENSSL_ARM) #elif defined(OPENSSL_ARM)
@ -5061,10 +5061,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/g
#elif defined(OPENSSL_RISCV64) #elif defined(OPENSSL_RISCV64)
#define EXPECTED_NR_getrandom 278 #define EXPECTED_NR_getrandom 278
#endif #endif
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
@@ -431,6 +431,11 @@ void RAND_bytes_with_additional_data(uin @@ -431,6 +431,11 @@ void RAND_bytes_with_additional_data(uin
// Take a read lock around accesses to |state->drbg|. This is needed to // Take a read lock around accesses to |state->drbg|. This is needed to
// avoid returning bad entropy if we race with // avoid returning bad entropy if we race with
@ -5077,11 +5077,11 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/rand/r
CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock); CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock);
#endif #endif
if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data, if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data,
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
@@ -23,17 +23,25 @@ @@ -23,6 +23,17 @@
extern "C" { extern "C" {
#endif #endif
@ -5090,8 +5090,8 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/in
+// POWER has an intrinsics-based implementation of SHA-1 and thus the functions +// POWER has an intrinsics-based implementation of SHA-1 and thus the functions
+// normally defined in assembly are available even with |OPENSSL_NO_ASM| in +// normally defined in assembly are available even with |OPENSSL_NO_ASM| in
+// this case. +// this case.
+#define SHA1_ASM +#define SHA1_ASM_PPC64
+void sha1_block_data_order(uint32_t *state, const uint8_t *in, +void sha1_block_data_order_ppc64(uint32_t *state, const uint8_t *in,
+ size_t num_blocks); + size_t num_blocks);
+#endif +#endif
+ +
@ -5099,21 +5099,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/in
// Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is // Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
// defined in assembly. // defined in assembly.
#if !defined(OPENSSL_NO_ASM) && defined(OPENSSL_X86) Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
-#define SHA1_ASM
#define SHA256_ASM
#define SHA512_ASM
-void sha1_block_data_order(uint32_t *state, const uint8_t *data,
- size_t num_blocks);
void sha256_block_data_order(uint32_t *state, const uint8_t *data,
size_t num_blocks);
void sha512_block_data_order(uint64_t *state, const uint8_t *data,
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
@@ -0,0 +1,361 @@ @@ -0,0 +1,361 @@
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved. + * All rights reserved.
@ -5186,7 +5175,7 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ +
+#include <altivec.h> +#include <altivec.h>
+ +
+void sha1_block_data_order(uint32_t *state, const uint8_t *data, size_t num); +void sha1_block_data_order_ppc64(uint32_t *state, const uint8_t *data, size_t num);
+ +
+static uint32_t rotate(uint32_t a, int n) { return (a << n) | (a >> (32 - n)); } +static uint32_t rotate(uint32_t a, int n) { return (a << n) | (a >> (32 - n)); }
+ +
@ -5304,7 +5293,7 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+ (b) = rotate((b), 30); \ + (b) = rotate((b), 30); \
+ } while (0) + } while (0)
+ +
+void sha1_block_data_order(uint32_t *state, const uint8_t *data, size_t num) { +void sha1_block_data_order_ppc64(uint32_t *state, const uint8_t *data, size_t num) {
+ uint32_t A, B, C, D, E, T; + uint32_t A, B, C, D, E, T;
+ +
+ A = state[0]; + A = state[0];
@ -5476,10 +5465,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/fipsmodule/sha/sh
+#undef BODY_20_39 +#undef BODY_20_39
+#undef BODY_40_59 +#undef BODY_40_59
+#undef BODY_60_79 +#undef BODY_60_79
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/internal.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/internal.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/internal.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/internal.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/internal.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/internal.h
@@ -181,7 +181,7 @@ extern "C" { @@ -181,7 +181,7 @@ extern "C" {
@ -5489,7 +5478,7 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/internal.h
// OPENSSL_cpuid_setup initializes the platform-specific feature cache. // OPENSSL_cpuid_setup initializes the platform-specific feature cache.
void OPENSSL_cpuid_setup(void); void OPENSSL_cpuid_setup(void);
#endif #endif
@@ -1622,6 +1622,16 @@ OPENSSL_INLINE int CRYPTO_is_ARMv8_SHA51 @@ -1632,6 +1632,16 @@ OPENSSL_INLINE int CRYPTO_is_ARMv8_SHA51
#endif // OPENSSL_ARM || OPENSSL_AARCH64 #endif // OPENSSL_ARM || OPENSSL_AARCH64
@ -5506,10 +5495,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/internal.h
#if defined(BORINGSSL_DISPATCH_TEST) #if defined(BORINGSSL_DISPATCH_TEST)
// Runtime CPU dispatch testing support // Runtime CPU dispatch testing support
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
@@ -0,0 +1,320 @@ @@ -0,0 +1,320 @@
+#! /usr/bin/env perl +#! /usr/bin/env perl
+# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
@ -5831,10 +5820,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/perlasm/ppc-xlate
+___ +___
+ +
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/abi_test.h Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/test/abi_test.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/crypto/test/abi_test.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/test/abi_test.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/abi_test.h +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/test/abi_test.h
@@ -179,7 +179,78 @@ struct alignas(16) Reg128 { @@ -179,7 +179,78 @@ struct alignas(16) Reg128 {
CALLER_STATE_REGISTER(uint64_t, x28) \ CALLER_STATE_REGISTER(uint64_t, x28) \
CALLER_STATE_REGISTER(uint64_t, x29) CALLER_STATE_REGISTER(uint64_t, x29)
@ -5941,10 +5930,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/abi_test.h
static_assert(sizeof...(args) <= 8, static_assert(sizeof...(args) <= 8,
"too many arguments for abi_test_trampoline"); "too many arguments for abi_test_trampoline");
Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl +++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
@@ -0,0 +1,262 @@ @@ -0,0 +1,262 @@
+#!/usr/bin/env perl +#!/usr/bin/env perl
+# Copyright (c) 2019, Google Inc. +# Copyright (c) 2019, Google Inc.
@ -6208,10 +6197,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/crypto/test/asm/trampoli
+ +
+print $code; +print $code;
+close STDOUT or die "error closing STDOUT: $!"; +close STDOUT or die "error closing STDOUT: $!";
Index: chromium-123.0.6312.58/third_party/boringssl/src/include/openssl/target.h Index: chromium-124.0.6367.60/third_party/boringssl/src/include/openssl/target.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/include/openssl/target.h --- chromium-124.0.6367.60.orig/third_party/boringssl/src/include/openssl/target.h
+++ chromium-123.0.6312.58/third_party/boringssl/src/include/openssl/target.h +++ chromium-124.0.6367.60/third_party/boringssl/src/include/openssl/target.h
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
#elif defined(__ARMEL__) || defined(_M_ARM) #elif defined(__ARMEL__) || defined(_M_ARM)
#define OPENSSL_32_BIT #define OPENSSL_32_BIT
@ -6222,10 +6211,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/include/openssl/target.h
#elif defined(__MIPSEL__) && !defined(__LP64__) #elif defined(__MIPSEL__) && !defined(__LP64__)
#define OPENSSL_32_BIT #define OPENSSL_32_BIT
#define OPENSSL_MIPS #define OPENSSL_MIPS
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc --- chromium-124.0.6367.60.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
@@ -37,6 +37,8 @@ int main(int argc, char **argv) { @@ -37,6 +37,8 @@ int main(int argc, char **argv) {
puts("ARM (32-bit)"); puts("ARM (32-bit)");
#elif defined(OPENSSL_AARCH64) #elif defined(OPENSSL_AARCH64)
@ -6235,10 +6224,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/acvp/modu
#else #else
#error "FIPS build not supported on this architecture" #error "FIPS build not supported on this architecture"
#endif #endif
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate.go Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate.go
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go --- chromium-124.0.6367.60.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate.go +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate.go
@@ -54,7 +54,8 @@ type stringWriter interface { @@ -54,7 +54,8 @@ type stringWriter interface {
type processorType int type processorType int
@ -6838,10 +6827,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
case "str", "bl", "ldr", "st1": case "str", "bl", "ldr", "st1":
return aarch64 return aarch64
} }
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate.peg Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg --- chromium-124.0.6367.60.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate.peg +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
@ -6851,10 +6840,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
# https://github.com/pointlander/peg. delocate.go has a go:generate line for # https://github.com/pointlander/peg. delocate.go has a go:generate line for
# rebuilding delocate.peg.go from this file. # rebuilding delocate.peg.go from this file.
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go --- chromium-124.0.6367.60.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
@@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri @@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri
var delocateTests = []delocateTest{ var delocateTests = []delocateTest{
@ -6867,10 +6856,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
{"x86_64-Basic", []string{"in.s"}, "out.s"}, {"x86_64-Basic", []string{"in.s"}, "out.s"},
{"x86_64-BSS", []string{"in.s"}, "out.s"}, {"x86_64-BSS", []string{"in.s"}, "out.s"},
{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"}, {"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+ .text + .text
+foo: +foo:
@ -6881,10 +6870,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+ .localentry foo,.-foo + .localentry foo,.-foo
+.LVL0: +.LVL0:
+ bl + bl
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.c"
@ -6948,19 +6937,19 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+ .text + .text
+foo: +foo:
+ addis 22,2,bar@toc@ha + addis 22,2,bar@toc@ha
+ ld 0,bar@toc@l(22) + ld 0,bar@toc@l(22)
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
@@ -0,0 +1,72 @@ @@ -0,0 +1,72 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.c"
@ -7034,10 +7023,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
@@ -0,0 +1,161 @@ @@ -0,0 +1,161 @@
+ .file "foo.c" + .file "foo.c"
+ .abiversion 2 + .abiversion 2
@ -7200,10 +7189,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+ .size exported_function,.-exported_function + .size exported_function,.-exported_function
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
@@ -0,0 +1,552 @@ @@ -0,0 +1,552 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.c"
@ -7757,10 +7746,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+ .file "foo.c" + .file "foo.c"
+ .abiversion 2 + .abiversion 2
@ -7988,10 +7977,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+ .zero 20 + .zero 20
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2" + .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
@@ -0,0 +1,677 @@ @@ -0,0 +1,677 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.c"
@ -8670,10 +8659,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+ .text + .text
+foo: +foo:
@ -8698,10 +8687,10 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+ +
+ addis 4, 2, 1+foo-2@toc@ha+3 + addis 4, 2, 1+foo-2@toc@ha+3
+ addi 4, 4, 1+foo-2@toc@l+3 + addi 4, 4, 1+foo-2@toc@l+3
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s Index: chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s +++ chromium-124.0.6367.60/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
@@ -0,0 +1,178 @@ @@ -0,0 +1,178 @@
+.text +.text
+.file 1 "inserted_by_delocate.c" +.file 1 "inserted_by_delocate.c"
@ -8881,15 +8870,30 @@ Index: chromium-123.0.6312.58/third_party/boringssl/src/util/fipstools/delocate/
+.byte 0xff +.byte 0xff
+.byte 0x31 +.byte 0x31
+.byte 0x80 +.byte 0x80
Index: chromium-123.0.6312.58/third_party/boringssl/src/util/generate_build_files.py Index: chromium-124.0.6367.60/third_party/boringssl/src/util/generate_build_files.py
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/boringssl/src/util/generate_build_files.py --- chromium-124.0.6367.60.orig/third_party/boringssl/src/util/generate_build_files.py
+++ chromium-123.0.6312.58/third_party/boringssl/src/util/generate_build_files.py +++ chromium-124.0.6367.60/third_party/boringssl/src/util/generate_build_files.py
@@ -34,6 +34,7 @@ OS_ARCH_COMBOS = [ @@ -34,6 +34,7 @@ OS_ARCH_COMBOS = [
('apple', 'x86_64', 'macosx', [], 'S'), ('apple', 'x86_64', 'macosx', [], 'S'),
('linux', 'arm', 'linux32', [], 'S'), ('linux', 'arm', 'linux32', [], 'S'),
('linux', 'aarch64', 'linux64', [], 'S'), ('linux', 'aarch64', 'linux64', [], 'S'),
+ ('linux', 'ppc64le', 'linux64le', [], 'S'), + ('linux', 'ppc64le', 'linux64le', [], 'S'),
('linux', 'x86', 'elf', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'), ('linux', 'x86', 'elf', ['-fPIC'], 'S'),
('linux', 'x86_64', 'elf', [], 'S'), ('linux', 'x86_64', 'elf', [], 'S'),
('win', 'x86', 'win32n', ['-DOPENSSL_IA32_SSE2'], 'asm'), ('win', 'x86', 'win32n', [], 'asm'),
Index: chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
===================================================================
--- chromium-124.0.6367.60.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
+++ chromium-124.0.6367.60/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
@@ -416,6 +416,10 @@ static void sha1_block_data_order(uint32
return;
}
#endif
+#if defined(SHA1_ASM_PPC64)
+ sha1_block_data_order_ppc64(state, data, num);
+ return;
+#endif
sha1_block_data_order_nohw(state, data, num);
}

245
SOURCES/0001-Added-Yandex-search-bar-as-default-on-newtab-and-new.patch
Unescape View File

@ -1,37 +1,37 @@
From 197a86bd50560694a0cb6336e128136f2fed8ce4 Mon Sep 17 00:00:00 2001 From aa29bac82e9e521fa5cac9184a7b5d3a8d80b402 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 24 Jan 2024 13:28:09 +0300 Date: Tue, 23 Apr 2024 14:43:39 +0300
Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page Subject: [PATCH] Added Yandex search bar as default on newtab and new-tab-page
--- ---
chrome/app/generated_resources.grd | 3 -- chrome/app/generated_resources.grd | 3 ---
.../app/resources/generated_resources_be.xtb | 2 +- .../app/resources/generated_resources_be.xtb | 2 +-
.../resources/generated_resources_en-GB.xtb | 2 +- .../resources/generated_resources_en-GB.xtb | 2 +-
.../app/resources/generated_resources_ru.xtb | 2 +- .../app/resources/generated_resources_ru.xtb | 2 +-
.../app/resources/generated_resources_uk.xtb | 2 +- .../app/resources/generated_resources_uk.xtb | 2 +-
chrome/browser/history/top_sites_factory.cc | 4 +-- chrome/browser/history/top_sites_factory.cc | 4 ++--
.../resources/new_tab_page/lens_form.html | 1 + .../resources/new_tab_page/lens_form.html | 1 +
.../resources/new_tab_page/lens_form.ts | 19 ++++++++++++- .../resources/new_tab_page/lens_form.ts | 19 ++++++++++++++++++-
.../new_tab_page/lens_upload_dialog.html | 10 +++---- .../new_tab_page/lens_upload_dialog.html | 10 +++++-----
.../browser/resources/new_tab_page/logo.html | 5 +--- .../browser/resources/new_tab_page/logo.html | 5 +----
chrome/browser/resources/new_tab_page/logo.ts | 2 +- chrome/browser/resources/new_tab_page/logo.ts | 2 +-
.../new_tab_page/realbox/realbox.html | 7 +++++ chrome/browser/search/search.cc | 7 +++++++
chrome/browser/search/search.cc | 7 +++++
chrome/browser/search/search.h | 2 ++ chrome/browser/search/search.h | 2 ++
.../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 ++++ .../ui/webui/new_tab_page/new_tab_page_ui.cc | 5 +++++
components/search/search.cc | 14 ++++++++++ components/search/search.cc | 14 ++++++++++++++
components/search/search.h | 7 +++++ components/search/search.h | 7 +++++++
components/search_engines/keyword_table.cc | 4 +++ components/search_engines/keyword_table.cc | 4 ++++
.../search_engines/prepopulated_engines.json | 21 +++++++------- .../search_engines/prepopulated_engines.json | 11 ++++++-----
.../search_engines/template_url_data_util.cc | 6 +++- .../search_engine_countries-inc.cc | 9 +++++----
.../template_url_prepopulate_data.cc | 28 +++++++++++++++---- .../search_engines/template_url_data_util.cc | 6 +++++-
21 files changed, 117 insertions(+), 36 deletions(-) .../template_url_prepopulate_data.cc | 15 +++++++++------
21 files changed, 96 insertions(+), 36 deletions(-)
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6ac137571b..5eec7833a7 100644 index ceabbced0f..ae958b0be4 100644
--- a/chrome/app/generated_resources.grd --- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -7544,13 +7544,10 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -7609,13 +7609,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
<!-- NTP --> <!-- NTP -->
<message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, and Google is the default search engine."> <message name="IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT" desc="The text displayed in the fakebox (on the New Tab page) when it is empty, and Google is the default search engine.">
@ -46,10 +46,10 @@ index 6ac137571b..5eec7833a7 100644
<message name="IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP" desc="The tooltip for adding a custom link shortcut. (On the New Tab Page)"> <message name="IDS_NTP_CUSTOM_LINKS_ADD_SHORTCUT_TOOLTIP" desc="The tooltip for adding a custom link shortcut. (On the New Tab Page)">
Add shortcut Add shortcut
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb
index c82dbe7a73..8e7bc894ce 100644 index 4459670e32..235c44b353 100644
--- a/chrome/app/resources/generated_resources_be.xtb --- a/chrome/app/resources/generated_resources_be.xtb
+++ b/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb
@@ -9111,7 +9111,7 @@ @@ -9170,7 +9170,7 @@
<translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation> <translation id="8048728378294435881">Стварайце рэзервовыя копіі сваіх даных, каб іх можна было выкарыстоўваць на іншых прыладах</translation>
<translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation> <translation id="8048977114738515028">Стварыце ярлык на працоўным стале прылады, каб мець прамы доступ да гэтага профілю</translation>
<translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation> <translation id="8049029041626250638">Падключыце клавіятуру або мыш. Калі вы выкарыстоўваеце прылады з Bluetooth, упэўніцеся, што яны гатовыя да спалучэння.</translation>
@ -59,10 +59,10 @@ index c82dbe7a73..8e7bc894ce 100644
<translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation> <translation id="8049948037269924837">Адваротная прагортка сэнсарнай панэллю</translation>
<translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation> <translation id="8050038245906040378">Камерцыйнае падпісванне кода ў Microsoft</translation>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb
index e160c2b056..5d57515d3c 100644 index 8641bff7d6..276fdce88e 100644
--- a/chrome/app/resources/generated_resources_en-GB.xtb --- a/chrome/app/resources/generated_resources_en-GB.xtb
+++ b/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -9126,7 +9126,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -9186,7 +9186,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<translation id="8048728378294435881">Back up your stuff and use it on any device</translation> <translation id="8048728378294435881">Back up your stuff and use it on any device</translation>
<translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation> <translation id="8048977114738515028">Create a desktop shortcut on your device to access directly to this profile</translation>
<translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation> <translation id="8049029041626250638">Connect a keyboard or mouse. If you are using Bluetooth devices, make sure that your devices are ready to pair.</translation>
@ -72,10 +72,10 @@ index e160c2b056..5d57515d3c 100644
<translation id="8049948037269924837">Touchpad reverse scrolling</translation> <translation id="8049948037269924837">Touchpad reverse scrolling</translation>
<translation id="8050038245906040378">Microsoft Commercial Code Signing</translation> <translation id="8050038245906040378">Microsoft Commercial Code Signing</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb
index ca6e7e7f07..d0efd93524 100644 index 3445b888b2..6858be016c 100644
--- a/chrome/app/resources/generated_resources_ru.xtb --- a/chrome/app/resources/generated_resources_ru.xtb
+++ b/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -9117,7 +9117,7 @@ @@ -9177,7 +9177,7 @@
<translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation> <translation id="8048728378294435881">Создайте резервную копию данных и используйте их на любом устройстве.</translation>
<translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation> <translation id="8048977114738515028">Чтобы быстро переключаться на этот профиль, создайте ярлык на рабочем столе</translation>
<translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation> <translation id="8049029041626250638">Подключите мышь или клавиатуру. Если вы используете устройства Bluetooth, убедитесь, что они готовы к подключению.</translation>
@ -85,10 +85,10 @@ index ca6e7e7f07..d0efd93524 100644
<translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation> <translation id="8049948037269924837">Обратное направление прокрутки с помощью сенсорной панели</translation>
<translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation> <translation id="8050038245906040378">Подписывание коммерческого кода Microsoft</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb
index 014fe3f9ae..711822ff45 100644 index 225ec54852..66e1fbe735 100644
--- a/chrome/app/resources/generated_resources_uk.xtb --- a/chrome/app/resources/generated_resources_uk.xtb
+++ b/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -9131,7 +9131,7 @@ @@ -9191,7 +9191,7 @@
<translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation> <translation id="8048728378294435881">Створюйте резервні копії даних і використовуйте їх на будь-якому пристрої</translation>
<translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation> <translation id="8048977114738515028">Створити ярлик на робочому столі, щоб відразу переходити до цього профілю</translation>
<translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation> <translation id="8049029041626250638">Підключіть клавіатуру або мишу. Якщо ви користуєтеся пристроями з Bluetooth, переконайтеся, що вони готові до підключення.</translation>
@ -278,24 +278,8 @@ index 20e943fdaa..812c0efcda 100644
} }
private computeShowDoodle_(): boolean { private computeShowDoodle_(): boolean {
diff --git a/chrome/browser/resources/new_tab_page/realbox/realbox.html b/chrome/browser/resources/new_tab_page/realbox/realbox.html
index f179a71a80..1ebbab5536 100644
--- a/chrome/browser/resources/new_tab_page/realbox/realbox.html
+++ b/chrome/browser/resources/new_tab_page/realbox/realbox.html
@@ -1,4 +1,11 @@
<style include="cr-icons">
+ #voiceSearchButton {
+ visibility: hidden;
+ }
+ #lensSearchButton {
+ visibility: visible;
+ }
+
:host {
--cr-realbox-height: 44px;
--cr-realbox-min-width: var(--ntp-search-box-width);
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 1226ddfe20..5bffa15f8c 100644 index e24cc7a9fe..49de03b2fc 100644
--- a/chrome/browser/search/search.cc --- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc
@@ -179,6 +179,8 @@ struct NewTabURLDetails { @@ -179,6 +179,8 @@ struct NewTabURLDetails {
@ -333,7 +317,7 @@ index c7ae65114f..5859d72731 100644
bool IsNTPOrRelatedURL(const GURL& url, Profile* profile); bool IsNTPOrRelatedURL(const GURL& url, Profile* profile);
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
index 525ee13969..63d76288fa 100644 index 84f19fbcac..5bb5a4ce74 100644
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -344,7 +328,7 @@ index 525ee13969..63d76288fa 100644
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h"
@@ -618,6 +619,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) { @@ -631,6 +632,10 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(Profile* profile) {
base::FeatureList::IsEnabled( base::FeatureList::IsEnabled(
ntp_features::kNtpChromeCartInHistoryClusterModule)); ntp_features::kNtpChromeCartInHistoryClusterModule));
@ -397,7 +381,7 @@ index 98572faa77..cfb6727848 100644
#endif // COMPONENTS_SEARCH_SEARCH_H_ #endif // COMPONENTS_SEARCH_SEARCH_H_
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc
index a33ad02444..ce91f8f446 100644 index d421aca3b8..86a57ffb8b 100644
--- a/components/search_engines/keyword_table.cc --- a/components/search_engines/keyword_table.cc
+++ b/components/search_engines/keyword_table.cc +++ b/components/search_engines/keyword_table.cc
@@ -172,7 +172,9 @@ void BindURLToStatement(const TemplateURLData& data, @@ -172,7 +172,9 @@ void BindURLToStatement(const TemplateURLData& data,
@ -421,10 +405,10 @@ index a33ad02444..ce91f8f446 100644
data->suggestions_url_post_params = s.ColumnString(18); data->suggestions_url_post_params = s.ColumnString(18);
data->image_url_post_params = s.ColumnString(19); data->image_url_post_params = s.ColumnString(19);
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 51cf3a03c6..0bdb99166d 100644 index 5c323e51c3..288280ca02 100644
--- a/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json
@@ -650,7 +650,7 @@ @@ -660,7 +660,7 @@
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.by/images/search/?rpt=imageview", "image_url": "https://yandex.by/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -433,12 +417,7 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -659,10 +659,11 @@ @@ -673,6 +673,7 @@
"name": "Yandex",
"keyword": "yandex.com",
"favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
- "search_url": "https://yandex.com/search/?text={searchTerms}&from=os&clid=1836588",
+ "search_url": "https://yandex.com/search/?text={searchTerms}from=os&{yandex:referralID}",
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5", "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
"image_url": "https://yandex.com/images/search?rpt=imageview", "image_url": "https://yandex.com/images/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -446,12 +425,7 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -672,11 +673,11 @@ @@ -686,7 +687,7 @@
"keyword": "yandex.kz",
"favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
"logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
- "search_url": "https://yandex.kz/{yandex:searchPath}?text={searchTerms}",
+ "search_url": "https://yandex.kz/{yandex:searchPath}?text={searchTerms}&from=os&{yandex:referralID}",
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.kz/images/search/?rpt=imageview", "image_url": "https://yandex.kz/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -460,12 +434,7 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -686,11 +687,11 @@ @@ -700,7 +701,7 @@
"keyword": "yandex.ru",
"favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
"logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
- "search_url": "https://yandex.ru/{yandex:searchPath}?text={searchTerms}&{yandex:referralID}",
+ "search_url": "https://yandex.ru/{yandex:searchPath}?text={searchTerms}&from=os&{yandex:referralID}",
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ru/images/search/?rpt=imageview", "image_url": "https://yandex.ru/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -474,12 +443,7 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -699,11 +700,11 @@ @@ -713,7 +714,7 @@
"name": "Yandex",
"keyword": "yandex.com.tr",
"favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
- "search_url": "https://www.yandex.com.tr/{yandex:searchPath}?text={searchTerms}",
+ "search_url": "https://www.yandex.com.tr/{yandex:searchPath}?text={searchTerms}&from=os&{yandex:referralID}",
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview", "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -488,12 +452,7 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -713,11 +714,11 @@ @@ -727,7 +728,7 @@
"keyword": "yandex.ua",
"favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
"logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
- "search_url": "https://yandex.ua/{yandex:searchPath}?text={searchTerms}",
+ "search_url": "https://yandex.ua/{yandex:searchPath}?text={searchTerms}&from=os&{yandex:referralID}",
"suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ua/images/search/?rpt=imageview", "image_url": "https://yandex.ua/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -502,50 +461,11 @@ index 51cf3a03c6..0bdb99166d 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
index 2aa6115f3b..46c11f60b8 100644 index e79fabd2de..7e75962c45 100644
--- a/components/search_engines/template_url_data_util.cc --- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/template_url_data_util.cc +++ b/components/search_engines/search_engine_countries-inc.cc
@@ -76,10 +76,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary( @@ -33,6 +33,7 @@ struct EngineAndTier {
if (string_value) {
result->image_translate_url = *string_value;
}
+#if 0 // Disable new tab overriding by search engines
string_value = dict.FindString(DefaultSearchManager::kNewTabURL);
if (string_value) {
result->new_tab_url = *string_value;
}
+#endif
string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL);
if (string_value) {
result->contextual_search_url = *string_value;
@@ -348,7 +350,7 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromPrepopulatedEngine(
ToStringPiece(engine.search_url), ToStringPiece(engine.suggest_url),
ToStringPiece(engine.image_url),
ToStringPiece(engine.image_translate_url),
- ToStringPiece(engine.new_tab_url),
+ base::StringPiece(), //ToStringPiece(engine.new_tab_url),
ToStringPiece(engine.contextual_search_url),
ToStringPiece(engine.logo_url), ToStringPiece(engine.doodle_url),
ToStringPiece(engine.search_url_post_params),
@@ -439,10 +441,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromOverrideDictionary(
if (string_value) {
image_translate_url = *string_value;
}
+#if 0 // Disable new tab overriding by search engines
string_value = engine_dict.FindString("new_tab_url");
if (string_value) {
new_tab_url = *string_value;
}
+#endif
string_value = engine_dict.FindString("contextual_search_url");
if (string_value) {
contextual_search_url = *string_value;
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 82fdc972bd..9031f70ef5 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -63,6 +63,7 @@ struct EngineAndTier {
// Default (for countries with no better engine set) // Default (for countries with no better engine set)
constexpr EngineAndTier engines_default[] = { constexpr EngineAndTier engines_default[] = {
@ -553,7 +473,7 @@ index 82fdc972bd..9031f70ef5 100644
{SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -221,8 +222,8 @@ constexpr EngineAndTier engines_BR[] = { @@ -169,8 +170,8 @@ constexpr EngineAndTier engines_BR[] = {
// Belarus // Belarus
constexpr EngineAndTier engines_BY[] = { constexpr EngineAndTier engines_BY[] = {
@ -563,7 +483,7 @@ index 82fdc972bd..9031f70ef5 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
@@ -634,9 +635,9 @@ constexpr EngineAndTier engines_IN[] = { @@ -494,9 +495,9 @@ constexpr EngineAndTier engines_IN[] = {
// Iraq // Iraq
constexpr EngineAndTier engines_IQ[] = { constexpr EngineAndTier engines_IQ[] = {
@ -574,7 +494,7 @@ index 82fdc972bd..9031f70ef5 100644
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
}; };
@@ -744,8 +745,8 @@ constexpr EngineAndTier engines_KW[] = { @@ -590,8 +591,8 @@ constexpr EngineAndTier engines_KW[] = {
// Kazakhstan // Kazakhstan
constexpr EngineAndTier engines_KZ[] = { constexpr EngineAndTier engines_KZ[] = {
@ -584,7 +504,7 @@ index 82fdc972bd..9031f70ef5 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -1247,8 +1248,8 @@ constexpr EngineAndTier engines_TN[] = { @@ -1007,8 +1008,8 @@ constexpr EngineAndTier engines_TN[] = {
// Turkey // Turkey
constexpr EngineAndTier engines_TR[] = { constexpr EngineAndTier engines_TR[] = {
@ -594,32 +514,59 @@ index 82fdc972bd..9031f70ef5 100644
{SearchEngineTier::kTopEngines, &yahoo_tr}, {SearchEngineTier::kTopEngines, &yahoo_tr},
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
@@ -1772,6 +1773,12 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id, diff --git a/components/search_engines/template_url_data_util.cc b/components/search_engines/template_url_data_util.cc
current_number_of_engines++; index 322f686ade..52434867d8 100644
--- a/components/search_engines/template_url_data_util.cc
+++ b/components/search_engines/template_url_data_util.cc
@@ -76,10 +76,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromDictionary(
if (string_value) {
result->image_translate_url = *string_value;
} }
+#if 0 // Disable new tab overriding by search engines
+ const auto itr = string_value = dict.FindString(DefaultSearchManager::kNewTabURL);
+ base::ranges::find(t_urls, yandex_ru.id, &TemplateURLData::prepopulate_id); if (string_value) {
+ if (itr == t_urls.end()) { result->new_tab_url = *string_value;
+ t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(yandex_com));
+ }
+
return t_urls;
} }
+#endif
@@ -1907,12 +1914,23 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines( string_value = dict.FindString(DefaultSearchManager::kContextualSearchURL);
if (string_value) {
result->contextual_search_url = *string_value;
@@ -348,7 +350,7 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromPrepopulatedEngine(
ToStringPiece(engine.search_url), ToStringPiece(engine.suggest_url),
ToStringPiece(engine.image_url),
ToStringPiece(engine.image_translate_url),
- ToStringPiece(engine.new_tab_url),
+ base::StringPiece(), //ToStringPiece(engine.new_tab_url),
ToStringPiece(engine.contextual_search_url),
ToStringPiece(engine.logo_url), ToStringPiece(engine.doodle_url),
ToStringPiece(engine.search_url_post_params),
@@ -439,10 +441,12 @@ std::unique_ptr<TemplateURLData> TemplateURLDataFromOverrideDictionary(
if (string_value) {
image_translate_url = *string_value;
}
+#if 0 // Disable new tab overriding by search engines
string_value = engine_dict.FindString("new_tab_url");
if (string_value) {
new_tab_url = *string_value;
}
+#endif
string_value = engine_dict.FindString("contextual_search_url");
if (string_value) {
contextual_search_url = *string_value;
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 35063c9dea..7f16c889f8 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -217,12 +217,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
search_engines::RecordIsDefaultProviderAddedToChoices(inserted_default); search_engines::RecordIsDefaultProviderAddedToChoices(inserted_default);
} }
} }
+ - if (default_search_provider_index) {
if (default_search_provider_index) { - const auto itr =
const auto itr =
- base::ranges::find(t_urls, google.id, &TemplateURLData::prepopulate_id); - base::ranges::find(t_urls, google.id, &TemplateURLData::prepopulate_id);
+ base::ranges::find(t_urls, yandex_ru.id, &TemplateURLData::prepopulate_id); - *default_search_provider_index =
*default_search_provider_index = - itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr);
itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr); - }
}
+
+ /* Making yandex_ru be the first in "const PrepopulatedEngine* const engines_RU[]" + /* Making yandex_ru be the first in "const PrepopulatedEngine* const engines_RU[]"
+ * makes it be the first item in chrome://settings/search, + * makes it be the first item in chrome://settings/search,
+ * but Google is still chosen by default. + * but Google is still chosen by default.
@ -628,10 +575,10 @@ index 82fdc972bd..9031f70ef5 100644
+ * so that Google still was the default search engine. + * so that Google still was the default search engine.
+ * Instead, just use the first search engine as the default one. + * Instead, just use the first search engine as the default one.
+ */ + */
+ //if (default_search_provider_index) *default_search_provider_index = 0; + if (default_search_provider_index) *default_search_provider_index = 0;
return t_urls; return t_urls;
} }
-- --
2.43.0 2.44.0

155
SOURCES/0001-Implement-support-for-ppc64-on-Linux.patch
Unescape View File

@ -54,10 +54,8 @@ https://wiki.raptorcs.com/wiki/Porting/Chromium
src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++ src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++
25 files changed, 281 insertions(+), 35 deletions(-) 25 files changed, 281 insertions(+), 35 deletions(-)
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h --- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
@@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP @@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP
# else # else
# error "Unexpected __riscv_xlen" # error "Unexpected __riscv_xlen"
@ -67,10 +65,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dum
#else #else
#error "This code has not been ported to your platform yet." #error "This code has not been ported to your platform yet."
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc --- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
@@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte @@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte
#error "Unexpected __riscv_xlen" #error "Unexpected __riscv_xlen"
#endif #endif
@ -153,10 +149,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dum
+#endif +#endif
+ +
} // namespace google_breakpad } // namespace google_breakpad
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h --- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
@@ -67,6 +67,10 @@ struct ThreadInfo { @@ -67,6 +67,10 @@ struct ThreadInfo {
// Use the structures defined in <sys/user.h> // Use the structures defined in <sys/user.h>
struct user_regs_struct regs; struct user_regs_struct regs;
@ -180,10 +174,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dum
}; };
} // namespace google_breakpad } // namespace google_breakpad
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc --- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC @@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC
#error "Unexpected __riscv_xlen" #error "Unexpected __riscv_xlen"
#endif #endif
@ -233,10 +225,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dum
#endif #endif
} // namespace google_breakpad } // namespace google_breakpad
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h --- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
@@ -54,6 +54,9 @@ struct UContextReader { @@ -54,6 +54,9 @@ struct UContextReader {
#elif defined(__aarch64__) #elif defined(__aarch64__)
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
@ -247,10 +237,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/dum
#else #else
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc); static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc --- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
@@ -464,6 +464,13 @@ bool ExceptionHandler::HandleSignal(int @@ -464,6 +464,13 @@ bool ExceptionHandler::HandleSignal(int
memcpy(&g_crash_context_.float_state, fp_ptr, memcpy(&g_crash_context_.float_state, fp_ptr,
sizeof(g_crash_context_.float_state)); sizeof(g_crash_context_.float_state));
@ -295,10 +283,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/han
#elif defined(__riscv) #elif defined(__riscv)
context.siginfo.si_addr = context.siginfo.si_addr =
reinterpret_cast<void*>(context.context.uc_mcontext.__gregs[REG_PC]); reinterpret_cast<void*>(context.context.uc_mcontext.__gregs[REG_PC]);
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h --- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
@@ -200,7 +200,11 @@ class ExceptionHandler { @@ -200,7 +200,11 @@ class ExceptionHandler {
siginfo_t siginfo; siginfo_t siginfo;
pid_t tid; // the crashing thread. pid_t tid; // the crashing thread.
@ -312,10 +298,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/han
fpstate_t float_state; fpstate_t float_state;
#endif #endif
}; };
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc --- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
@@ -321,7 +321,7 @@ TEST(ExceptionHandlerTest, ParallelChild @@ -321,7 +321,7 @@ TEST(ExceptionHandlerTest, ParallelChild
ASSERT_EQ(SIGSEGV, WTERMSIG(status)); ASSERT_EQ(SIGSEGV, WTERMSIG(status));
return; return;
@ -347,10 +331,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/han
const int kOffset = kMemorySize - sizeof(kIllegalInstruction); const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
const pid_t child = fork(); const pid_t child = fork();
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc --- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
@@ -141,7 +141,9 @@ class MicrodumpWriter { @@ -141,7 +141,9 @@ class MicrodumpWriter {
const MicrodumpExtraInfo& microdump_extra_info, const MicrodumpExtraInfo& microdump_extra_info,
LinuxDumper* dumper) LinuxDumper* dumper)
@ -393,10 +375,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/mic
const google_breakpad::fpstate_t* const float_state_; const google_breakpad::fpstate_t* const float_state_;
#endif #endif
LinuxDumper* dumper_; LinuxDumper* dumper_;
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc --- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
@@ -282,10 +282,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi @@ -282,10 +282,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
ASSERT_TRUE(ContainsMicrodump(buf)); ASSERT_TRUE(ContainsMicrodump(buf));
@ -420,10 +400,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/mic
#else #else
ASSERT_NE(std::string::npos, ASSERT_NE(std::string::npos,
buf.find("M 00001000 0000002A 00001000 " buf.find("M 00001000 0000002A 00001000 "
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
@@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd @@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
#elif defined(__riscv) #elif defined(__riscv)
stack_pointer = reinterpret_cast<uint8_t*>( stack_pointer = reinterpret_cast<uint8_t*>(
@ -446,10 +424,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
# if defined(__ANDROID__) # if defined(__ANDROID__)
for (int i = EF_R0; i <= EF_R31; i++) for (int i = EF_R0; i <= EF_R31; i++)
info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
@@ -770,7 +770,9 @@ bool LinuxDumper::GetStackInfo(const voi @@ -770,7 +770,9 @@ bool LinuxDumper::GetStackInfo(const voi
reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1)); reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
@ -461,10 +437,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
const MappingInfo* mapping = FindMapping(stack_pointer); const MappingInfo* mapping = FindMapping(stack_pointer);
if (!mapping) if (!mapping)
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
@@ -64,7 +64,8 @@ namespace google_breakpad { @@ -64,7 +64,8 @@ namespace google_breakpad {
typedef Elf32_auxv_t elf_aux_entry; typedef Elf32_auxv_t elf_aux_entry;
#elif defined(__x86_64) || defined(__aarch64__) || \ #elif defined(__x86_64) || defined(__aarch64__) || \
@ -475,10 +449,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
typedef Elf64_auxv_t elf_aux_entry; typedef Elf64_auxv_t elf_aux_entry;
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
@@ -56,6 +56,8 @@ @@ -56,6 +56,8 @@
#define TID_PTR_REGISTER "$1" #define TID_PTR_REGISTER "$1"
#elif defined(__riscv) #elif defined(__riscv)
@ -488,17 +460,9 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
#else #else
#error This test has not been ported to this platform. #error This test has not been ported to this platform.
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc @@ -189,12 +189,12 @@ bool LinuxPtraceDumper::ReadRegisterSet(
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
@@ -152,19 +152,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
return true;
}
-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
-{
+bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
#ifdef PTRACE_GETREGSET #ifdef PTRACE_GETREGSET
struct iovec io; struct iovec io;
info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len); info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
@ -510,7 +474,12 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len); info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) { - if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) { + if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
return false; // We are going to check if we can read VFP registers on ARM32.
// Currently breakpad does not support VFP registers to be a part of minidump,
// so this is only to confirm that we can actually read FP registers.
@@ -214,6 +214,15 @@ bool LinuxPtraceDumper::ReadRegisterSet(
}
#endif // defined(__arm__)
} }
+ +
+#if defined(__powerpc64__) +#if defined(__powerpc64__)
@ -524,7 +493,7 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
return true; return true;
#else #else
return false; return false;
@@ -312,6 +320,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI @@ -378,6 +387,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
#elif defined(__riscv) #elif defined(__riscv)
stack_pointer = reinterpret_cast<uint8_t*>( stack_pointer = reinterpret_cast<uint8_t*>(
info->mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP]); info->mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP]);
@ -534,10 +503,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
#else #else
# error "This code hasn't been ported to your platform yet." # error "This code hasn't been ported to your platform yet."
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
@@ -470,6 +470,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR @@ -470,6 +470,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
#elif defined(__riscv) #elif defined(__riscv)
pid_t* process_tid_location = pid_t* process_tid_location =
@ -557,10 +524,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
#else #else
#error This test has not been ported to this platform. #error This test has not been ported to this platform.
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -144,7 +144,9 @@ class MinidumpWriter { @@ -144,7 +144,9 @@ class MinidumpWriter {
: fd_(minidump_fd), : fd_(minidump_fd),
path_(minidump_path), path_(minidump_path),
@ -614,10 +579,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
const google_breakpad::fpstate_t* const float_state_; // ditto const google_breakpad::fpstate_t* const float_state_; // ditto
#endif #endif
LinuxDumper* dumper_; LinuxDumper* dumper_;
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
@@ -47,6 +47,8 @@ class ExceptionHandler; @@ -47,6 +47,8 @@ class ExceptionHandler;
#if defined(__aarch64__) #if defined(__aarch64__)
@ -627,10 +590,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
#elif !defined(__ARM_EABI__) && !defined(__mips__) #elif !defined(__ARM_EABI__) && !defined(__mips__)
typedef std::remove_pointer<fpregset_t>::type fpstate_t; typedef std::remove_pointer<fpregset_t>::type fpstate_t;
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc --- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
@@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi @@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi
#elif defined(__riscv) #elif defined(__riscv)
context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] = context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] =
@ -641,10 +602,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/client/linux/min
#else #else
# error "This code has not been ported to your platform yet." # error "This code has not been ported to your platform yet."
#endif #endif
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc --- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
@@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p @@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p
#if defined(__x86_64__) || defined(__aarch64__) || \ #if defined(__x86_64__) || defined(__aarch64__) || \
@ -655,10 +614,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/mem
struct kernel_stat st; struct kernel_stat st;
if (sys_fstat(fd, &st) == -1 || st.st_size < 0) { if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
#else #else
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc --- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
@@ -179,9 +179,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM @@ -179,9 +179,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
TEST_F(MemoryMappedFileTest, MapWithOffset) { TEST_F(MemoryMappedFileTest, MapWithOffset) {
// Put more data in the test file this time. Offsets can only be // Put more data in the test file this time. Offsets can only be
@ -673,10 +630,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/linux/mem
for (size_t i = 0; i < data1_size; ++i) { for (size_t i = 0; i < data1_size; ++i) {
data1[i] = i & 0x7f; data1[i] = i & 0x7f;
} }
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc --- a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
@@ -60,8 +60,9 @@ TEST(PageAllocatorTest, LargeObject) { @@ -60,8 +60,9 @@ TEST(PageAllocatorTest, LargeObject) {
EXPECT_EQ(0U, allocator.pages_allocated()); EXPECT_EQ(0U, allocator.pages_allocated());
@ -688,10 +643,8 @@ Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/common/memory_al
for (unsigned i = 1; i < 10; ++i) { for (unsigned i = 1; i < 10; ++i) {
uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i)); uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
ASSERT_FALSE(p == NULL); ASSERT_FALSE(p == NULL);
Index: chromium-120.0.6099.71/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc --- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
=================================================================== +++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
--- chromium-120.0.6099.71.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+++ chromium-120.0.6099.71/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
@@ -82,6 +82,8 @@ @@ -82,6 +82,8 @@
#define ELF_ARCH EM_AARCH64 #define ELF_ARCH EM_AARCH64
#elif defined(__riscv) #elif defined(__riscv)

53
SOURCES/0001-Yandex-as-default-search-engine.patch
Unescape View File

@ -1,18 +1,19 @@
From 959ef623a875d6426b053631de857eb7f8867e25 Mon Sep 17 00:00:00 2001 From a2565c6060779d0ebc6e4b40ad29ff59badbb78b Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com> From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 2 Nov 2023 18:55:06 +0300 Date: Tue, 23 Apr 2024 14:21:11 +0300
Subject: [PATCH] Yandex as default search engine Subject: [PATCH] Yandex as default search engine
--- ---
.../search_engines/prepopulated_engines.json | 11 +++++---- .../search_engines/prepopulated_engines.json | 11 ++++++-----
.../template_url_prepopulate_data.cc | 24 +++++++++++-------- .../search_engines/search_engine_countries-inc.cc | 9 +++++----
2 files changed, 20 insertions(+), 15 deletions(-) .../template_url_prepopulate_data.cc | 15 +++++++++------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
index 51cf3a03c6..e875bf44a5 100644 index 5c323e51c3..288280ca02 100644
--- a/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json
@@ -650,7 +650,7 @@ @@ -660,7 +660,7 @@
"suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.by/images/search/?rpt=imageview", "image_url": "https://yandex.by/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -21,7 +22,7 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -663,6 +663,7 @@ @@ -673,6 +673,7 @@
"suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5", "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
"image_url": "https://yandex.com/images/search?rpt=imageview", "image_url": "https://yandex.com/images/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -29,7 +30,7 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -676,7 +677,7 @@ @@ -686,7 +687,7 @@
"suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.kz/images/search/?rpt=imageview", "image_url": "https://yandex.kz/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -38,7 +39,7 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -690,7 +691,7 @@ @@ -700,7 +701,7 @@
"suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ru/images/search/?rpt=imageview", "image_url": "https://yandex.ru/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -47,7 +48,7 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -703,7 +704,7 @@ @@ -713,7 +714,7 @@
"suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview", "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -56,7 +57,7 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
@@ -717,7 +718,7 @@ @@ -727,7 +728,7 @@
"suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}", "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
"image_url": "https://yandex.ua/images/search/?rpt=imageview", "image_url": "https://yandex.ua/images/search/?rpt=imageview",
"image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1", "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
@ -65,11 +66,11 @@ index 51cf3a03c6..e875bf44a5 100644
"type": "SEARCH_ENGINE_YANDEX", "type": "SEARCH_ENGINE_YANDEX",
"id": 15 "id": 15
}, },
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
index 82fdc972bd..7951f45c08 100644 index e79fabd2de..7e75962c45 100644
--- a/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/search_engine_countries-inc.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/search_engine_countries-inc.cc
@@ -63,6 +63,7 @@ struct EngineAndTier { @@ -33,6 +33,7 @@ struct EngineAndTier {
// Default (for countries with no better engine set) // Default (for countries with no better engine set)
constexpr EngineAndTier engines_default[] = { constexpr EngineAndTier engines_default[] = {
@ -77,7 +78,7 @@ index 82fdc972bd..7951f45c08 100644
{SearchEngineTier::kTopEngines, &google}, {SearchEngineTier::kTopEngines, &google},
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -221,8 +222,8 @@ constexpr EngineAndTier engines_BR[] = { @@ -169,8 +170,8 @@ constexpr EngineAndTier engines_BR[] = {
// Belarus // Belarus
constexpr EngineAndTier engines_BY[] = { constexpr EngineAndTier engines_BY[] = {
@ -87,7 +88,7 @@ index 82fdc972bd..7951f45c08 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
@@ -634,9 +635,9 @@ constexpr EngineAndTier engines_IN[] = { @@ -494,9 +495,9 @@ constexpr EngineAndTier engines_IN[] = {
// Iraq // Iraq
constexpr EngineAndTier engines_IQ[] = { constexpr EngineAndTier engines_IQ[] = {
@ -98,7 +99,7 @@ index 82fdc972bd..7951f45c08 100644
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
}; };
@@ -744,8 +745,8 @@ constexpr EngineAndTier engines_KW[] = { @@ -590,8 +591,8 @@ constexpr EngineAndTier engines_KW[] = {
// Kazakhstan // Kazakhstan
constexpr EngineAndTier engines_KZ[] = { constexpr EngineAndTier engines_KZ[] = {
@ -108,7 +109,7 @@ index 82fdc972bd..7951f45c08 100644
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &mail_ru}, {SearchEngineTier::kTopEngines, &mail_ru},
{SearchEngineTier::kTopEngines, &yahoo}, {SearchEngineTier::kTopEngines, &yahoo},
@@ -1247,8 +1248,8 @@ constexpr EngineAndTier engines_TN[] = { @@ -1007,8 +1008,8 @@ constexpr EngineAndTier engines_TN[] = {
// Turkey // Turkey
constexpr EngineAndTier engines_TR[] = { constexpr EngineAndTier engines_TR[] = {
@ -118,7 +119,11 @@ index 82fdc972bd..7951f45c08 100644
{SearchEngineTier::kTopEngines, &yahoo_tr}, {SearchEngineTier::kTopEngines, &yahoo_tr},
{SearchEngineTier::kTopEngines, &bing}, {SearchEngineTier::kTopEngines, &bing},
{SearchEngineTier::kTopEngines, &duckduckgo}, {SearchEngineTier::kTopEngines, &duckduckgo},
@@ -1907,12 +1908,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines( diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
index 35063c9dea..7f16c889f8 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -217,12 +217,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
search_engines::RecordIsDefaultProviderAddedToChoices(inserted_default); search_engines::RecordIsDefaultProviderAddedToChoices(inserted_default);
} }
} }
@ -141,5 +146,5 @@ index 82fdc972bd..7951f45c08 100644
} }
-- --
2.43.0 2.44.0

27
SOURCES/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
Unescape View File

@ -1,6 +1,3 @@
diff --git a/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
deleted file mode 100644
index 225647f..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h --- a/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
+++ /dev/null +++ /dev/null
@@ -1,320 +0,0 @@ @@ -1,320 +0,0 @@
@ -324,9 +321,6 @@ index 225647f..0000000
-#endif -#endif
- -
-#endif -#endif
diff --git a/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
deleted file mode 100644
index d0ceec1..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h --- a/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
+++ /dev/null +++ /dev/null
@@ -1,193 +0,0 @@ @@ -1,193 +0,0 @@
@ -523,12 +517,9 @@ index d0ceec1..0000000
-#endif -#endif
- -
-#endif -#endif
diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm b/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
deleted file mode 100644
index cf14597..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm --- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
+++ /dev/null +++ /dev/null
@@ -1,107 +0,0 @@ @@ -1,108 +0,0 @@
-@ This file was created from a .asm file -@ This file was created from a .asm file
-@ using the ads2gas.pl script. -@ using the ads2gas.pl script.
-.syntax unified -.syntax unified
@ -551,6 +542,7 @@ index cf14597..0000000
-.equ HAVE_NEON_DOTPROD , 0 -.equ HAVE_NEON_DOTPROD , 0
-.equ HAVE_NEON_I8MM , 0 -.equ HAVE_NEON_I8MM , 0
-.equ HAVE_SVE , 0 -.equ HAVE_SVE , 0
-.equ HAVE_SVE2 , 0
-.equ HAVE_MIPS32 , 0 -.equ HAVE_MIPS32 , 0
-.equ HAVE_DSPR2 , 0 -.equ HAVE_DSPR2 , 0
-.equ HAVE_MSA , 0 -.equ HAVE_MSA , 0
@ -636,9 +628,6 @@ index cf14597..0000000
-.equ DECODE_WIDTH_LIMIT , 16384 -.equ DECODE_WIDTH_LIMIT , 16384
-.equ DECODE_HEIGHT_LIMIT , 16384 -.equ DECODE_HEIGHT_LIMIT , 16384
- .section .note.GNU-stack,"",%progbits - .section .note.GNU-stack,"",%progbits
diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.c b/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
deleted file mode 100644
index 9b870e7..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.c --- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
+++ /dev/null +++ /dev/null
@@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
@ -652,12 +641,9 @@ index 9b870e7..0000000
-#include "vpx/vpx_codec.h" -#include "vpx/vpx_codec.h"
-static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv"; -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv";
-const char *vpx_codec_build_config(void) {return cfg;} -const char *vpx_codec_build_config(void) {return cfg;}
diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_config.h b/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
deleted file mode 100644
index 8be04cc..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.h --- a/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
+++ /dev/null +++ /dev/null
@@ -1,116 +0,0 @@ @@ -1,117 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */ -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/* */ -/* */
-/* Use of this source code is governed by a BSD-style license */ -/* Use of this source code is governed by a BSD-style license */
@ -689,6 +675,7 @@ index 8be04cc..0000000
-#define HAVE_NEON_DOTPROD 0 -#define HAVE_NEON_DOTPROD 0
-#define HAVE_NEON_I8MM 0 -#define HAVE_NEON_I8MM 0
-#define HAVE_SVE 0 -#define HAVE_SVE 0
-#define HAVE_SVE2 0
-#define HAVE_MIPS32 0 -#define HAVE_MIPS32 0
-#define HAVE_DSPR2 0 -#define HAVE_DSPR2 0
-#define HAVE_MSA 0 -#define HAVE_MSA 0
@ -774,9 +761,6 @@ index 8be04cc..0000000
-#define DECODE_WIDTH_LIMIT 16384 -#define DECODE_WIDTH_LIMIT 16384
-#define DECODE_HEIGHT_LIMIT 16384 -#define DECODE_HEIGHT_LIMIT 16384
-#endif /* VPX_CONFIG_H */ -#endif /* VPX_CONFIG_H */
diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
deleted file mode 100644
index 8749b43..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h --- a/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
+++ /dev/null +++ /dev/null
@@ -1,2128 +0,0 @@ @@ -1,2128 +0,0 @@
@ -2908,9 +2892,6 @@ index 8749b43..0000000
-#endif -#endif
- -
-#endif -#endif
diff --git a/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h b/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
deleted file mode 100644
index 37be459..0000000
--- a/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h --- a/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
+++ /dev/null +++ /dev/null
@@ -1,100 +0,0 @@ @@ -1,100 +0,0 @@

345
SOURCES/0003-third_party-ffmpeg-Add-ppc64-generated-config.patch
Unescape View File

@ -1,12 +1,12 @@
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config.h
@@ -0,0 +1,768 @@ @@ -0,0 +1,772 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H +#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H
+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_123/NEW.BUILD_TEST/chromium-123.0.6312.58/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_124/NEW.BUILD_TEST/chromium-124.0.6367.60/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2024 +#define CONFIG_THIS_YEAR 2024
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@ -18,7 +18,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define EXTERN_ASM +#define EXTERN_ASM
+#define BUILDSUF "" +#define BUILDSUF ""
+#define SLIBSUF ".so" +#define SLIBSUF ".so"
+#define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256 +#define SWS_MAX_FILTER_SIZE 256
+#define ARCH_AARCH64 0 +#define ARCH_AARCH64 0
+#define ARCH_ALPHA 0 +#define ARCH_ALPHA 0
@ -250,6 +249,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define HAVE_OPENCV2_CORE_CORE_C_H 0 +#define HAVE_OPENCV2_CORE_CORE_C_H 0
+#define HAVE_OPENGL_GL3_H 0 +#define HAVE_OPENGL_GL3_H 0
+#define HAVE_POLL_H 1 +#define HAVE_POLL_H 1
+#define HAVE_PTHREAD_NP_H 0
+#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SELECT_H 1
@ -340,6 +340,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define HAVE_POSIX_MEMALIGN 1 +#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
+#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_PTHREAD_SET_NAME_NP 0
+#define HAVE_PTHREAD_SETNAME_NP 0
+#define HAVE_SCHED_GETAFFINITY 1 +#define HAVE_SCHED_GETAFFINITY 1
+#define HAVE_SECITEMIMPORT 0 +#define HAVE_SECITEMIMPORT 0
+#define HAVE_SETCONSOLETEXTATTRIBUTE 0 +#define HAVE_SETCONSOLETEXTATTRIBUTE 0
@ -711,10 +713,12 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_H264_SEI 1 +#define CONFIG_H264_SEI 1
+#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 0
+#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVC_SEI 0
+#define CONFIG_HPELDSP 1 +#define CONFIG_HPELDSP 0
+#define CONFIG_HUFFMAN 0 +#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0 +#define CONFIG_HUFFYUVDSP 0
+#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IAMFDEC 0
+#define CONFIG_IAMFENC 0
+#define CONFIG_IDCTDSP 0 +#define CONFIG_IDCTDSP 0
+#define CONFIG_IIRFILTER 0 +#define CONFIG_IIRFILTER 0
+#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INFLATE_WRAPPER 0
@ -765,17 +769,17 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_VAAPI_ENCODE 0 +#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0 +#define CONFIG_VC1DSP 0
+#define CONFIG_VIDEODSP 1 +#define CONFIG_VIDEODSP 1
+#define CONFIG_VP3DSP 1 +#define CONFIG_VP3DSP 0
+#define CONFIG_VP56DSP 0 +#define CONFIG_VP56DSP 0
+#define CONFIG_VP8DSP 1 +#define CONFIG_VP8DSP 0
+#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0 +#define CONFIG_WMV2DSP 0
+#endif /* FFMPEG_CONFIG_H */ +#endif /* FFMPEG_CONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config_components.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config_components.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config_components.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/config_components.h
@@ -0,0 +1,2217 @@ @@ -0,0 +1,2218 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H +#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H
@ -813,6 +817,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_PRORES_METADATA_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0
+#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0
+#define CONFIG_SETTS_BSF 0 +#define CONFIG_SETTS_BSF 0
+#define CONFIG_SHOWINFO_BSF 0
+#define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_TRACE_HEADERS_BSF 0 +#define CONFIG_TRACE_HEADERS_BSF 0
+#define CONFIG_TRUEHD_CORE_BSF 0 +#define CONFIG_TRUEHD_CORE_BSF 0
@ -1048,7 +1053,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_TARGA_DECODER 0 +#define CONFIG_TARGA_DECODER 0
+#define CONFIG_TARGA_Y216_DECODER 0 +#define CONFIG_TARGA_Y216_DECODER 0
+#define CONFIG_TDSC_DECODER 0 +#define CONFIG_TDSC_DECODER 0
+#define CONFIG_THEORA_DECODER 1 +#define CONFIG_THEORA_DECODER 0
+#define CONFIG_THP_DECODER 0 +#define CONFIG_THP_DECODER 0
+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 +#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
+#define CONFIG_TIFF_DECODER 0 +#define CONFIG_TIFF_DECODER 0
@ -1079,14 +1084,14 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_VMDVIDEO_DECODER 0 +#define CONFIG_VMDVIDEO_DECODER 0
+#define CONFIG_VMIX_DECODER 0 +#define CONFIG_VMIX_DECODER 0
+#define CONFIG_VMNC_DECODER 0 +#define CONFIG_VMNC_DECODER 0
+#define CONFIG_VP3_DECODER 1 +#define CONFIG_VP3_DECODER 0
+#define CONFIG_VP4_DECODER 0 +#define CONFIG_VP4_DECODER 0
+#define CONFIG_VP5_DECODER 0 +#define CONFIG_VP5_DECODER 0
+#define CONFIG_VP6_DECODER 0 +#define CONFIG_VP6_DECODER 0
+#define CONFIG_VP6A_DECODER 0 +#define CONFIG_VP6A_DECODER 0
+#define CONFIG_VP6F_DECODER 0 +#define CONFIG_VP6F_DECODER 0
+#define CONFIG_VP7_DECODER 0 +#define CONFIG_VP7_DECODER 0
+#define CONFIG_VP8_DECODER 1 +#define CONFIG_VP8_DECODER 0
+#define CONFIG_VP8_RKMPP_DECODER 0 +#define CONFIG_VP8_RKMPP_DECODER 0
+#define CONFIG_VP8_V4L2M2M_DECODER 0 +#define CONFIG_VP8_V4L2M2M_DECODER 0
+#define CONFIG_VP9_DECODER 0 +#define CONFIG_VP9_DECODER 0
@ -1426,6 +1431,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_DNXHD_ENCODER 0 +#define CONFIG_DNXHD_ENCODER 0
+#define CONFIG_DPX_ENCODER 0 +#define CONFIG_DPX_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 0 +#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_DXV_ENCODER 0
+#define CONFIG_EXR_ENCODER 0 +#define CONFIG_EXR_ENCODER 0
+#define CONFIG_FFV1_ENCODER 0 +#define CONFIG_FFV1_ENCODER 0
+#define CONFIG_FFVHUFF_ENCODER 0 +#define CONFIG_FFVHUFF_ENCODER 0
@ -1786,8 +1792,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_TAK_PARSER 0 +#define CONFIG_TAK_PARSER 0
+#define CONFIG_VC1_PARSER 0 +#define CONFIG_VC1_PARSER 0
+#define CONFIG_VORBIS_PARSER 1 +#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1 +#define CONFIG_VP3_PARSER 0
+#define CONFIG_VP8_PARSER 1 +#define CONFIG_VP8_PARSER 0
+#define CONFIG_VP9_PARSER 1 +#define CONFIG_VP9_PARSER 1
+#define CONFIG_VVC_PARSER 0 +#define CONFIG_VVC_PARSER 0
+#define CONFIG_WEBP_PARSER 0 +#define CONFIG_WEBP_PARSER 0
@ -2399,8 +2405,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_AVSYNCTEST_FILTER 0 +#define CONFIG_AVSYNCTEST_FILTER 0
+#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0
+#define CONFIG_MOVIE_FILTER 0 +#define CONFIG_MOVIE_FILTER 0
+#define CONFIG_AFIFO_FILTER 0
+#define CONFIG_FIFO_FILTER 0
+#define CONFIG_AA_DEMUXER 0 +#define CONFIG_AA_DEMUXER 0
+#define CONFIG_AAC_DEMUXER 1 +#define CONFIG_AAC_DEMUXER 1
+#define CONFIG_AAX_DEMUXER 0 +#define CONFIG_AAX_DEMUXER 0
@ -2894,6 +2898,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_PCM_U8_MUXER 0 +#define CONFIG_PCM_U8_MUXER 0
+#define CONFIG_PSP_MUXER 0 +#define CONFIG_PSP_MUXER 0
+#define CONFIG_RAWVIDEO_MUXER 0 +#define CONFIG_RAWVIDEO_MUXER 0
+#define CONFIG_RCWT_MUXER 0
+#define CONFIG_RM_MUXER 0 +#define CONFIG_RM_MUXER 0
+#define CONFIG_ROQ_MUXER 0 +#define CONFIG_ROQ_MUXER 0
+#define CONFIG_RSO_MUXER 0 +#define CONFIG_RSO_MUXER 0
@ -2993,23 +2998,20 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */ +#endif /* FFMPEG_CONFIG_COMPONENTS_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/bsf_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/bsf_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/bsf_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/bsf_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFBitStreamFilter * const bitstream_filters[] = { +static const FFBitStreamFilter * const bitstream_filters[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/codec_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/codec_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/codec_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/codec_list.c
@@ -0,0 +1,20 @@ @@ -0,0 +1,17 @@
+static const FFCodec * const codec_list[] = { +static const FFCodec * const codec_list[] = {
+ &ff_h264_decoder, + &ff_h264_decoder,
+ &ff_theora_decoder,
+ &ff_vp3_decoder,
+ &ff_vp8_decoder,
+ &ff_aac_decoder, + &ff_aac_decoder,
+ &ff_flac_decoder, + &ff_flac_decoder,
+ &ff_mp3_decoder, + &ff_mp3_decoder,
@ -3025,11 +3027,11 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+ &ff_pcm_u8_decoder, + &ff_pcm_u8_decoder,
+ &ff_libopus_decoder, + &ff_libopus_decoder,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/parser_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/parser_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/parser_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavcodec/parser_list.c
@@ -0,0 +1,11 @@ @@ -0,0 +1,9 @@
+static const AVCodecParser * const parser_list[] = { +static const AVCodecParser * const parser_list[] = {
+ &ff_aac_parser, + &ff_aac_parser,
+ &ff_flac_parser, + &ff_flac_parser,
@ -3037,14 +3039,37 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+ &ff_mpegaudio_parser, + &ff_mpegaudio_parser,
+ &ff_opus_parser, + &ff_opus_parser,
+ &ff_vorbis_parser, + &ff_vorbis_parser,
+ &ff_vp3_parser,
+ &ff_vp8_parser,
+ &ff_vp9_parser, + &ff_vp9_parser,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/demuxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavdevice/indev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavdevice/indev_list.c
@@ -0,0 +1,2 @@
+static const AVInputFormat * const indev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavdevice/outdev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavdevice/outdev_list.c
@@ -0,0 +1,2 @@
+static const FFOutputFormat * const outdev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavfilter/filter_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/demuxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavfilter/filter_list.c
@@ -0,0 +1,6 @@
+static const AVFilter * const filter_list[] = {
+ &ff_asrc_abuffer,
+ &ff_vsrc_buffer,
+ &ff_asink_abuffer,
+ &ff_vsink_buffer,
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/demuxer_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/demuxer_list.c
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+static const AVInputFormat * const demuxer_list[] = { +static const AVInputFormat * const demuxer_list[] = {
+ &ff_aac_demuxer, + &ff_aac_demuxer,
@ -3055,24 +3080,24 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+ &ff_ogg_demuxer, + &ff_ogg_demuxer,
+ &ff_wav_demuxer, + &ff_wav_demuxer,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/muxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/muxer_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/muxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/muxer_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFOutputFormat * const muxer_list[] = { +static const FFOutputFormat * const muxer_list[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/protocol_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/protocol_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/protocol_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavformat/protocol_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const URLProtocol * const url_protocols[] = { +static const URLProtocol * const url_protocols[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/avconfig.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/avconfig.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/avconfig.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/avconfig.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+/* Generated by ffmpeg configure */ +/* Generated by ffmpeg configure */
+#ifndef AVUTIL_AVCONFIG_H +#ifndef AVUTIL_AVCONFIG_H
@ -3080,25 +3105,25 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/pp
+#define AV_HAVE_BIGENDIAN 0 +#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1 +#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */ +#endif /* AVUTIL_AVCONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/ffversion.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/ffversion.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/ffversion.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chrome/linux/ppc64/libavutil/ffversion.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+/* Automatically generated by version.sh, do not manually edit! */ +/* Automatically generated by version.sh, do not manually edit! */
+#ifndef AVUTIL_FFVERSION_H +#ifndef AVUTIL_FFVERSION_H
+#define AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H
+#define FFMPEG_VERSION "N-113309-gf89a6e7576" +#define FFMPEG_VERSION "N-113309-gf89a6e7576"
+#endif /* AVUTIL_FFVERSION_H */ +#endif /* AVUTIL_FFVERSION_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config.h
@@ -0,0 +1,768 @@ @@ -0,0 +1,772 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H +#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H
+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_123/NEW.BUILD_TEST/chromium-123.0.6312.58/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_124/NEW.BUILD_TEST/chromium-124.0.6367.60/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2024 +#define CONFIG_THIS_YEAR 2024
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@ -3110,7 +3135,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define EXTERN_ASM +#define EXTERN_ASM
+#define BUILDSUF "" +#define BUILDSUF ""
+#define SLIBSUF ".so" +#define SLIBSUF ".so"
+#define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256 +#define SWS_MAX_FILTER_SIZE 256
+#define ARCH_AARCH64 0 +#define ARCH_AARCH64 0
+#define ARCH_ALPHA 0 +#define ARCH_ALPHA 0
@ -3342,6 +3366,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define HAVE_OPENCV2_CORE_CORE_C_H 0 +#define HAVE_OPENCV2_CORE_CORE_C_H 0
+#define HAVE_OPENGL_GL3_H 0 +#define HAVE_OPENGL_GL3_H 0
+#define HAVE_POLL_H 1 +#define HAVE_POLL_H 1
+#define HAVE_PTHREAD_NP_H 0
+#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SELECT_H 1
@ -3432,6 +3457,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define HAVE_POSIX_MEMALIGN 1 +#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
+#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_PTHREAD_SET_NAME_NP 0
+#define HAVE_PTHREAD_SETNAME_NP 0
+#define HAVE_SCHED_GETAFFINITY 1 +#define HAVE_SCHED_GETAFFINITY 1
+#define HAVE_SECITEMIMPORT 0 +#define HAVE_SECITEMIMPORT 0
+#define HAVE_SETCONSOLETEXTATTRIBUTE 0 +#define HAVE_SETCONSOLETEXTATTRIBUTE 0
@ -3807,6 +3834,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_HUFFMAN 0 +#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0 +#define CONFIG_HUFFYUVDSP 0
+#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IAMFDEC 0
+#define CONFIG_IAMFENC 0
+#define CONFIG_IDCTDSP 1 +#define CONFIG_IDCTDSP 1
+#define CONFIG_IIRFILTER 0 +#define CONFIG_IIRFILTER 0
+#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INFLATE_WRAPPER 0
@ -3857,17 +3886,17 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_VAAPI_ENCODE 0 +#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0 +#define CONFIG_VC1DSP 0
+#define CONFIG_VIDEODSP 1 +#define CONFIG_VIDEODSP 1
+#define CONFIG_VP3DSP 1 +#define CONFIG_VP3DSP 0
+#define CONFIG_VP56DSP 0 +#define CONFIG_VP56DSP 0
+#define CONFIG_VP8DSP 1 +#define CONFIG_VP8DSP 0
+#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0 +#define CONFIG_WMV2DSP 0
+#endif /* FFMPEG_CONFIG_H */ +#endif /* FFMPEG_CONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config_components.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config_components.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config_components.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/config_components.h
@@ -0,0 +1,2217 @@ @@ -0,0 +1,2218 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H +#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H
@ -3905,6 +3934,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_PRORES_METADATA_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0
+#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0
+#define CONFIG_SETTS_BSF 0 +#define CONFIG_SETTS_BSF 0
+#define CONFIG_SHOWINFO_BSF 0
+#define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_TRACE_HEADERS_BSF 0 +#define CONFIG_TRACE_HEADERS_BSF 0
+#define CONFIG_TRUEHD_CORE_BSF 0 +#define CONFIG_TRUEHD_CORE_BSF 0
@ -4140,7 +4170,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_TARGA_DECODER 0 +#define CONFIG_TARGA_DECODER 0
+#define CONFIG_TARGA_Y216_DECODER 0 +#define CONFIG_TARGA_Y216_DECODER 0
+#define CONFIG_TDSC_DECODER 0 +#define CONFIG_TDSC_DECODER 0
+#define CONFIG_THEORA_DECODER 1 +#define CONFIG_THEORA_DECODER 0
+#define CONFIG_THP_DECODER 0 +#define CONFIG_THP_DECODER 0
+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 +#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
+#define CONFIG_TIFF_DECODER 0 +#define CONFIG_TIFF_DECODER 0
@ -4171,14 +4201,14 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_VMDVIDEO_DECODER 0 +#define CONFIG_VMDVIDEO_DECODER 0
+#define CONFIG_VMIX_DECODER 0 +#define CONFIG_VMIX_DECODER 0
+#define CONFIG_VMNC_DECODER 0 +#define CONFIG_VMNC_DECODER 0
+#define CONFIG_VP3_DECODER 1 +#define CONFIG_VP3_DECODER 0
+#define CONFIG_VP4_DECODER 0 +#define CONFIG_VP4_DECODER 0
+#define CONFIG_VP5_DECODER 0 +#define CONFIG_VP5_DECODER 0
+#define CONFIG_VP6_DECODER 0 +#define CONFIG_VP6_DECODER 0
+#define CONFIG_VP6A_DECODER 0 +#define CONFIG_VP6A_DECODER 0
+#define CONFIG_VP6F_DECODER 0 +#define CONFIG_VP6F_DECODER 0
+#define CONFIG_VP7_DECODER 0 +#define CONFIG_VP7_DECODER 0
+#define CONFIG_VP8_DECODER 1 +#define CONFIG_VP8_DECODER 0
+#define CONFIG_VP8_RKMPP_DECODER 0 +#define CONFIG_VP8_RKMPP_DECODER 0
+#define CONFIG_VP8_V4L2M2M_DECODER 0 +#define CONFIG_VP8_V4L2M2M_DECODER 0
+#define CONFIG_VP9_DECODER 0 +#define CONFIG_VP9_DECODER 0
@ -4518,6 +4548,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_DNXHD_ENCODER 0 +#define CONFIG_DNXHD_ENCODER 0
+#define CONFIG_DPX_ENCODER 0 +#define CONFIG_DPX_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 0 +#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_DXV_ENCODER 0
+#define CONFIG_EXR_ENCODER 0 +#define CONFIG_EXR_ENCODER 0
+#define CONFIG_FFV1_ENCODER 0 +#define CONFIG_FFV1_ENCODER 0
+#define CONFIG_FFVHUFF_ENCODER 0 +#define CONFIG_FFVHUFF_ENCODER 0
@ -4878,8 +4909,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_TAK_PARSER 0 +#define CONFIG_TAK_PARSER 0
+#define CONFIG_VC1_PARSER 0 +#define CONFIG_VC1_PARSER 0
+#define CONFIG_VORBIS_PARSER 1 +#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1 +#define CONFIG_VP3_PARSER 0
+#define CONFIG_VP8_PARSER 1 +#define CONFIG_VP8_PARSER 0
+#define CONFIG_VP9_PARSER 1 +#define CONFIG_VP9_PARSER 1
+#define CONFIG_VVC_PARSER 0 +#define CONFIG_VVC_PARSER 0
+#define CONFIG_WEBP_PARSER 0 +#define CONFIG_WEBP_PARSER 0
@ -5491,8 +5522,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_AVSYNCTEST_FILTER 0 +#define CONFIG_AVSYNCTEST_FILTER 0
+#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0
+#define CONFIG_MOVIE_FILTER 0 +#define CONFIG_MOVIE_FILTER 0
+#define CONFIG_AFIFO_FILTER 0
+#define CONFIG_FIFO_FILTER 0
+#define CONFIG_AA_DEMUXER 0 +#define CONFIG_AA_DEMUXER 0
+#define CONFIG_AAC_DEMUXER 1 +#define CONFIG_AAC_DEMUXER 1
+#define CONFIG_AAX_DEMUXER 0 +#define CONFIG_AAX_DEMUXER 0
@ -5986,6 +6015,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_PCM_U8_MUXER 0 +#define CONFIG_PCM_U8_MUXER 0
+#define CONFIG_PSP_MUXER 0 +#define CONFIG_PSP_MUXER 0
+#define CONFIG_RAWVIDEO_MUXER 0 +#define CONFIG_RAWVIDEO_MUXER 0
+#define CONFIG_RCWT_MUXER 0
+#define CONFIG_RM_MUXER 0 +#define CONFIG_RM_MUXER 0
+#define CONFIG_ROQ_MUXER 0 +#define CONFIG_ROQ_MUXER 0
+#define CONFIG_RSO_MUXER 0 +#define CONFIG_RSO_MUXER 0
@ -6085,25 +6115,22 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */ +#endif /* FFMPEG_CONFIG_COMPONENTS_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/bsf_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/bsf_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/bsf_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/bsf_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFBitStreamFilter * const bitstream_filters[] = { +static const FFBitStreamFilter * const bitstream_filters[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/codec_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/codec_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/codec_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/codec_list.c
@@ -0,0 +1,22 @@ @@ -0,0 +1,19 @@
+static const FFCodec * const codec_list[] = { +static const FFCodec * const codec_list[] = {
+ &ff_h263_decoder, + &ff_h263_decoder,
+ &ff_h264_decoder, + &ff_h264_decoder,
+ &ff_mpeg4_decoder, + &ff_mpeg4_decoder,
+ &ff_theora_decoder,
+ &ff_vp3_decoder,
+ &ff_vp8_decoder,
+ &ff_aac_decoder, + &ff_aac_decoder,
+ &ff_flac_decoder, + &ff_flac_decoder,
+ &ff_mp3_decoder, + &ff_mp3_decoder,
@ -6119,11 +6146,11 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+ &ff_pcm_u8_decoder, + &ff_pcm_u8_decoder,
+ &ff_libopus_decoder, + &ff_libopus_decoder,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/parser_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/parser_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/parser_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavcodec/parser_list.c
@@ -0,0 +1,13 @@ @@ -0,0 +1,11 @@
+static const AVCodecParser * const parser_list[] = { +static const AVCodecParser * const parser_list[] = {
+ &ff_aac_parser, + &ff_aac_parser,
+ &ff_flac_parser, + &ff_flac_parser,
@ -6133,14 +6160,37 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+ &ff_mpegaudio_parser, + &ff_mpegaudio_parser,
+ &ff_opus_parser, + &ff_opus_parser,
+ &ff_vorbis_parser, + &ff_vorbis_parser,
+ &ff_vp3_parser,
+ &ff_vp8_parser,
+ &ff_vp9_parser, + &ff_vp9_parser,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/demuxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavdevice/indev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavdevice/indev_list.c
@@ -0,0 +1,2 @@
+static const AVInputFormat * const indev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavdevice/outdev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavdevice/outdev_list.c
@@ -0,0 +1,2 @@
+static const FFOutputFormat * const outdev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavfilter/filter_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavfilter/filter_list.c
@@ -0,0 +1,6 @@
+static const AVFilter * const filter_list[] = {
+ &ff_asrc_abuffer,
+ &ff_vsrc_buffer,
+ &ff_asink_abuffer,
+ &ff_vsink_buffer,
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/demuxer_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/demuxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/demuxer_list.c
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+static const AVInputFormat * const demuxer_list[] = { +static const AVInputFormat * const demuxer_list[] = {
+ &ff_aac_demuxer, + &ff_aac_demuxer,
@ -6152,24 +6202,24 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+ &ff_ogg_demuxer, + &ff_ogg_demuxer,
+ &ff_wav_demuxer, + &ff_wav_demuxer,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/muxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/muxer_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/muxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/muxer_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFOutputFormat * const muxer_list[] = { +static const FFOutputFormat * const muxer_list[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/protocol_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/protocol_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/protocol_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavformat/protocol_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const URLProtocol * const url_protocols[] = { +static const URLProtocol * const url_protocols[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/avconfig.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/avconfig.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/avconfig.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/avconfig.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+/* Generated by ffmpeg configure */ +/* Generated by ffmpeg configure */
+#ifndef AVUTIL_AVCONFIG_H +#ifndef AVUTIL_AVCONFIG_H
@ -6177,25 +6227,25 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/
+#define AV_HAVE_BIGENDIAN 0 +#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1 +#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */ +#endif /* AVUTIL_AVCONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/ffversion.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/ffversion.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/ffversion.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/ChromeOS/linux/ppc64/libavutil/ffversion.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+/* Automatically generated by version.sh, do not manually edit! */ +/* Automatically generated by version.sh, do not manually edit! */
+#ifndef AVUTIL_FFVERSION_H +#ifndef AVUTIL_FFVERSION_H
+#define AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H
+#define FFMPEG_VERSION "N-113309-gf89a6e7576" +#define FFMPEG_VERSION "N-113309-gf89a6e7576"
+#endif /* AVUTIL_FFVERSION_H */ +#endif /* AVUTIL_FFVERSION_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config.h
@@ -0,0 +1,768 @@ @@ -0,0 +1,772 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H +#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H
+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_123/NEW.BUILD_TEST/chromium-123.0.6312.58/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/CHROMIUM_REBUILD/CHROMIUM_124/NEW.BUILD_TEST/chromium-124.0.6367.60/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=ppc64le --extra-cflags='-mcpu=power8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2024 +#define CONFIG_THIS_YEAR 2024
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@ -6207,7 +6257,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define EXTERN_ASM +#define EXTERN_ASM
+#define BUILDSUF "" +#define BUILDSUF ""
+#define SLIBSUF ".so" +#define SLIBSUF ".so"
+#define HAVE_MMX2 HAVE_MMXEXT
+#define SWS_MAX_FILTER_SIZE 256 +#define SWS_MAX_FILTER_SIZE 256
+#define ARCH_AARCH64 0 +#define ARCH_AARCH64 0
+#define ARCH_ALPHA 0 +#define ARCH_ALPHA 0
@ -6439,6 +6488,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define HAVE_OPENCV2_CORE_CORE_C_H 0 +#define HAVE_OPENCV2_CORE_CORE_C_H 0
+#define HAVE_OPENGL_GL3_H 0 +#define HAVE_OPENGL_GL3_H 0
+#define HAVE_POLL_H 1 +#define HAVE_POLL_H 1
+#define HAVE_PTHREAD_NP_H 0
+#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SELECT_H 1
@ -6529,6 +6579,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define HAVE_POSIX_MEMALIGN 1 +#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
+#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_PTHREAD_CANCEL 1
+#define HAVE_PTHREAD_SET_NAME_NP 0
+#define HAVE_PTHREAD_SETNAME_NP 0
+#define HAVE_SCHED_GETAFFINITY 1 +#define HAVE_SCHED_GETAFFINITY 1
+#define HAVE_SECITEMIMPORT 0 +#define HAVE_SECITEMIMPORT 0
+#define HAVE_SETCONSOLETEXTATTRIBUTE 0 +#define HAVE_SETCONSOLETEXTATTRIBUTE 0
@ -6895,15 +6947,17 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_H264CHROMA 0 +#define CONFIG_H264CHROMA 0
+#define CONFIG_H264DSP 0 +#define CONFIG_H264DSP 0
+#define CONFIG_H264PARSE 0 +#define CONFIG_H264PARSE 0
+#define CONFIG_H264PRED 1 +#define CONFIG_H264PRED 0
+#define CONFIG_H264QPEL 0 +#define CONFIG_H264QPEL 0
+#define CONFIG_H264_SEI 0 +#define CONFIG_H264_SEI 0
+#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 0
+#define CONFIG_HEVC_SEI 0 +#define CONFIG_HEVC_SEI 0
+#define CONFIG_HPELDSP 1 +#define CONFIG_HPELDSP 0
+#define CONFIG_HUFFMAN 0 +#define CONFIG_HUFFMAN 0
+#define CONFIG_HUFFYUVDSP 0 +#define CONFIG_HUFFYUVDSP 0
+#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_HUFFYUVENCDSP 0
+#define CONFIG_IAMFDEC 0
+#define CONFIG_IAMFENC 0
+#define CONFIG_IDCTDSP 0 +#define CONFIG_IDCTDSP 0
+#define CONFIG_IIRFILTER 0 +#define CONFIG_IIRFILTER 0
+#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INFLATE_WRAPPER 0
@ -6953,18 +7007,18 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_VAAPI_1 0 +#define CONFIG_VAAPI_1 0
+#define CONFIG_VAAPI_ENCODE 0 +#define CONFIG_VAAPI_ENCODE 0
+#define CONFIG_VC1DSP 0 +#define CONFIG_VC1DSP 0
+#define CONFIG_VIDEODSP 1 +#define CONFIG_VIDEODSP 0
+#define CONFIG_VP3DSP 1 +#define CONFIG_VP3DSP 0
+#define CONFIG_VP56DSP 0 +#define CONFIG_VP56DSP 0
+#define CONFIG_VP8DSP 1 +#define CONFIG_VP8DSP 0
+#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0 +#define CONFIG_WMV2DSP 0
+#endif /* FFMPEG_CONFIG_H */ +#endif /* FFMPEG_CONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config_components.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config_components.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config_components.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/config_components.h
@@ -0,0 +1,2217 @@ @@ -0,0 +1,2218 @@
+/* Automatically generated by configure - do not modify! */ +/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H +#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H
@ -7002,6 +7056,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_PRORES_METADATA_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0
+#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0
+#define CONFIG_SETTS_BSF 0 +#define CONFIG_SETTS_BSF 0
+#define CONFIG_SHOWINFO_BSF 0
+#define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_TRACE_HEADERS_BSF 0 +#define CONFIG_TRACE_HEADERS_BSF 0
+#define CONFIG_TRUEHD_CORE_BSF 0 +#define CONFIG_TRUEHD_CORE_BSF 0
@ -7237,7 +7292,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_TARGA_DECODER 0 +#define CONFIG_TARGA_DECODER 0
+#define CONFIG_TARGA_Y216_DECODER 0 +#define CONFIG_TARGA_Y216_DECODER 0
+#define CONFIG_TDSC_DECODER 0 +#define CONFIG_TDSC_DECODER 0
+#define CONFIG_THEORA_DECODER 1 +#define CONFIG_THEORA_DECODER 0
+#define CONFIG_THP_DECODER 0 +#define CONFIG_THP_DECODER 0
+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 +#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
+#define CONFIG_TIFF_DECODER 0 +#define CONFIG_TIFF_DECODER 0
@ -7268,14 +7323,14 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_VMDVIDEO_DECODER 0 +#define CONFIG_VMDVIDEO_DECODER 0
+#define CONFIG_VMIX_DECODER 0 +#define CONFIG_VMIX_DECODER 0
+#define CONFIG_VMNC_DECODER 0 +#define CONFIG_VMNC_DECODER 0
+#define CONFIG_VP3_DECODER 1 +#define CONFIG_VP3_DECODER 0
+#define CONFIG_VP4_DECODER 0 +#define CONFIG_VP4_DECODER 0
+#define CONFIG_VP5_DECODER 0 +#define CONFIG_VP5_DECODER 0
+#define CONFIG_VP6_DECODER 0 +#define CONFIG_VP6_DECODER 0
+#define CONFIG_VP6A_DECODER 0 +#define CONFIG_VP6A_DECODER 0
+#define CONFIG_VP6F_DECODER 0 +#define CONFIG_VP6F_DECODER 0
+#define CONFIG_VP7_DECODER 0 +#define CONFIG_VP7_DECODER 0
+#define CONFIG_VP8_DECODER 1 +#define CONFIG_VP8_DECODER 0
+#define CONFIG_VP8_RKMPP_DECODER 0 +#define CONFIG_VP8_RKMPP_DECODER 0
+#define CONFIG_VP8_V4L2M2M_DECODER 0 +#define CONFIG_VP8_V4L2M2M_DECODER 0
+#define CONFIG_VP9_DECODER 0 +#define CONFIG_VP9_DECODER 0
@ -7615,6 +7670,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_DNXHD_ENCODER 0 +#define CONFIG_DNXHD_ENCODER 0
+#define CONFIG_DPX_ENCODER 0 +#define CONFIG_DPX_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 0 +#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_DXV_ENCODER 0
+#define CONFIG_EXR_ENCODER 0 +#define CONFIG_EXR_ENCODER 0
+#define CONFIG_FFV1_ENCODER 0 +#define CONFIG_FFV1_ENCODER 0
+#define CONFIG_FFVHUFF_ENCODER 0 +#define CONFIG_FFVHUFF_ENCODER 0
@ -7975,8 +8031,8 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_TAK_PARSER 0 +#define CONFIG_TAK_PARSER 0
+#define CONFIG_VC1_PARSER 0 +#define CONFIG_VC1_PARSER 0
+#define CONFIG_VORBIS_PARSER 1 +#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1 +#define CONFIG_VP3_PARSER 0
+#define CONFIG_VP8_PARSER 1 +#define CONFIG_VP8_PARSER 0
+#define CONFIG_VP9_PARSER 1 +#define CONFIG_VP9_PARSER 1
+#define CONFIG_VVC_PARSER 0 +#define CONFIG_VVC_PARSER 0
+#define CONFIG_WEBP_PARSER 0 +#define CONFIG_WEBP_PARSER 0
@ -8588,8 +8644,6 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_AVSYNCTEST_FILTER 0 +#define CONFIG_AVSYNCTEST_FILTER 0
+#define CONFIG_AMOVIE_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0
+#define CONFIG_MOVIE_FILTER 0 +#define CONFIG_MOVIE_FILTER 0
+#define CONFIG_AFIFO_FILTER 0
+#define CONFIG_FIFO_FILTER 0
+#define CONFIG_AA_DEMUXER 0 +#define CONFIG_AA_DEMUXER 0
+#define CONFIG_AAC_DEMUXER 0 +#define CONFIG_AAC_DEMUXER 0
+#define CONFIG_AAX_DEMUXER 0 +#define CONFIG_AAX_DEMUXER 0
@ -9083,6 +9137,7 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_PCM_U8_MUXER 0 +#define CONFIG_PCM_U8_MUXER 0
+#define CONFIG_PSP_MUXER 0 +#define CONFIG_PSP_MUXER 0
+#define CONFIG_RAWVIDEO_MUXER 0 +#define CONFIG_RAWVIDEO_MUXER 0
+#define CONFIG_RCWT_MUXER 0
+#define CONFIG_RM_MUXER 0 +#define CONFIG_RM_MUXER 0
+#define CONFIG_ROQ_MUXER 0 +#define CONFIG_ROQ_MUXER 0
+#define CONFIG_RSO_MUXER 0 +#define CONFIG_RSO_MUXER 0
@ -9182,22 +9237,19 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_COMPONENTS_H */ +#endif /* FFMPEG_CONFIG_COMPONENTS_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/bsf_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/bsf_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/bsf_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/bsf_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFBitStreamFilter * const bitstream_filters[] = { +static const FFBitStreamFilter * const bitstream_filters[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/codec_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/codec_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/codec_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/codec_list.c
@@ -0,0 +1,18 @@ @@ -0,0 +1,15 @@
+static const FFCodec * const codec_list[] = { +static const FFCodec * const codec_list[] = {
+ &ff_theora_decoder,
+ &ff_vp3_decoder,
+ &ff_vp8_decoder,
+ &ff_flac_decoder, + &ff_flac_decoder,
+ &ff_mp3_decoder, + &ff_mp3_decoder,
+ &ff_vorbis_decoder, + &ff_vorbis_decoder,
@ -9212,24 +9264,47 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+ &ff_pcm_u8_decoder, + &ff_pcm_u8_decoder,
+ &ff_libopus_decoder, + &ff_libopus_decoder,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/parser_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/parser_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/parser_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavcodec/parser_list.c
@@ -0,0 +1,9 @@ @@ -0,0 +1,7 @@
+static const AVCodecParser * const parser_list[] = { +static const AVCodecParser * const parser_list[] = {
+ &ff_flac_parser, + &ff_flac_parser,
+ &ff_mpegaudio_parser, + &ff_mpegaudio_parser,
+ &ff_opus_parser, + &ff_opus_parser,
+ &ff_vorbis_parser, + &ff_vorbis_parser,
+ &ff_vp3_parser,
+ &ff_vp8_parser,
+ &ff_vp9_parser, + &ff_vp9_parser,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/demuxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavdevice/indev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavdevice/indev_list.c
@@ -0,0 +1,2 @@
+static const AVInputFormat * const indev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavdevice/outdev_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavdevice/outdev_list.c
@@ -0,0 +1,2 @@
+static const FFOutputFormat * const outdev_list[] = {
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavfilter/filter_list.c
===================================================================
--- /dev/null
+++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavfilter/filter_list.c
@@ -0,0 +1,6 @@
+static const AVFilter * const filter_list[] = {
+ &ff_asrc_abuffer,
+ &ff_vsrc_buffer,
+ &ff_asink_abuffer,
+ &ff_vsink_buffer,
+ NULL };
Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/demuxer_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/demuxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/demuxer_list.c
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+static const AVInputFormat * const demuxer_list[] = { +static const AVInputFormat * const demuxer_list[] = {
+ &ff_flac_demuxer, + &ff_flac_demuxer,
@ -9239,24 +9314,24 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+ &ff_ogg_demuxer, + &ff_ogg_demuxer,
+ &ff_wav_demuxer, + &ff_wav_demuxer,
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/muxer_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/muxer_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/muxer_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/muxer_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const FFOutputFormat * const muxer_list[] = { +static const FFOutputFormat * const muxer_list[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/protocol_list.c Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/protocol_list.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/protocol_list.c +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavformat/protocol_list.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+static const URLProtocol * const url_protocols[] = { +static const URLProtocol * const url_protocols[] = {
+ NULL }; + NULL };
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/avconfig.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/avconfig.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/avconfig.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/avconfig.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+/* Generated by ffmpeg configure */ +/* Generated by ffmpeg configure */
+#ifndef AVUTIL_AVCONFIG_H +#ifndef AVUTIL_AVCONFIG_H
@ -9264,21 +9339,21 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/
+#define AV_HAVE_BIGENDIAN 0 +#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1 +#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */ +#endif /* AVUTIL_AVCONFIG_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/ffversion.h Index: chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/ffversion.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/ffversion.h +++ chromium-124.0.6367.60/third_party/ffmpeg/chromium/config/Chromium/linux/ppc64/libavutil/ffversion.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+/* Automatically generated by version.sh, do not manually edit! */ +/* Automatically generated by version.sh, do not manually edit! */
+#ifndef AVUTIL_FFVERSION_H +#ifndef AVUTIL_FFVERSION_H
+#define AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H
+#define FFMPEG_VERSION "N-113309-gf89a6e7576" +#define FFMPEG_VERSION "N-113309-gf89a6e7576"
+#endif /* AVUTIL_FFVERSION_H */ +#endif /* AVUTIL_FFVERSION_H */
Index: chromium-123.0.6312.58/third_party/ffmpeg/ffmpeg_generated.gni Index: chromium-124.0.6367.60/third_party/ffmpeg/ffmpeg_generated.gni
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/ffmpeg/ffmpeg_generated.gni --- chromium-124.0.6367.60.orig/third_party/ffmpeg/ffmpeg_generated.gni
+++ chromium-123.0.6312.58/third_party/ffmpeg/ffmpeg_generated.gni +++ chromium-124.0.6367.60/third_party/ffmpeg/ffmpeg_generated.gni
@@ -315,6 +315,40 @@ if ((use_linux_config && current_cpu == @@ -281,6 +281,40 @@ if ((is_apple && ffmpeg_branding == "Chr
] ]
} }
@ -9316,13 +9391,13 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/ffmpeg_generated.gni
+ ] + ]
+} +}
+ +
if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
ffmpeg_c_sources += [ (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
"libavcodec/x86/h264_qpel.c", (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
Index: chromium-123.0.6312.58/third_party/ffmpeg/libavcodec/ppc/h264dsp_ppc.c Index: chromium-124.0.6367.60/third_party/ffmpeg/libavcodec/ppc/h264dsp_ppc.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/libavcodec/ppc/h264dsp_ppc.c +++ chromium-124.0.6367.60/third_party/ffmpeg/libavcodec/ppc/h264dsp_ppc.c
@@ -0,0 +1,815 @@ @@ -0,0 +1,815 @@
+/* +/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org> + * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>
@ -10139,10 +10214,10 @@ Index: chromium-123.0.6312.58/third_party/ffmpeg/libavcodec/ppc/h264dsp_ppc.c
+ } + }
+#endif /* HAVE_ALTIVEC */ +#endif /* HAVE_ALTIVEC */
+} +}
Index: chromium-123.0.6312.58/third_party/ffmpeg/libavcodec/ppc/h264qpel_ppc.c Index: chromium-124.0.6367.60/third_party/ffmpeg/libavcodec/ppc/h264qpel_ppc.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ chromium-123.0.6312.58/third_party/ffmpeg/libavcodec/ppc/h264qpel_ppc.c +++ chromium-124.0.6367.60/third_party/ffmpeg/libavcodec/ppc/h264qpel_ppc.c
@@ -0,0 +1,315 @@ @@ -0,0 +1,315 @@
+/* +/*
+ * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org> + * Copyright (c) 2004 Romain Dolbeau <romain@dolbeau.org>

24
SOURCES/HACK-third_party-libvpx-use-generic-gnu.patch
Unescape View File

@ -1,8 +1,6 @@
Index: chromium-120.0.6099.71/third_party/libvpx/generate_gni.sh --- a/third_party/libvpx/generate_gni.sh
=================================================================== +++ b/third_party/libvpx/generate_gni.sh
--- chromium-120.0.6099.71.orig/third_party/libvpx/generate_gni.sh @@ -423,7 +423,7 @@ gen_config_files linux/mipsel "--target=
+++ chromium-120.0.6099.71/third_party/libvpx/generate_gni.sh
@@ -411,7 +411,7 @@ gen_config_files linux/mipsel "--target=
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}" gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
gen_config_files linux/loongarch \ gen_config_files linux/loongarch \
"--target=loongarch64-linux-gcc ${all_platforms}" "--target=loongarch64-linux-gcc ${all_platforms}"
@ -10,11 +8,9 @@ Index: chromium-120.0.6099.71/third_party/libvpx/generate_gni.sh
+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}" +gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}" gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
gen_config_files win/arm64-highbd \ gen_config_files win/arm64-highbd \
"--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}" "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}"
Index: chromium-120.0.6099.71/third_party/libvpx/source/libvpx/build/make/rtcd.pl --- a/third_party/libvpx/source/libvpx/build/make/rtcd.pl
=================================================================== +++ b/third_party/libvpx/source/libvpx/build/make/rtcd.pl
--- chromium-120.0.6099.71.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
+++ chromium-120.0.6099.71/third_party/libvpx/source/libvpx/build/make/rtcd.pl
@@ -492,8 +492,9 @@ if ($opts{arch} eq 'x86') { @@ -492,8 +492,9 @@ if ($opts{arch} eq 'x86') {
&require(@REQUIRES); &require(@REQUIRES);
arm; arm;
@ -27,11 +23,9 @@ Index: chromium-120.0.6099.71/third_party/libvpx/source/libvpx/build/make/rtcd.p
} elsif ($opts{arch} =~ /loongarch/ ) { } elsif ($opts{arch} =~ /loongarch/ ) {
@ALL_ARCHS = filter(qw/lsx lasx/); @ALL_ARCHS = filter(qw/lsx lasx/);
loongarch; loongarch;
Index: chromium-120.0.6099.71/third_party/libvpx/BUILD.gn --- a/third_party/libvpx/BUILD.gn
=================================================================== +++ b/third_party/libvpx/BUILD.gn
--- chromium-120.0.6099.71.orig/third_party/libvpx/BUILD.gn @@ -94,6 +94,14 @@ config("libvpx_config") {
+++ chromium-120.0.6099.71/third_party/libvpx/BUILD.gn
@@ -93,6 +93,14 @@ config("libvpx_config") {
"-Wno-sign-compare", "-Wno-sign-compare",
] ]
} }

57
SOURCES/chromium-115-clang-warnings.patch
Unescape View File

@ -1,57 +0,0 @@
diff -up chromium-115.0.5790.98/sql/recover_module/cursor.h.me chromium-115.0.5790.98/sql/recover_module/cursor.h
--- chromium-115.0.5790.98/sql/recover_module/cursor.h.me 2023-07-21 20:13:43.587451992 +0200
+++ chromium-115.0.5790.98/sql/recover_module/cursor.h 2023-07-21 20:16:24.989457148 +0200
@@ -61,6 +61,10 @@ class VirtualCursor {
// The VirtualCursor instance that embeds a given SQLite virtual table cursor.
//
// |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
+#endif
static inline VirtualCursor* FromSqliteCursor(
sqlite3_vtab_cursor* sqlite_cursor) {
VirtualCursor* result = reinterpret_cast<VirtualCursor*>(
@@ -69,6 +73,9 @@ class VirtualCursor {
CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
return result;
}
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
// Seeks the cursor to the first readable row. Returns a SQLite status code.
int First();
diff -up chromium-115.0.5790.98/third_party/angle/src/libANGLE/BlobCache.cpp.me chromium-115.0.5790.98/third_party/angle/src/libANGLE/BlobCache.cpp
--- chromium-115.0.5790.98/third_party/angle/src/libANGLE/BlobCache.cpp.me 2023-07-21 20:10:05.119385885 +0200
+++ chromium-115.0.5790.98/third_party/angle/src/libANGLE/BlobCache.cpp 2023-07-21 20:10:14.386558331 +0200
@@ -14,7 +14,6 @@
#include "libANGLE/histogram_macros.h"
#include "platform/PlatformMethods.h"
-#define USE_SYSTEM_ZLIB
#include "compression_utils_portable.h"
namespace egl
diff -up chromium-115.0.5790.98/third_party/angle/src/libANGLE/MemoryProgramCache.cpp.me chromium-115.0.5790.98/third_party/angle/src/libANGLE/MemoryProgramCache.cpp
--- chromium-115.0.5790.98/third_party/angle/src/libANGLE/MemoryProgramCache.cpp.me 2023-07-21 20:10:36.864976619 +0200
+++ chromium-115.0.5790.98/third_party/angle/src/libANGLE/MemoryProgramCache.cpp 2023-07-21 20:11:07.629549228 +0200
@@ -8,7 +8,6 @@
// layer to warm up the cache from disk.
// Include zlib first, otherwise FAR gets defined elsewhere.
-#define USE_SYSTEM_ZLIB
#include "compression_utils_portable.h"
#include "libANGLE/MemoryProgramCache.h"
diff -up chromium-115.0.5790.98/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp.me chromium-115.0.5790.98/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp
--- chromium-115.0.5790.98/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp.me 2023-07-21 20:09:44.206996746 +0200
+++ chromium-115.0.5790.98/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp 2023-07-21 20:09:51.834138674 +0200
@@ -10,7 +10,6 @@
#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h"
-#define USE_SYSTEM_ZLIB
#include "compression_utils_portable.h"
namespace rx

13
SOURCES/chromium-122-arm64-memory_tagging.patch
Unescape View File

@ -1,13 +0,0 @@
diff -up chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni.me chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni
--- chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni.me 2024-02-22 20:22:44.115269845 +0100
+++ chromium-122.0.6261.57/base/allocator/partition_allocator/partition_alloc.gni 2024-02-22 20:23:07.067681890 +0100
@@ -29,8 +29,7 @@ if (is_nacl) {
assert(false, "Unknown CPU: $current_cpu")
}
-has_memory_tagging =
- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
+has_memory_tagging = false
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,

27
SOURCES/chromium-123-python3-assignment-expressions.patch
Unescape View File

@ -1,27 +0,0 @@
diff -up chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py
--- chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me 2024-02-23 12:04:45.451423995 +0100
+++ chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py 2024-02-23 12:18:04.099824392 +0100
@@ -124,7 +124,8 @@ def _GenerateH(basepath, fileroot, head,
f.write(u'#include <cstddef>\n')
f.write(u'\n')
- if system_headers := schema.get(u'system-headers', []):
+ system_headers = schema.get(u'system-headers', [])
+ if system_headers:
for header in system_headers:
f.write(u'#include <%s>\n' % header)
f.write(u'\n')
diff -up chromium-123.0.6312.46/tools/metrics/histograms/expand_owners.py.me chromium-123.0.6312.46/tools/metrics/histograms/expand_owners.py
--- chromium-123.0.6312.46/tools/metrics/histograms/expand_owners.py.me 2024-03-18 14:40:57.871904209 +0100
+++ chromium-123.0.6312.46/tools/metrics/histograms/expand_owners.py 2024-03-18 14:47:12.238907146 +0100
@@ -209,8 +209,8 @@ def _ComponentFromDirmd(json_data, subpa
"""
dirmd = json_data.get('dirs', {}).get(subpath, {})
# If a public Buganizer component is listed, return its component ID.
- if buganizer_component := dirmd.get('buganizerPublic',
- {}).get('componentId', ''):
+ buganizer_component = dirmd.get('buganizerPublic',{}).get('componentId', '')
+ if buganizer_component:
return buganizer_component
# If no component exists for the directory, or if METADATA migration is
# incomplete there will be no component information.

46
SOURCES/chromium-123-shape_result-assert.patch
Unescape View File

@ -1,46 +0,0 @@
commit 4bdca157e7edfeb5b9c0ac77e3afbfe288f7f9cf
Author: Stefan Zager <szager@chromium.org>
Date: Mon Feb 26 02:36:37 2024 +0000
Make SameSizeAsShapeResult robust against uncommon gn args
When using uncommon build configurations, it's currently possible
to fail this assert due to details of struct field packing:
ASSERT_SIZE(ShapeResult, SameSizeAsShapeResult);
In particular, `cppgc_enable_pointer_compression = false` in args.gn
will trigger it.
This changes makes the struct layout of SameSizeAsShapeResult more
closely match that of ShapeResult, which should make it harder to
fail the assert.
Change-Id: I7406b0ac333303b6808807fa1eaf5cbecb85d858
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5323558
Auto-Submit: Stefan Zager <szager@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1265024}
diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
index 28aabc7d66cd8..a2bfdec2775e4 100644
--- a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
@@ -78,10 +78,13 @@ struct SameSizeAsRunInfo {
ASSERT_SIZE(ShapeResult::RunInfo, SameSizeAsRunInfo);
struct SameSizeAsShapeResult {
- Vector<int> vectors[2];
- UntracedMember<void*> members[2];
float width;
- unsigned integers[2];
+ UntracedMember<void*> deprecated_ink_bounds_;
+ Vector<int> runs_;
+ Vector<int> character_position_;
+ UntracedMember<void*> primary_font_;
+ unsigned start_index_;
+ unsigned num_characters_;
unsigned bitfields : 32;
};

13
SOURCES/chromium-124-arm64-memory_tagging.patch
Unescape View File

@ -0,0 +1,13 @@
diff -up chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni
--- chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me 2024-04-18 15:12:34.007397489 +0200
+++ chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni 2024-04-18 15:13:06.166051954 +0200
@@ -32,8 +32,7 @@ if (is_nacl) {
# Increases the size of the empty slot span ring.
use_large_empty_slot_span_ring = is_mac
-has_memory_tagging =
- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
+has_memory_tagging = false
declare_args() {
# Causes all the allocations to be routed via allocator_shim.cc. Usually,

10
SOURCES/chromium-122-clang16-buildflags.patch → SOURCES/chromium-124-clang16-buildflags.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up chromium-122.0.6261.39/build/config/compiler/BUILD.gn.me chromium-122.0.6261.39/build/config/compiler/BUILD.gn diff -up chromium-124.0.6367.49/build/config/compiler/BUILD.gn.orig chromium-124.0.6367.49/build/config/compiler/BUILD.gn
--- chromium-122.0.6261.39/build/config/compiler/BUILD.gn.me 2024-02-19 21:58:15.835818177 +0100 --- chromium-124.0.6367.49/build/config/compiler/BUILD.gn.orig 2024-04-14 22:43:02.906578948 +0200
+++ chromium-122.0.6261.39/build/config/compiler/BUILD.gn 2024-02-19 21:59:11.661880633 +0100 +++ chromium-124.0.6367.49/build/config/compiler/BUILD.gn 2024-04-14 22:46:19.513353809 +0200
@@ -1856,15 +1856,12 @@ config("default_warnings") { @@ -1890,9 +1890,6 @@ config("default_warnings") {
# TODO(crbug.com/1494809): Evaluate and possibly enable. # TODO(crbug.com/1494809): Evaluate and possibly enable.
"-Wno-vla-extension", "-Wno-vla-extension",
@ -10,6 +10,8 @@ diff -up chromium-122.0.6261.39/build/config/compiler/BUILD.gn.me chromium-122.0
- "-Wno-thread-safety-reference-return", - "-Wno-thread-safety-reference-return",
] ]
cflags_cc += [
@@ -1903,7 +1900,7 @@ config("default_warnings") {
if (!is_nacl) { if (!is_nacl) {
cflags_cc += [ cflags_cc += [
# TODO(https://crbug.com/1513724): Fix and re-enable. # TODO(https://crbug.com/1513724): Fix and re-enable.

75
SOURCES/chromium-122-el8-support-64kpage.patch → SOURCES/chromium-124-el8-support-64kpage.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100 --- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig 2024-04-12 21:56:54.000000000 +0200
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h 2024-02-01 17:20:37.178877448 +0100 +++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h 2024-04-14 20:53:16.043867871 +0200
@@ -146,7 +146,13 @@ struct PartitionBucket { @@ -147,7 +147,13 @@ struct PartitionBucket {
// Returns a slot number starting from the beginning of the slot span. // Returns a slot number starting from the beginning of the slot span.
PA_ALWAYS_INLINE size_t GetSlotNumber(size_t offset_in_slot_span) const { PA_ALWAYS_INLINE size_t GetSlotNumber(size_t offset_in_slot_span) const {
// See the static assertion for `kReciprocalShift` above. // See the static assertion for `kReciprocalShift` above.
@ -12,17 +12,17 @@ diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partitio
+ // from overlapping. For now this will allow 64k pages + // from overlapping. For now this will allow 64k pages
+ // to function on Aarch64/Linux systems, albeit not + // to function on Aarch64/Linux systems, albeit not
+ // very efficiently. + // very efficiently.
+ // PA_DCHECK(offset_in_slot_span <= kMaxBucketed); + PA_DCHECK(internal::SystemPageSize() == (size_t{1} << 16) || offset_in_slot_span <= kMaxBucketed);
PA_DCHECK(slot_size <= kMaxBucketed); PA_DCHECK(slot_size <= kMaxBucketed);
const size_t offset_in_slot = const size_t offset_in_slot =
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.el8-support-64kpage.patch 2024-02-01 17:20:37.178877448 +0100 --- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-04-14 20:53:16.043867871 +0200
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h 2024-02-01 17:31:08.500268457 +0100 +++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h 2024-04-14 21:39:18.147052845 +0200
@@ -17,10 +17,8 @@ namespace partition_alloc::internal { @@ -17,10 +17,8 @@ namespace partition_alloc::internal {
// PartitionPageSize() is 4 times the OS page size. // PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) #elif defined(PARTITION_ALLOCATOR_CONSTANTS_POSIX_NONCONST_PAGE_SIZE)
-// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is -// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
-// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, -// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
-// so we use the 16 kiB maximum (64 kiB will crash). -// so we use the 16 kiB maximum (64 kiB will crash).
@ -32,10 +32,30 @@ diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partitio
#else #else
// A slot span can "span" multiple PartitionPages, but then its slot size is // A slot span can "span" multiple PartitionPages, but then its slot size is
// larger, so it doesn't have as many slots. // larger, so it doesn't have as many slots.
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100 --- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-14 20:53:16.044867889 +0200
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_page.h 2024-02-01 17:20:37.178877448 +0100 +++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc 2024-04-14 21:50:57.926716718 +0200
@@ -95,26 +95,25 @@ struct SlotSpanMetadata { @@ -952,12 +952,11 @@ void PartitionRoot::Init(PartitionOption
(internal::SystemPageSize() == (size_t{1} << 14)));
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
// Check runtime pagesize. Though the code is currently the same, it is
- // not merged with the IS_APPLE case above as a 1 << 16 case needs to be
- // added here in the future, to allow 64 kiB pagesize. That is only
- // supported on Linux on arm64, not on IS_APPLE, but not yet present here
- // as the rest of the PartitionAlloc does not currently support it.
+ // not merged with the IS_APPLE case above as a 1 << 16 case is only
+ // supported on Linux on AArch64.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
- (internal::SystemPageSize() == (size_t{1} << 14)));
+ (internal::SystemPageSize() == (size_t{1} << 14)) ||
+ (internal::SystemPageSize() == (size_t{1} << 16)));
#endif
::partition_alloc::internal::ScopedGuard guard{lock_};
diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
--- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me 2024-04-14 22:08:40.655011536 +0200
+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h 2024-04-14 22:12:46.665731577 +0200
@@ -86,27 +86,25 @@ struct SlotSpanMetadata {
// CHECK()ed in AllocNewSlotSpan(). // CHECK()ed in AllocNewSlotSpan().
// The maximum number of bits needed to cover all currently supported OSes. // The maximum number of bits needed to cover all currently supported OSes.
@ -66,14 +86,15 @@ diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partitio
// If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be // If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be
// used. // used.
- uint16_t in_empty_cache_ : 1; - uint16_t in_empty_cache_ : 1;
- uint16_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans. - uint16_t empty_cache_index_
- uint16_t unused2_ : (16 - 1 - kEmptyCacheIndexBits); - : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans.
- uint16_t unused2_ : (16 - 1 - kMaxEmptyCacheIndexBits);
+ bool in_empty_cache_ : 1; + bool in_empty_cache_ : 1;
+ uint8_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans. + uint8_t empty_cache_index_ : kEmptyCacheIndexBits; // < kMaxFreeableSpans.
// Can use only 48 bits (6B) in this bitfield, as this structure is embedded // Can use only 48 bits (6B) in this bitfield, as this structure is embedded
// in PartitionPage which has 2B worth of fields and must fit in 32B. // in PartitionPage which has 2B worth of fields and must fit in 32B.
@@ -279,18 +278,13 @@ static_assert(sizeof(SlotSpanMetadata) < @@ -246,18 +244,13 @@ static_assert(sizeof(SlotSpanMetadata) <
"SlotSpanMetadata must fit into a Page Metadata slot."); "SlotSpanMetadata must fit into a Page Metadata slot.");
inline constexpr SlotSpanMetadata::SlotSpanMetadata() noexcept inline constexpr SlotSpanMetadata::SlotSpanMetadata() noexcept
@ -95,7 +116,7 @@ diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partitio
inline SlotSpanMetadata::SlotSpanMetadata(const SlotSpanMetadata&) = default; inline SlotSpanMetadata::SlotSpanMetadata(const SlotSpanMetadata&) = default;
@@ -883,7 +877,7 @@ PA_ALWAYS_INLINE void SlotSpanMetadata:: @@ -752,7 +745,7 @@ PA_ALWAYS_INLINE void SlotSpanMetadata::
size_t num_slots_per_span = bucket->get_slots_per_span(); size_t num_slots_per_span = bucket->get_slots_per_span();
PA_DCHECK(num_slots_per_span <= kMaxSlotsPerSlotSpan); PA_DCHECK(num_slots_per_span <= kMaxSlotsPerSlotSpan);
@ -104,23 +125,3 @@ diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partitio
PA_DCHECK(num_unprovisioned_slots); PA_DCHECK(num_unprovisioned_slots);
ToSuperPageExtent()->IncrementNumberOfNonemptySlotSpans(); ToSuperPageExtent()->IncrementNumberOfNonemptySlotSpans();
diff -up chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.el8-support-64kpage.patch chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
--- chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.el8-support-64kpage.patch 2024-01-30 21:24:10.000000000 +0100
+++ chromium-121.0.6167.139/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc 2024-02-01 17:20:37.178877448 +0100
@@ -950,12 +950,11 @@ void PartitionRoot::Init(PartitionOption
(internal::SystemPageSize() == (size_t{1} << 14)));
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
// Check runtime pagesize. Though the code is currently the same, it is
- // not merged with the IS_APPLE case above as a 1 << 16 case needs to be
- // added here in the future, to allow 64 kiB pagesize. That is only
- // supported on Linux on arm64, not on IS_APPLE, but not yet present here
- // as the rest of the partition allocator does not currently support it.
+ // not merged with the IS_APPLE case above as a 1 << 16 case is only
+ // supported on Linux on AArch64.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
- (internal::SystemPageSize() == (size_t{1} << 14)));
+ (internal::SystemPageSize() == (size_t{1} << 14)) ||
+ (internal::SystemPageSize() == (size_t{1} << 16)));
#endif
::partition_alloc::internal::ScopedGuard guard{lock_};

11
SOURCES/chromium-124-libavif-deps.patch
Unescape View File

@ -0,0 +1,11 @@
diff -up chromium-124.0.6367.49/third_party/libavif/BUILD.gn.me chromium-124.0.6367.49/third_party/libavif/BUILD.gn
--- chromium-124.0.6367.49/third_party/libavif/BUILD.gn.me 2024-04-15 22:29:28.024287328 +0200
+++ chromium-124.0.6367.49/third_party/libavif/BUILD.gn 2024-04-15 22:29:33.205411066 +0200
@@ -85,7 +85,6 @@ component("libavif_enc") {
configs += [ ":avif_config" ]
deps = [
- "//third_party/libwebp:libwebp_sharpyuv",
"//third_party/libyuv",
]
defines = [ "AVIF_LIBSHARPYUV_ENABLED" ]

53
SOURCES/chromium-124-libdav1d-aarch64.patch
Unescape View File

@ -0,0 +1,53 @@
--- chromium-124.0.6367.60/third_party/dav1d/libdav1d/src/arm/asm.S 2024-04-15 22:34:36.000000000 +0200
+++ chromium-122.0.6261.128/third_party/dav1d/libdav1d/src/arm/asm.S 2024-03-13 00:38:27.000000000 +0100
@@ -34,50 +34,6 @@
#define x18 do_not_use_x18
#define w18 do_not_use_w18
-#if HAVE_AS_ARCH_DIRECTIVE
- .arch AS_ARCH_LEVEL
-#endif
-
-#if HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE
-#define ENABLE_DOTPROD .arch_extension dotprod
-#define DISABLE_DOTPROD .arch_extension nodotprod
-#else
-#define ENABLE_DOTPROD
-#define DISABLE_DOTPROD
-#endif
-#if HAVE_AS_ARCHEXT_I8MM_DIRECTIVE
-#define ENABLE_I8MM .arch_extension i8mm
-#define DISABLE_I8MM .arch_extension noi8mm
-#else
-#define ENABLE_I8MM
-#define DISABLE_I8MM
-#endif
-#if HAVE_AS_ARCHEXT_SVE_DIRECTIVE
-#define ENABLE_SVE .arch_extension sve
-#define DISABLE_SVE .arch_extension nosve
-#else
-#define ENABLE_SVE
-#define DISABLE_SVE
-#endif
-#if HAVE_AS_ARCHEXT_SVE2_DIRECTIVE
-#define ENABLE_SVE2 .arch_extension sve2
-#define DISABLE_SVE2 .arch_extension nosve2
-#else
-#define ENABLE_SVE2
-#define DISABLE_SVE2
-#endif
-
-/* If we do support the .arch_extension directives, disable support for all
- * the extensions that we may use, in case they were implicitly enabled by
- * the .arch level. This makes it clear if we try to assemble an instruction
- * from an unintended extension set; we only allow assmbling such instructions
- * within regions where we explicitly enable those extensions. */
-DISABLE_DOTPROD
-DISABLE_I8MM
-DISABLE_SVE
-DISABLE_SVE2
-
-
/* Support macros for
* - Armv8.3-A Pointer Authentication and
* - Armv8.5-A Branch Target Identification

13
SOURCES/chromium-124-python3-assignment-expressions.patch
Unescape View File

@ -0,0 +1,13 @@
diff -up chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py
--- chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py.me 2024-02-23 12:04:45.451423995 +0100
+++ chromium-122.0.6261.57/tools/json_to_struct/json_to_struct.py 2024-02-23 12:18:04.099824392 +0100
@@ -124,7 +124,8 @@ def _GenerateH(basepath, fileroot, head,
f.write(u'#include <cstddef>\n')
f.write(u'\n')
- if system_headers := schema.get(u'system-headers', []):
+ system_headers = schema.get(u'system-headers', [])
+ if system_headers:
for header in system_headers:
f.write(u'#include <%s>\n' % header)
f.write(u'\n')

88
SOURCES/chromium-124-wayland-regression.patch
Unescape View File

@ -0,0 +1,88 @@
commit c7f4c58f896a651eba80ad805ebdb49d19ebdbd4
Author: Tom Anderson <thomasanderson@chromium.org>
Date: Wed Mar 20 00:00:12 2024 +0000
Fix --ozone-platform-hint
This fixes a regression after r1269993 which moved ozone platform
early initialization before the ozone platform hint flag was
processed. This CL ensures the flag processing happens even earlier.
R=sky
Change-Id: Icc9649beb0b86753265be2b6cdf3059611eb410f
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5375669
Reviewed-by: Scott Violet <sky@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1275306}
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 73b6ab0934b14..0b4c44be679d0 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -249,6 +249,9 @@
#include "base/scoped_add_feature_flags.h"
#include "ui/base/ui_base_features.h"
#include "ui/ozone/public/ozone_platform.h"
+#if BUILDFLAG(IS_LINUX)
+#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
+#endif
#endif // BUILDFLAG(IS_OZONE)
base::LazyInstance<ChromeContentGpuClient>::DestructorAtExit
@@ -959,6 +962,9 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
// Initialize Ozone platform and add required feature flags as per platform's
// properties. Must be added before feature list is created otherwise the
// added flag won't be picked up.
+#if BUILDFLAG(IS_LINUX)
+ ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint();
+#endif
ui::OzonePlatform::PreEarlyInitialization();
AddFeatureFlagsToCommandLine();
#endif // BUILDFLAG(IS_OZONE)
diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.cc b/chrome/browser/chrome_browser_main_extra_parts_linux.cc
index dba7b116ecaa0..ea0487022dcdc 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_linux.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -168,7 +168,13 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExtraPartsLinux() = default;
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
-void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
+void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() {
+ RecordDisplayServerProtocolSupport();
+ ChromeBrowserMainExtraPartsOzone::PostBrowserStart();
+}
+
+// static
+void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
#if BUILDFLAG(IS_LINUX)
// On the desktop, we fix the platform name if necessary.
// See https://crbug.com/1246928.
@@ -189,8 +195,3 @@ void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
}
#endif // BUILDFLAG(IS_LINUX)
}
-
-void ChromeBrowserMainExtraPartsLinux::PostBrowserStart() {
- RecordDisplayServerProtocolSupport();
- ChromeBrowserMainExtraPartsOzone::PostBrowserStart();
-}
diff --git a/chrome/browser/chrome_browser_main_extra_parts_linux.h b/chrome/browser/chrome_browser_main_extra_parts_linux.h
index 3847bd2090e28..4f188a7bdfe38 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_linux.h
+++ b/chrome/browser/chrome_browser_main_extra_parts_linux.h
@@ -17,9 +17,10 @@ class ChromeBrowserMainExtraPartsLinux
const ChromeBrowserMainExtraPartsLinux&) = delete;
~ChromeBrowserMainExtraPartsLinux() override;
+ static void InitOzonePlatformHint();
+
private:
// ChromeBrowserMainExtraParts overrides.
- void PreEarlyInitialization() override;
void PostBrowserStart() override;
};

277
SOURCES/skia-vsx-instructions.patch
Unescape View File

@ -1,8 +1,8 @@
Index: chromium-123.0.6312.58/third_party/skia/BUILD.gn Index: chromium-124.0.6367.60/third_party/skia/BUILD.gn
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/BUILD.gn --- chromium-124.0.6367.60.orig/third_party/skia/BUILD.gn
+++ chromium-123.0.6312.58/third_party/skia/BUILD.gn +++ chromium-124.0.6367.60/third_party/skia/BUILD.gn
@@ -199,6 +199,12 @@ opts("skx") { @@ -191,6 +191,12 @@ opts("skx") {
} }
} }
@ -15,7 +15,7 @@ Index: chromium-123.0.6312.58/third_party/skia/BUILD.gn
# Any feature of Skia that requires third-party code should be optional and use this template. # Any feature of Skia that requires third-party code should be optional and use this template.
template("optional") { template("optional") {
if (invoker.enabled) { if (invoker.enabled) {
@@ -1474,6 +1480,7 @@ skia_component("skia") { @@ -1482,6 +1488,7 @@ skia_component("skia") {
":skx", ":skx",
":typeface_fontations", ":typeface_fontations",
":vello", ":vello",
@ -23,7 +23,7 @@ Index: chromium-123.0.6312.58/third_party/skia/BUILD.gn
":webp_decode", ":webp_decode",
":wuffs", ":wuffs",
":xml", ":xml",
@@ -1651,7 +1658,10 @@ skia_static_library("pathkit") { @@ -1659,7 +1666,10 @@ skia_static_library("pathkit") {
public_configs = [ ":skia_public" ] public_configs = [ ":skia_public" ]
configs = skia_library_configs configs = skia_library_configs
@ -35,10 +35,10 @@ Index: chromium-123.0.6312.58/third_party/skia/BUILD.gn
sources = [] sources = []
sources += skia_pathops_sources sources += skia_pathops_sources
Index: chromium-123.0.6312.58/third_party/skia/gn/skia/BUILD.gn Index: chromium-124.0.6367.60/third_party/skia/gn/skia/BUILD.gn
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/gn/skia/BUILD.gn --- chromium-124.0.6367.60.orig/third_party/skia/gn/skia/BUILD.gn
+++ chromium-123.0.6312.58/third_party/skia/gn/skia/BUILD.gn +++ chromium-124.0.6367.60/third_party/skia/gn/skia/BUILD.gn
@@ -163,6 +163,8 @@ config("default") { @@ -163,6 +163,8 @@ config("default") {
"-mfpmath=sse", "-mfpmath=sse",
] ]
@ -48,10 +48,10 @@ Index: chromium-123.0.6312.58/third_party/skia/gn/skia/BUILD.gn
} }
if (malloc != "" && !is_win) { if (malloc != "" && !is_win) {
Index: chromium-123.0.6312.58/third_party/skia/include/core/SkTypes.h Index: chromium-124.0.6367.60/third_party/skia/include/core/SkTypes.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/include/core/SkTypes.h --- chromium-124.0.6367.60.orig/third_party/skia/include/core/SkTypes.h
+++ chromium-123.0.6312.58/third_party/skia/include/core/SkTypes.h +++ chromium-124.0.6367.60/third_party/skia/include/core/SkTypes.h
@@ -195,5 +195,44 @@ static constexpr uint32_t SK_InvalidGenI @@ -195,5 +195,44 @@ static constexpr uint32_t SK_InvalidGenI
*/ */
static constexpr uint32_t SK_InvalidUniqueID = 0; static constexpr uint32_t SK_InvalidUniqueID = 0;
@ -97,10 +97,10 @@ Index: chromium-123.0.6312.58/third_party/skia/include/core/SkTypes.h
+ +
#endif #endif
Index: chromium-123.0.6312.58/third_party/skia/src/base/SkSpinlock.cpp Index: chromium-124.0.6367.60/third_party/skia/src/base/SkSpinlock.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/base/SkSpinlock.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/base/SkSpinlock.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/base/SkSpinlock.cpp +++ chromium-124.0.6367.60/third_party/skia/src/base/SkSpinlock.cpp
@@ -33,7 +33,8 @@ @@ -33,7 +33,8 @@
#endif #endif
@ -111,10 +111,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/base/SkSpinlock.cpp
#include <emmintrin.h> #include <emmintrin.h>
static void do_pause() { _mm_pause(); } static void do_pause() { _mm_pause(); }
#else #else
Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkBitmapProcState_opts.h Index: chromium-124.0.6367.60/third_party/skia/src/opts/SkBitmapProcState_opts.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h --- chromium-124.0.6367.60.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
+++ chromium-123.0.6312.58/third_party/skia/src/opts/SkBitmapProcState_opts.h +++ chromium-124.0.6367.60/third_party/skia/src/opts/SkBitmapProcState_opts.h
@@ -21,7 +21,13 @@ @@ -21,7 +21,13 @@
// The rest are scattershot at the moment but I want to get them // The rest are scattershot at the moment but I want to get them
// all migrated to be normal code inside SkBitmapProcState.cpp. // all migrated to be normal code inside SkBitmapProcState.cpp.
@ -130,10 +130,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkBitmapProcState_opts.h
#include <immintrin.h> #include <immintrin.h>
#elif defined(SK_ARM_HAS_NEON) #elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h> #include <arm_neon.h>
Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkBlitRow_opts.h Index: chromium-124.0.6367.60/third_party/skia/src/opts/SkBlitRow_opts.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/opts/SkBlitRow_opts.h --- chromium-124.0.6367.60.orig/third_party/skia/src/opts/SkBlitRow_opts.h
+++ chromium-123.0.6312.58/third_party/skia/src/opts/SkBlitRow_opts.h +++ chromium-124.0.6367.60/third_party/skia/src/opts/SkBlitRow_opts.h
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
#endif #endif
@ -143,10 +143,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkBlitRow_opts.h
static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) { static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
__m128i scale = _mm_sub_epi32(_mm_set1_epi32(256), __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h Index: chromium-124.0.6367.60/third_party/skia/src/opts/SkRasterPipeline_opts.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h --- chromium-124.0.6367.60.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ chromium-124.0.6367.60/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
/* /*
* Copyright 2018 Google Inc. * Copyright 2018 Google Inc.
@ -154,7 +154,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
* *
* Use of this source code is governed by a BSD-style license that can be * Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. * found in the LICENSE file.
@@ -74,6 +75,8 @@ using NoCtx = const void*; @@ -75,6 +76,8 @@ using NoCtx = const void*;
#define JUMPER_IS_SCALAR #define JUMPER_IS_SCALAR
#elif defined(SK_ARM_HAS_NEON) #elif defined(SK_ARM_HAS_NEON)
#define JUMPER_IS_NEON #define JUMPER_IS_NEON
@ -163,7 +163,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SKX #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SKX
#define JUMPER_IS_SKX #define JUMPER_IS_SKX
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2 #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
@@ -106,6 +109,8 @@ using NoCtx = const void*; @@ -107,6 +110,8 @@ using NoCtx = const void*;
#include <math.h> #include <math.h>
#elif defined(JUMPER_IS_NEON) #elif defined(JUMPER_IS_NEON)
#include <arm_neon.h> #include <arm_neon.h>
@ -172,7 +172,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
#include <immintrin.h> #include <immintrin.h>
#endif #endif
@@ -197,6 +202,182 @@ namespace SK_OPTS_NS { @@ -200,6 +205,184 @@ namespace SK_OPTS_NS {
ptr[3] = a; ptr[3] = a;
} }
@ -227,10 +227,12 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
+ } + }
+ +
+ SI F mad(F f, F m, F a) { return vec_madd(f,m,a); } + SI F mad(F f, F m, F a) { return vec_madd(f,m,a); }
+ SI F nmad(F f, F m, F a) { return vec_msub(f,m,a); }
+ SI F floor_(F v) { return vec_floor(v); } + SI F floor_(F v) { return vec_floor(v); }
+ SI F ceil_(F v) { return vec_ceil(v); } + SI F ceil_(F v) { return vec_ceil(v); }
+ SI F sqrt_(F v) { return vec_sqrt(v); } + SI F sqrt_(F v) { return vec_sqrt(v); }
+ SI U32 round(F v) { return vec_cts((vector float)vec_rint(v), 0); } + SI I32 iround(F v) { return vec_cts((vector float)vec_rint(v), 0); }
+ SI U32 round(F v) { return vec_ctu((vector float)vec_rint(v), 0); }
+ SI U32 round(F v, F scale) { return vec_cts((vector float)vec_rint(v*scale), 0); } + SI U32 round(F v, F scale) { return vec_cts((vector float)vec_rint(v*scale), 0); }
+ +
+ template <typename T> + template <typename T>
@ -355,7 +357,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#elif defined(JUMPER_IS_NEON) #elif defined(JUMPER_IS_NEON)
template <typename T> using V = Vec<4, T>; template <typename T> using V = Vec<4, T>;
using F = V<float >; using F = V<float >;
@@ -1004,6 +1185,15 @@ SI F from_half(U16 h) { @@ -1025,6 +1208,15 @@ SI F from_half(U16 h) {
#elif defined(JUMPER_IS_HSW) #elif defined(JUMPER_IS_HSW)
return _mm256_cvtph_ps((__m128i)h); return _mm256_cvtph_ps((__m128i)h);
@ -371,7 +373,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
// Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias. // Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias.
U32 sem = expand(h), U32 sem = expand(h),
@@ -1027,6 +1217,16 @@ SI U16 to_half(F f) { @@ -1048,6 +1240,16 @@ SI U16 to_half(F f) {
#elif defined(JUMPER_IS_HSW) #elif defined(JUMPER_IS_HSW)
return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
@ -388,7 +390,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
// Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias. // Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias.
U32 sem = sk_bit_cast<U32>(f), U32 sem = sk_bit_cast<U32>(f),
@@ -1102,7 +1302,7 @@ static constexpr size_t N = sizeof(F) / @@ -1123,7 +1325,7 @@ static constexpr size_t N = sizeof(F) /
// instead of {b,a} on the stack. Narrow stages work best for __vectorcall. // instead of {b,a} on the stack. Narrow stages work best for __vectorcall.
#define ABI __vectorcall #define ABI __vectorcall
#define JUMPER_NARROW_STAGES 1 #define JUMPER_NARROW_STAGES 1
@ -397,7 +399,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
// These platforms are ideal for wider stages, and their default ABI is ideal. // These platforms are ideal for wider stages, and their default ABI is ideal.
#define ABI #define ABI
#define JUMPER_NARROW_STAGES 0 #define JUMPER_NARROW_STAGES 0
@@ -4874,6 +5074,10 @@ SI F sqrt_(F x) { @@ -5023,6 +5225,10 @@ SI F sqrt_(F x) {
float32x4_t lo,hi; float32x4_t lo,hi;
split(x, &lo,&hi); split(x, &lo,&hi);
return join<F>(sqrt(lo), sqrt(hi)); return join<F>(sqrt(lo), sqrt(hi));
@ -408,7 +410,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
return F{ return F{
sqrtf(x[0]), sqrtf(x[1]), sqrtf(x[2]), sqrtf(x[3]), sqrtf(x[0]), sqrtf(x[1]), sqrtf(x[2]), sqrtf(x[3]),
@@ -4897,6 +5101,10 @@ SI F floor_(F x) { @@ -5046,6 +5252,10 @@ SI F floor_(F x) {
__m128 lo,hi; __m128 lo,hi;
split(x, &lo,&hi); split(x, &lo,&hi);
return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi)); return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
@ -419,7 +421,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
F roundtrip = cast<F>(cast<I32>(x)); F roundtrip = cast<F>(cast<I32>(x));
return roundtrip - if_then_else(roundtrip > x, F_(1), F_(0)); return roundtrip - if_then_else(roundtrip > x, F_(1), F_(0));
@@ -4908,6 +5116,7 @@ SI F floor_(F x) { @@ -5057,6 +5267,7 @@ SI F floor_(F x) {
// (2 * a * b + (1 << 15)) >> 16 // (2 * a * b + (1 << 15)) >> 16
// The result is a number on [-1, 1). // The result is a number on [-1, 1).
// Note: on neon this is a saturating multiply while the others are not. // Note: on neon this is a saturating multiply while the others are not.
@ -427,7 +429,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
SI I16 scaled_mult(I16 a, I16 b) { SI I16 scaled_mult(I16 a, I16 b) {
#if defined(JUMPER_IS_SKX) #if defined(JUMPER_IS_SKX)
return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b); return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
@@ -4919,6 +5128,22 @@ SI I16 scaled_mult(I16 a, I16 b) { @@ -5068,6 +5279,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
return vqrdmulhq_s16(a, b); return vqrdmulhq_s16(a, b);
#elif defined(JUMPER_IS_NEON) #elif defined(JUMPER_IS_NEON)
return vqrdmulhq_s16(a, b); return vqrdmulhq_s16(a, b);
@ -450,7 +452,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
#else #else
const I32 roundingTerm = I32_(1 << 14); const I32 roundingTerm = I32_(1 << 14);
return cast<I16>((cast<I32>(a) * cast<I32>(b) + roundingTerm) >> 15); return cast<I16>((cast<I32>(a) * cast<I32>(b) + roundingTerm) >> 15);
@@ -4940,7 +5165,26 @@ SI U16 constrained_add(I16 a, U16 b) { @@ -5089,7 +5316,26 @@ SI U16 constrained_add(I16 a, U16 b) {
SkASSERT(-ib <= ia && ia <= 65535 - ib); SkASSERT(-ib <= ia && ia <= 65535 - ib);
} }
#endif #endif
@ -477,7 +479,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
} }
SI F fract(F x) { return x - floor_(x); } SI F fract(F x) { return x - floor_(x); }
@@ -5798,8 +6042,14 @@ STAGE_GP(bilerp_clamp_8888, const SkRast @@ -5947,8 +6193,14 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
// 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L)) // 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
// v = 1/2 * (tx*(R - L) + (R + L)) // v = 1/2 * (tx*(R - L) + (R + L))
auto lerpX = [&](U16 left, U16 right) -> U16 { auto lerpX = [&](U16 left, U16 right) -> U16 {
@ -492,7 +494,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
// The constrained_add is the most subtle part of lerp. The first term is on the interval // The constrained_add is the most subtle part of lerp. The first term is on the interval
// [-1, 1), and the second term is on the interval is on the interval [0, 1) because // [-1, 1), and the second term is on the interval is on the interval [0, 1) because
// both terms are too high by a factor of 2 which will be handled below. (Both R and L are // both terms are too high by a factor of 2 which will be handled below. (Both R and L are
@@ -5811,7 +6061,12 @@ STAGE_GP(bilerp_clamp_8888, const SkRast @@ -5960,7 +6212,12 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1; U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1;
// Divide by 2 to calculate v and at the same time bring the intermediate value onto the // Divide by 2 to calculate v and at the same time bring the intermediate value onto the
// interval [0, 1/2] to set up for the lerpY. // interval [0, 1/2] to set up for the lerpY.
@ -505,7 +507,7 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
}; };
const uint32_t* ptr; const uint32_t* ptr;
@@ -5845,9 +6100,15 @@ STAGE_GP(bilerp_clamp_8888, const SkRast @@ -5994,9 +6251,15 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
I16 width = (I16)bottom - (I16)top; I16 width = (I16)bottom - (I16)top;
U16 middle = bottom + top; U16 middle = bottom + top;
// Add + 0x80 for rounding. // Add + 0x80 for rounding.
@ -522,60 +524,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkRasterPipeline_opts.h
}; };
r = lerpY(topR, bottomR); r = lerpY(topR, bottomR);
Index: chromium-123.0.6312.58/third_party/skia/src/opts/SkSwizzler_opts.h Index: chromium-124.0.6367.60/third_party/skia/src/base/SkVx.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/opts/SkSwizzler_opts.h --- chromium-124.0.6367.60.orig/third_party/skia/src/base/SkVx.h
+++ chromium-123.0.6312.58/third_party/skia/src/opts/SkSwizzler_opts.h +++ chromium-124.0.6367.60/third_party/skia/src/base/SkVx.h
@@ -17,7 +17,10 @@
#include <cmath>
#include <utility>
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
+#if defined(SK_PPC64_HAS_SSE_COMPAT)
+ #include <emmintrin.h>
+ #include <tmmintrin.h>
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
#include <immintrin.h>
#elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h>
@@ -43,6 +43,33 @@
static inline float SkReciprocalAlpha(float a) {
return SkReciprocalAlpha_portable(a);
}
+#elif defined(SK_PPC64_HAS_SSE_COMPAT)
+// -- VSX -- Harden against timing attacks
+SK_NO_SANITIZE("float-divide-by-zero")
+static inline float SkReciprocalAlphaTimes255(float a) {
+ SkASSERT(0 <= a && a <= 255);
+
+ vector float vA{a,a,a,a};
+ vector float vB{255.0f,255.0f,255.0f,255.0f};
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
+ vector float q = vec_div(vB, vA);
+ vector float vCmp{static_cast<float>(vA != vC)};
+
+ return vec_and(vCmp, q)[0];
+}
+
+SK_NO_SANITIZE("float-divide-by-zero")
+static inline float SkReciprocalAlpha(float a) {
+ SkASSERT(0 <= a && a <= 1);
+
+ vector float vA{a,a,a,a};
+ vector float vB{1.0f,1.0f,1.0f,1.0f};
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
+ vector float q = vec_div(vB, vA);
+ vector float vCmp{static_cast<float>(vA != vC)};
+
+ return vec_and(vCmp, q)[0];
+}
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
// -- SSE -- Harden against timing attacks -- MSVC is not supported.
using F4 = __m128;
Index: chromium-123.0.6312.58/third_party/skia/src/base/SkVx.h
===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/base/SkVx.h
+++ chromium-123.0.6312.58/third_party/skia/src/base/SkVx.h
@@ -42,7 +42,13 @@ @@ -42,7 +42,13 @@
#if SKVX_USE_SIMD #if SKVX_USE_SIMD
@ -591,10 +543,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/base/SkVx.h
#elif defined(SK_ARM_HAS_NEON) #elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h> #include <arm_neon.h>
#elif defined(__wasm_simd128__) #elif defined(__wasm_simd128__)
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp Index: chromium-124.0.6367.60/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp +++ chromium-124.0.6367.60/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include "src/core/SkBlitMask.h" #include "src/core/SkBlitMask.h"
#include "src/core/SkOptsTargets.h" #include "src/core/SkOptsTargets.h"
@ -604,23 +556,23 @@ Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
// The order of these includes is important: // The order of these includes is important:
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp Index: chromium-124.0.6367.60/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp +++ chromium-124.0.6367.60/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
@@ -11,7 +11,7 @@ @@ -10,7 +10,7 @@
#include "src/core/SkOptsTargets.h" #include "src/core/SkOptsTargets.h"
#include "src/core/SkSwizzlePriv.h" #include "src/core/SkSwizzlePriv.h"
-#if defined(SK_CPU_X86) && !defined(SK_ENABLE_OPTIMIZE_SIZE) -#if defined(SK_CPU_X86) && \
+#if (defined(SK_CPU_X86) || defined(SK_CPU_PPC64)) && !defined(SK_ENABLE_OPTIMIZE_SIZE) +#if (defined(SK_CPU_X86) || defined(SK_CPU_PPC64)) && \
!defined(SK_ENABLE_OPTIMIZE_SIZE) && \
SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
// The order of these includes is important: Index: chromium-124.0.6367.60/third_party/skia/src/core/SkBlitMask_opts.cpp
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkBlitMask_opts.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts.cpp +++ chromium-124.0.6367.60/third_party/skia/src/core/SkBlitMask_opts.cpp
@@ -25,7 +25,7 @@ namespace SkOpts { @@ -25,7 +25,7 @@ namespace SkOpts {
static bool init() { static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE) #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@ -630,10 +582,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBlitMask_opts.cpp
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); } if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
#endif #endif
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts.cpp Index: chromium-124.0.6367.60/third_party/skia/src/core/SkBitmapProcState_opts.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts.cpp +++ chromium-124.0.6367.60/third_party/skia/src/core/SkBitmapProcState_opts.cpp
@@ -25,7 +25,7 @@ namespace SkOpts { @@ -25,7 +25,7 @@ namespace SkOpts {
static bool init() { static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE) #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@ -643,10 +595,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts.c
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3 #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); } if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
#endif #endif
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkCpu.h Index: chromium-124.0.6367.60/third_party/skia/src/core/SkCpu.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkCpu.h --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkCpu.h
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkCpu.h +++ chromium-124.0.6367.60/third_party/skia/src/core/SkCpu.h
@@ -55,7 +55,7 @@ inline bool SkCpu::Supports(uint32_t mas @@ -55,7 +55,7 @@ inline bool SkCpu::Supports(uint32_t mas
// If we mask in compile-time known lower limits, the compiler can // If we mask in compile-time known lower limits, the compiler can
@ -656,10 +608,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/core/SkCpu.h
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
features |= SSE1; features |= SSE1;
#endif #endif
Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp Index: chromium-124.0.6367.60/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp --- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+++ chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp +++ chromium-124.0.6367.60/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
#include "include/private/base/SkFeatures.h" #include "include/private/base/SkFeatures.h"
#include "src/core/SkOptsTargets.h" #include "src/core/SkOptsTargets.h"
@ -669,10 +621,10 @@ Index: chromium-123.0.6312.58/third_party/skia/src/core/SkBitmapProcState_opts_s
// The order of these includes is important: // The order of these includes is important:
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
Index: chromium-123.0.6312.58/third_party/skia/include/private/base/SkFeatures.h Index: chromium-124.0.6367.60/third_party/skia/include/private/base/SkFeatures.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/include/private/base/SkFeatures.h --- chromium-124.0.6367.60.orig/third_party/skia/include/private/base/SkFeatures.h
+++ chromium-123.0.6312.58/third_party/skia/include/private/base/SkFeatures.h +++ chromium-124.0.6367.60/third_party/skia/include/private/base/SkFeatures.h
@@ -63,6 +63,8 @@ @@ -63,6 +63,8 @@
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64) #if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
@ -682,15 +634,94 @@ Index: chromium-123.0.6312.58/third_party/skia/include/private/base/SkFeatures.h
#endif #endif
/** /**
Index: chromium-123.0.6312.58/third_party/skia/modules/skcms/src/skcms_internals.h Index: chromium-124.0.6367.60/third_party/skia/modules/skcms/src/skcms_internals.h
=================================================================== ===================================================================
--- chromium-123.0.6312.58.orig/third_party/skia/modules/skcms/src/skcms_internals.h --- chromium-124.0.6367.60.orig/third_party/skia/modules/skcms/src/skcms_internals.h
+++ chromium-123.0.6312.58/third_party/skia/modules/skcms/src/skcms_internals.h +++ chromium-124.0.6367.60/third_party/skia/modules/skcms/src/skcms_internals.h
@@ -46,6 +46,7 @@ extern "C" { @@ -47,6 +47,7 @@ extern "C" {
&& !defined(__EMSCRIPTEN__) \ && !defined(__EMSCRIPTEN__) \
&& !defined(__arm__) \ && !defined(__arm__) \
&& !defined(__riscv) \ && !defined(__riscv) \
+ && !defined(__powerpc64__) \ + && !defined(__powerpc64__) \
&& !defined(__loongarch__) \
&& !defined(_WIN32) && !defined(__SYMBIAN32__) && !defined(_WIN32) && !defined(__SYMBIAN32__)
#define SKCMS_HAS_MUSTTAIL 1 #define SKCMS_HAS_MUSTTAIL 1
#endif Index: chromium-124.0.6367.60/third_party/skia/src/opts/SkSwizzler_opts.inc
===================================================================
--- chromium-124.0.6367.60.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
+++ chromium-124.0.6367.60/third_party/skia/src/opts/SkSwizzler_opts.inc
@@ -14,7 +14,10 @@
#include <cmath>
#include <utility>
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
+#if defined(SK_PPC64_HAS_SSE_COMPAT)
+ #include <emmintrin.h>
+ #include <tmmintrin.h>
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
#include <immintrin.h>
#elif defined(SK_ARM_HAS_NEON)
#include <arm_neon.h>
@@ -61,6 +64,33 @@ SI float reciprocal_alpha_times_255(floa
SI float reciprocal_alpha(float a) {
return reciprocal_alpha_portable(a);
}
+#elif defined(SK_PPC64_HAS_SSE_COMPAT)
+// -- VSX -- Harden against timing attacks
+SK_NO_SANITIZE("float-divide-by-zero")
+static inline float reciprocal_alpha_times_255(float a) {
+ SkASSERT(0 <= a && a <= 255);
+
+ vector float vA{a,a,a,a};
+ vector float vB{255.0f,255.0f,255.0f,255.0f};
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
+ vector float q = vec_div(vB, vA);
+ vector float vCmp{static_cast<float>(vA != vC)};
+
+ return vec_and(vCmp, q)[0];
+}
+
+SK_NO_SANITIZE("float-divide-by-zero")
+static inline float reciprocal_alpha(float a) {
+ SkASSERT(0 <= a && a <= 1);
+
+ vector float vA{a,a,a,a};
+ vector float vB{1.0f,1.0f,1.0f,1.0f};
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
+ vector float q = vec_div(vB, vA);
+ vector float vCmp{static_cast<float>(vA != vC)};
+
+ return vec_and(vCmp, q)[0];
+}
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
// -- SSE -- Harden against timing attacks -- MSVC is not supported.
using F4 = __m128;
Index: chromium-124.0.6367.60/third_party/skia/src/core/SkBlitter_ARGB32.cpp
===================================================================
--- chromium-124.0.6367.60.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+++ chromium-124.0.6367.60/third_party/skia/src/core/SkBlitter_ARGB32.cpp
@@ -372,7 +372,11 @@ static inline SkPMColor blend_lcd16_opaq
// Load four destination pixels into dst_sse.
__m128i dst_sse = _mm_load_si128(d);
// Load four 16-bit masks into lower half of mask_sse.
+#if defined(SK_CPU_PPC64)
+ __m128i mask_sse = _mm_loadl_epi64(reinterpret_cast<const __m128i*>(mask));
+#else
__m128i mask_sse = _mm_loadu_si64(mask);
+#endif
// Check whether masks are equal to 0 and get the highest bit
// of each byte of result, if masks are all zero, we will get
@@ -438,7 +442,12 @@ static inline SkPMColor blend_lcd16_opaq
// Load four destination pixels into dst_sse.
__m128i dst_sse = _mm_load_si128(d);
// Load four 16-bit masks into lower half of mask_sse.
+#if defined(SK_CPU_PPC64)
+ __m128i mask_sse = _mm_loadl_epi64(reinterpret_cast<const __m128i*>(mask));
+#else
__m128i mask_sse = _mm_loadu_si64(mask);
+#endif
+
// Check whether masks are equal to 0 and get the highest bit
// of each byte of result, if masks are all zero, we will get

26
SOURCES/use-sysconf-page-size-on-ppc64.patch
Unescape View File

@ -1,8 +1,6 @@
Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h --- a/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
=================================================================== +++ b/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
--- chromium-120.0.6099.71.orig/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h @@ -176,7 +176,11 @@ SystemPageBaseMask() {
+++ chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
@@ -172,7 +172,11 @@ SystemPageBaseMask() {
return ~SystemPageOffsetMask(); return ~SystemPageOffsetMask();
} }
@ -13,12 +11,10 @@ Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_a
+#endif +#endif
constexpr size_t kPageMetadataSize = 1 << kPageMetadataShift; constexpr size_t kPageMetadataSize = 1 << kPageMetadataShift;
} // namespace partition_alloc::internal } // namespace internal
Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/partition_page.h --- a/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
=================================================================== +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
--- chromium-120.0.6099.71.orig/base/allocator/partition_allocator/src/partition_alloc/partition_page.h @@ -86,7 +86,11 @@ struct SlotSpanMetadata {
+++ chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
@@ -90,7 +90,11 @@ struct SlotSpanMetadata {
// CHECK()ed in AllocNewSlotSpan(). // CHECK()ed in AllocNewSlotSpan().
// The maximum number of bits needed to cover all currently supported OSes. // The maximum number of bits needed to cover all currently supported OSes.
@ -30,7 +26,7 @@ Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_a
static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), ""); static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), "");
// |marked_full| isn't equivalent to being full. Slot span is marked as full // |marked_full| isn't equivalent to being full. Slot span is marked as full
@@ -104,7 +108,11 @@ struct SlotSpanMetadata { @@ -100,7 +104,11 @@ struct SlotSpanMetadata {
private: private:
const uint32_t can_store_raw_size_ : 1; const uint32_t can_store_raw_size_ : 1;
uint32_t freelist_is_sorted_ : 1; uint32_t freelist_is_sorted_ : 1;
@ -42,10 +38,8 @@ Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_a
// If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be // If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be
// used. // used.
uint16_t in_empty_cache_ : 1; uint16_t in_empty_cache_ : 1;
Index: chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h --- a/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
=================================================================== +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
--- chromium-120.0.6099.71.orig/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
+++ chromium-120.0.6099.71/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
@@ -21,6 +21,11 @@ static constexpr size_t kMaxSlotsPerSlot @@ -21,6 +21,11 @@ static constexpr size_t kMaxSlotsPerSlot
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash). // so we use the 16 kiB maximum (64 kiB will crash).

63
SPECS/chromium.spec
Unescape View File

@ -89,8 +89,12 @@
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
%global chromium_pybin /usr/bin/python3 %global chromium_pybin /usr/bin/python3
%else %else
%if 0%{?rhel} == 8
%global chromium_pybin /usr/bin/python3.9
%else
%global chromium_pybin %{__python3} %global chromium_pybin %{__python3}
%endif %endif
%endif
# va-api only supported in rhel >= 9 and fedora # va-api only supported in rhel >= 9 and fedora
%global use_vaapi 1 %global use_vaapi 1
@ -199,17 +203,13 @@
%global toolchain gcc %global toolchain gcc
%endif %endif
# enable qt backend for el >= 8 and fedora # enable qt backend
%if 0%{?rhel} >= 8 || 0%{?fedora}
%global use_qt 1
%else
%global use_qt 0
%endif
%if 0%{?rhel} > 9 || 0%{?fedora} %if 0%{?rhel} > 9 || 0%{?fedora}
%global use_qt6 1 %global use_qt6 0
%global use_qt 1
%else %else
%global use_qt6 0 %global use_qt6 0
%global use_qt 1
%endif %endif
# Chromium's fork of ICU is now something we can't unbundle. # Chromium's fork of ICU is now something we can't unbundle.
@ -297,8 +297,8 @@
# Build with GOST patches # Build with GOST patches
# https://github.com/deemru/chromium-gost/ # https://github.com/deemru/chromium-gost/
%global gost_build 1 %global gost_build 1
%define chromium_gost_commit d23e9c19db1abf4887f67f3f7d3f91dd9963d964 %define chromium_gost_commit b96d919186bcbb230c6f8dd19bc933bf717a9f59
%define msspi_commit 70fdcec917ce3799f0786d635422e25a5def92a4 %define msspi_commit 192d2662e058453313e6f824099ace60ca6fd242
%define chromium_path_gost %{_builddir}/chromium-gost %define chromium_path_gost %{_builddir}/chromium-gost
%endif %endif
@ -336,8 +336,8 @@
%endif %endif
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
Version: 123.0.6312.122 Version: 124.0.6367.60
Release: 1%{?dist}.inferit Release: 2%{?dist}.inferit
Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@ -465,7 +465,7 @@ Patch304: chromium-117-string-convert.patch
# disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver # disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver
# not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found # not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
Patch305: chromium-122-arm64-memory_tagging.patch Patch305: chromium-124-arm64-memory_tagging.patch
Patch306: chromium-119-assert.patch Patch306: chromium-119-assert.patch
@ -477,23 +477,23 @@ Patch309: chromium-123-constexpr.patch
# missing include header files # missing include header files
Patch310: chromium-123-missing-header-files.patch Patch310: chromium-123-missing-header-files.patch
# clang warnings
Patch311: chromium-115-clang-warnings.patch
# enable fstack-protector-strong # enable fstack-protector-strong
Patch312: chromium-123-fstack-protector-strong.patch Patch312: chromium-123-fstack-protector-strong.patch
# # rust is old, function or associated item not found in `OsStr` # # rust is old, function or associated item not found in `OsStr`
Patch313: chromium-123-rust-clap_lex.patch Patch313: chromium-123-rust-clap_lex.patch
Patch314: chromium-122-clang16-buildflags.patch Patch314: chromium-124-clang16-buildflags.patch
# assignment-expressions not suport in python < 3.8 on el 7/8 # assignment-expressions not suport in python < 3.8 on el 7/8
Patch315: chromium-123-python3-assignment-expressions.patch Patch315: chromium-124-python3-assignment-expressions.patch
# add -ftrivial-auto-var-init=zero and -fwrapv # add -ftrivial-auto-var-init=zero and -fwrapv
Patch316: chromium-122-clang-build-flags.patch Patch316: chromium-122-clang-build-flags.patch
# build error: unknown architectural extension on aarch64 (epel and < f39)
Patch317: chromium-124-libdav1d-aarch64.patch
# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523
# https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60
# Disable BTI until this is fixed upstream. # Disable BTI until this is fixed upstream.
@ -514,6 +514,9 @@ Patch357: chromium-122-clang16-disable-auto-upgrade-debug-info.patch
# set clang_lib path # set clang_lib path
Patch358: chromium-122-rust-clang_lib.patch Patch358: chromium-122-rust-clang_lib.patch
# ERROR Unresolved dependencies
Patch359: chromium-124-libavif-deps.patch
# PowerPC64 LE support # PowerPC64 LE support
# Patches taken from Debian, Timothy Pearson's patchset # Patches taken from Debian, Timothy Pearson's patchset
# https://salsa.debian.org/chromium-team/chromium/-/tree/master/debian/patches/ppc64le?ref_type=heads # https://salsa.debian.org/chromium-team/chromium/-/tree/master/debian/patches/ppc64le?ref_type=heads
@ -596,9 +599,8 @@ Patch415: fix-clang-selection.patch
# upstream patches # upstream patches
# 64kpage support on el8 # 64kpage support on el8
Patch500: chromium-122-el8-support-64kpage.patch Patch500: chromium-124-el8-support-64kpage.patch
# error: static assertion failed due to requirement '::WTF::internal::SizesEqual<72, 64>::value': ShapeResult should stay small Patch501: chromium-124-wayland-regression.patch
Patch501: chromium-123-shape_result-assert.patch
# Old Yandex patch # Old Yandex patch
Patch600: 0001-Yandex-as-default-search-engine.patch Patch600: 0001-Yandex-as-default-search-engine.patch
@ -1323,7 +1325,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P130 -p1 -b .revert-av1enc %patch -P130 -p1 -b .revert-av1enc
%endif %endif
%if 0%{?rhel} <= 8 %if 0%{?rhel} && 0%{?rhel} <= 8
%patch -P315 -p1 -b .assignment-expressions %patch -P315 -p1 -b .assignment-expressions
%ifarch aarch64 %ifarch aarch64
%patch -P305 -p1 -b .memory_tagging %patch -P305 -p1 -b .memory_tagging
@ -1333,12 +1335,11 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%if 0%{?rhel} || 0%{?fedora} && 0%{?fedora} < 39 %if 0%{?rhel} || 0%{?fedora} && 0%{?fedora} < 39
%patch -P307 -p1 -R -b .v8-c++20 %patch -P307 -p1 -R -b .v8-c++20
%patch -P308 -p1 -R -b .v8-c++20 %patch -P308 -p1 -R -b .v8-c++20
%patch -P309 -p1 -b .constexpr
%patch -P314 -p1 -b .clang16-buildflag %patch -P314 -p1 -b .clang16-buildflag
%patch -P317 -p1 -b .libdav1d-aarch64
%endif %endif
%patch -P310 -p1 -b .missing-header-files %patch -P310 -p1 -b .missing-header-files
%patch -P311 -p1 -b .clang-warnings
%patch -P312 -p1 -b .fstack-protector-strong %patch -P312 -p1 -b .fstack-protector-strong
%if 0%{?rhel} && 0%{?rhel} < 10 %if 0%{?rhel} && 0%{?rhel} < 10
@ -1360,6 +1361,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P356 -p1 -b .disable-FFmpegAllowLists %patch -P356 -p1 -b .disable-FFmpegAllowLists
%patch -P357 -p1 -b .clang16-disable-auto-upgrade-debug-info %patch -P357 -p1 -b .clang16-disable-auto-upgrade-debug-info
%patch -P358 -p1 -b .rust-clang_lib %patch -P358 -p1 -b .rust-clang_lib
%patch -P359 -p1 -b .libavif-deps
%ifarch ppc64le %ifarch ppc64le
%patch -P360 -p1 -b .0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h %patch -P360 -p1 -b .0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h
@ -1401,7 +1403,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P390 -p1 -b .0002-third-party-boringssl-add-generated-files %patch -P390 -p1 -b .0002-third-party-boringssl-add-generated-files
%patch -P391 -p1 -b .0003-third_party-libvpx-Add-ppc64-generated-config %patch -P391 -p1 -b .0003-third_party-libvpx-Add-ppc64-generated-config
#patch -P392 -p1 -b .0003-third_party-libvpx-Add-ppc64-vsx-files #patch -P392 -p1 -b .0003-third_party-libvpx-Add-ppc64-vsx-files
%patch -P393 -p1 -b .0003-third_party-ffmpeg-Add-ppc64-generated-config #patch -P393 -p1 -b .0003-third_party-ffmpeg-Add-ppc64-generated-config
%patch -P394 -p1 -b .0004-third_party-libvpx-work-around-ambiguous-vsx %patch -P394 -p1 -b .0004-third_party-libvpx-work-around-ambiguous-vsx
%patch -P395 -p1 -b .skia-vsx-instructions %patch -P395 -p1 -b .skia-vsx-instructions
@ -1437,8 +1439,7 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P500 -p1 -b .el8-support-64kpage.patch %patch -P500 -p1 -b .el8-support-64kpage.patch
%endif %endif
%endif %endif
%patch -P501 -p1 -b .wayland-regression
%patch -P501 -p1 -b .shape_result-assert
%patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft %patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft
%if ! %{with gost} %if ! %{with gost}
@ -1460,7 +1461,7 @@ install -m0644 %{SOURCE50} ./chrome/browser/resources/new_tab_page/icons/google_
# Change shebang in all relevant files in this directory and all subdirectories # Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works # See `man find` for how the `-exec command {} +` syntax works
find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} + find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{chromium_pybin}=' {} +
# Add correct path for nodejs binary # Add correct path for nodejs binary
%if ! %{system_nodejs} %if ! %{system_nodejs}
@ -2254,6 +2255,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%endif %endif
%changelog %changelog
* Tue Apr 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 124.0.6367.60-2.inferit
- update to 124.0.6367.60
- fix waylang regression
- update GOST patches
- update Yandex patches
* Fri Apr 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 123.0.6312.122-1.inferit * Fri Apr 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 123.0.6312.122-1.inferit
- update to 123.0.6312.122 - update to 123.0.6312.122
* High CVE-2024-3157: Out of bounds write in Compositing * High CVE-2024-3157: Out of bounds write in Compositing

Write Preview
Loading…
Cancel
Save