Chromium fails aom with neon

This commit is contained in:
Gerben Jan Dijkman 2024-05-21 21:40:30 +02:00
parent b3268b24bd
commit 6c4af3c444
17 changed files with 1936 additions and 131 deletions

View File

@ -1,103 +0,0 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Meta package for Phosh without squeekboard"
HOMEPAGE="https://github.com/dreemurrs-embedded/Pine64-Arch"
SRC_URI=""
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm64 ~arm"
IUSE="squeekboard chromium firefox geary lollypop owncloud nextcloud voicemail tuba"
DEPEND="
gui-wm/phosh
gnome-extra/phosh-antispam
net-voip/gnome-calls
net-im/chatty
net-dns/dnsmasq
app-editors/gedit
app-misc/gnote
media-video/megapixels
gnome-base/gnome-control-center
gnome-base/gnome-keyring
gnome-extra/gnome-contacts
gnome-extra/gnome-calculator
gnome-extra/gnome-calendar
gnome-extra/gnome-clocks
gnome-extra/gnome-weather
gnome-base/gnome-session
gnome-extra/gnome-system-monitor
media-gfx/gnome-screenshot
gnome-extra/gnome-tweaks
app-arch/file-roller
sys-apps/gnome-disk-utility
media-sound/gnome-sound-recorder
www-client/epiphany
sci-geosciences/gnome-maps
x11-terms/gnome-terminal
x11-themes/sound-theme-librem5
app-text/evince
sys-power/gtherm
sys-auth/rtkit
gnome-extra/sushi
media-gfx/eog
x11-misc/phosh-mobile-settings
media-video/totem
>=media-video/pipewire-0.3.65[libcamera]
tuba? (
net-im/tuba
)
squeekboard? (
x11-misc/squeekboard
)
chromium? (
www-client/chromium
)
firefox? (
www-client/firefox
)
geary? (
mail-client/geary
)
lollypop? (
media-sound/lollypop
)
owncloud? (
net-misc/owncloud-client
)
nextcloud? (
net-misc/nextcloud-client
)
voicemail? (
gnome-extra/vvmplayer
)
"
RDEPEND="${DEPEND}"
BDEPEND=""
S="${WORKDIR}"
pkg_postinst() {
[ -e /usr/share/applications-bak ] || mkdir /usr/share/applications-bak
for i in vim org.gnupg.pinentry-qt org.gnome.Extensions mupdf \
gnome-printers-panel gnome-wifi-pannel pidgin wpa_gui cups \
Gentoo-system-config-printer
do
if [ -e /usr/share/applications/$i.desktop ]; then
mv /usr/share/applications/$i.desktop /usr/share/applications-bak
fi
done
}

View File

@ -1,10 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
VALA_USE_DEPEND="vapigen"
inherit vala meson gnome2-utils xdg
inherit vala meson gnome2-utils optfeature virtualx xdg
LCU_COMMIT="6798b38d4d66d069751151b3e9a202c6de8d7f3c"
DESCRIPTION="Phone dialer and call handler"
@ -17,47 +17,91 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
IUSE="+introspection +vala"
IUSE="+introspection +vala gtk-doc man""
REQUIRED_USE="vala? ( introspection )"
DEPEND="
dev-libs/feedbackd
>=gui-libs/libhandy-1.0.0
dev-libs/folks
dev-libs/gom
RDEPEND="
app-crypt/libsecret[introspection,vala]
dev-libs/feedbackd[introspection,vala]
dev-libs/folks:=
dev-libs/glib:2
dev-libs/gom[introspection]
dev-libs/libgee:0.8=[introspection]
dev-libs/libpeas
>=media-sound/callaudiod-0.1
gnome-extra/evolution-data-server
app-crypt/libsecret
gui-libs/libadwaita
gnome-extra/gnome-contacts
>=gui-libs/gtk-4.12.5
gnome-extra/evolution-data-server[phonenumber]
gnome-extra/evolution-data-server:=[vala,phonenumber]
gui-libs/libhandy:1[introspection,vala]
media-libs/gstreamer:1.0[introspection]
media-sound/callaudiod
net-libs/sofia-sip
"
RDEPEND="${DEPEND}"
net-misc/modemmanager:=[introspection]
x11-libs/gtk+:3
"
DEPEND="${RDEPEND}
test? ( media-plugins/gst-plugins-srtp:1.0 )
"
BDEPEND="
vala? ( $(vala_depend) )
dev-build/meson
$(vala_depend)
dev-libs/gobject-introspection
dev-libs/protobuf
dev-util/wayland-scanner
gtk-doc? ( dev-util/gtk-doc )
man? ( dev-python/docutils )
"
S="${WORKDIR}/calls-v${PV}"
src_prepare() {
src_unpack() {
default
eapply_user
use vala && vala_src_prepare
rm -r "${S}"/subprojects/libcall-ui || die
mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
}
pkg_postinst() {
src_prepare() {
default
vala_setup
}
src_configure() {
local emesonargs=(
$(meson_use gtk-doc gtk_doc)
$(meson_use man manpages)
$(meson_use test tests)
)
meson_src_configure
}
src_test() {
local tests=(
calls:call
calls:contacts
calls:dbus
calls:manager
calls:media
calls:origin
calls:plugins
calls:provider
calls:ringer
calls:sdp-crypto
calls:settings
calls:srtp
calls:ui-call
calls:util
# TODO: needs working sound card
#calls:application
# TODO: hangs
#calls:sip
)
virtx meson_src_test "${tests[@]}"
}
ppkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
optfeature "SRTP support" media-plugins/gst-plugins-srtp
}
pkg_postrm() {

View File

@ -0,0 +1,31 @@
AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86
AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
AUX chromium-117-system-zstd.patch 998 BLAKE2B def8ed87b1d100a4272b3e13fe928a40f429546e77818ccac2cc2c15682ef3aec0d78ba158079facd0ce770049b5ef190c82d4d829f56043f7f08b51ef9b41e4 SHA512 b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8
AUX chromium-124-libwebp-shim-sharpyuv.patch 870 BLAKE2B 10b34ca3c84ec1aa95376d43c3b4c356450127493ff055bfb5fc3fbabc4fe8cda0a899041b105748c229b2a943be57c0410f1cfb0ce38c5a10e40edad02bf67b SHA512 f01e616440a0f877823edacc5762ab068e25e25f984d1b3f22f9fbdec64272c43953edec15de40ad993f1bd35aeabf88034a3c8a2e40893b2d4308b8d28e0df5
AUX chromium-125-ninja-1-12.patch 695 BLAKE2B 757e944ac0b6f0b50f11f3119ab370494c3c281624405ca4ccb273cd9eaa01203fa59f5d45049242f1c539b4de1448206f239ac90e79b73a90f9b357426ac04f SHA512 cb7f7f2cefc29ee909fef5ae63a19168241de500111dcda2f60dd2660341037d1378be179d3193d8dcdb437596bcdc83eb9921ff3b08941474c58abb9c88c296
AUX chromium-125-oauth2-client-switches.patch 2091 BLAKE2B 0ec88e0d46d32944e9cb5b97e4d76855f74e377d7fa449f34e4d80f6aa5d57bb55c599604e2d860b192b8ea2153e01c808846991b352e4aee2e001f97860c754 SHA512 4a0fc7b0ed5f19adfac580e6eaa6a9728d8d39440f15d6e7384d33c318ba00408227d0fb945a64a360ec27c189c327dd92554bba468a7402c6b86932847c0805
AUX chromium-125-system-zstd.patch 1244 BLAKE2B cc8798ba70d79953add806f03d690400e4dbc0843ecb83b317e513f00af812f5ba3282ee72a349e7c029ec618bfcbfba4366b2b9c09a01cfa687a9cffeb6f794 SHA512 7769ef643841bd56a5c3158bb6c13b45880822e465de1dd817f7f48a548b25e1d528d22da6cfbd81f5daad3f14c455a27d067c03f82eab7493f15bab28053a8c
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
DIST chromium-124-clang.tar.xz 50212876 BLAKE2B f4786d4192306c005ce790ec3fc2595055d7a835b438e3c7a101b2c56653ad0ef3eb7b797224c9fe910c7ccd31c7cad50d502411ef220d151a8a1b432610d6b8 SHA512 4fb7bbb8abc9b3ae065b32215327d5de58e27c20c0199a8c243a9bfb89bf95b932ac1c2162e65acc954bde5975373a40ccada346cd0340d89889a12e4b8b96df
DIST chromium-124-rust.tar.xz 145977368 BLAKE2B 3fccaed3a1f7b85a303f5e4281d0d7fe0d194f3203751bae4a937f3447260ecfa5141d49b945705d69d36e89901b99fd0955ce0e5bcff0c17c7096fd78782722 SHA512 272ef52b5b201aeb056db7339387504b78252411899ea13ed5829b77bab8c76fd84125d68678064ac204fa48caf16f86ee1d99c64d599d955fb1097d5e46fc51
DIST chromium-124.0.6367.155.tar.xz 3446276744 BLAKE2B af057b9c1053878294ce3a4dd5777dc260c123a8c069dc8526572f3c4d51ca0f720cc3916df4fb6204912128a5def82a9f04ca71cd19c292413d711bf1516388 SHA512 632158c82c44c67b4d7e67c646f671f2ae4344d40759cca4269c024c1ad2be2740e67dbf0e4200a4da996d7234f0ef5c51a20c90433612775ddf7d5f94e1ae09
DIST chromium-124.0.6367.207.tar.xz 3450794132 BLAKE2B b5e66e5483e48f165dcdb4c4e540913c2e4d4f93550beb1c529502122e5850594d555057e02c762a5ac2d0cc5ee5531476a5adda4ee1b43a39e0e6fcfe27ccbe SHA512 4ab47f51653b214d78215a95ff6c52db7f1f0d9bf331ec67a9b74109be8df66e84ebc927794a74777e692a77cdfd7d3fdba79190e0a70e18ee975e33050941df
DIST chromium-125-clang.tar.xz 50745124 BLAKE2B 6d9a8752a648c5e202c5597dd1adf52af9d37784166f75ab803a6dfbb4cd88e57f88851052f005d388020cd840d6854cbd295220f519325d5bfa3174ed9115dd SHA512 32200f39c1d4a24db30d67bfd324490c9fe4fcba2efb7bf83b6db14944a772cdd256dad93d7e23bf9efefc6c98007afde06ba7f8f2a1aafa7e27457e2193e23c
DIST chromium-125-rust.tar.xz 150461068 BLAKE2B b62fd93d4de25803da5eb98f67c25c455d7ae8e86f202e614bcbe9787957e63ec01ef3eabde3eb7a69d51d25a95a32577477e69ab71c008dcb55411f6d755433 SHA512 6cedf2cfdfefea782c7f1b1b13daae8e44f0678cb2a92454cdea5cd95ada14bd331fc5634da0267369743ab31d9d73ec30d971bdd7a9b68c2f2270a22c552b8c
DIST chromium-125.0.6422.26.tar.xz 3444217168 BLAKE2B 102b7c49728717e3f76760fd2b92a666423c9d86fd68acce41c06fcf39b8724b3bd14934d2760d3fbc5aeabf7a2052894a0829addfba0ee44bfba37adbdf21e9 SHA512 75c026bde0fc9c9020af6883c8a4fcf0beb6c4d46be390b3bedadc07899b7cca10f91931425c19128d55206f61ab9953373826c67b11bbfbcf2f883802a48733
DIST chromium-125.0.6422.60.tar.xz 3453234996 BLAKE2B 67b98557fdff66d6f74363820a07ae0e22c2e0b9ce1ba23b14d59b9baea7a3b727db85e158c525a111b686ce8fcdc8f3cc28e07c2b049e36dba6acf131572e57 SHA512 531bebdd363373f12c3f978cbba9de47cf99386c0ea15a9723d92f5facda50f9beae5a8a5ed8f4e49f3787f1c616b3cd45b852f872f3559b14fc64673d4b4de6
DIST chromium-patches-124.tar.bz2 4706 BLAKE2B 5acae233ce7b43669dbf65c368467f94c9a0ec509713ec4510943ede12d495dad1670a5c0a7435e0e16251c7429145e575cb1c9661439ff1c626d709856b6a94 SHA512 3d0d365b6d484def626153b07c0ab187195f27ebada63bd2547b52ed1e2157aab2415a6140c293a140d7a0545ae0fc1cdd431b37fa0c4a212a34c13baccb358c
DIST chromium-patches-125.tar.bz2 4688 BLAKE2B 96cffec1931f59bfad53efee930292ca123e3daf3cf6f062583aae15853283c32ce2f564de7e35b678a34ed7981d5e8796059d00d5409c31d3e2e5839f93cf9c SHA512 fe4173b2409002d52fd443e87ce4894b53d0b24808f002766942086b99174cb9da42b6e7f92d80d6432d78d7ae3458265ec6cf091a76d0e4e25b44dfdd438dcf
DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
DIST chromium_123.0.6312.105-1raptor0~deb12u1.debian.tar.xz 579484 BLAKE2B 587082358377f7bc0dca0dec83772abb7e040ad894ca4d456a294b7f5c19297acbc5b1dac725d3c1dbaaeefd480328c6c06c607438e560aa6359c1e98c4b1c9c SHA512 6b670a139e284cc96da65ff3c1b3e715cd9b436de2404792d619cfad23e2040fd931e7cc49f0b1ac17e11522804a4c9a621cb943e0dab33fb5bf422e954c5421
DIST chromium_124.0.6367.118-1raptor0~deb12u1.debian.tar.xz 582728 BLAKE2B ee5fe2b0bbe5d3e5edcee07fbde0934a6c219f95c4e057b7a7ea01f2579b6d87e1c7f07090e98a13eeaa79b19a563d1b12f1ae49687872527d7b55b33a8eaf51 SHA512 800f409d8d14af957218159e73e7ecdde1f5c59221c3d8693cf6be0e811b682e78541ac490bd7f1c5c6820e74c6c690817635e45465675c9906fff55d1319f9f
EBUILD chromium-124.0.6367.155.ebuild 47318 BLAKE2B 40945844480f1e8ad014f4c26f0247f223bdaa46b258e00347e059e4ff169e2c050291b3324aa68df9ff08cf2c04cb487bdce6f1803777de30d7ca00f2f9cb82 SHA512 9a17b9c3ad664e082602ed7a8efda12de4b8e7b3d04354dad24dff5121b063ba37c0bedec393cbb5b7a9c97b26a1cf123ec5f6d4183f499523f083a6c248512a
EBUILD chromium-124.0.6367.207.ebuild 47639 BLAKE2B 16dedb3631a532b443f0b766dbaa6c3744093d4fb52573469849cd9aaf7f1a7c5e286cb92c26ece10098d8846513841ac8bc9ff97b188998c2d62828cb65d067 SHA512 8bd881b109694d0f2ec1114c52d87b4bd4c159454092aeac3bde9f4e54e014edbde089af388cc6c79bc9cc8f873a22e13ab67eb844f12d58f0915d73be822a4f
EBUILD chromium-125.0.6422.26.ebuild 48117 BLAKE2B 313db1be0b82a1a1d88fc90287741e001a0d747cad2a35f3f1c5e94f66e9d25e6c960ad747a63046e74ec0d21848946f06aee70b6c546c161aba08e4db53b7f5 SHA512 b2c899115414baee163791445296fdc4c6dab30f72795a5c43cade8ba55aa7d8545256bf402e9be02573fdbb42c1b7cc041207e07553ed66ed090dd532b9902b
EBUILD chromium-125.0.6422.60.ebuild 48119 BLAKE2B a066009ca38e639eab0a9819012dbb8078544a176134aa7f6abd5bb425a94d9b9428d6532c1f6585c07fb30153e1f6e8007195cec6c1b6921fa4f92a7829b12f SHA512 a99e3b3f4ee1bc867acfdb2c3adaff177d4fc69a6ee9ad17dc9cd82b9238c1f840e94b7def8637c9db69cd4009944ca8b6c3924244ebe87a53e7bebc344f768b
MISC metadata.xml 2249 BLAKE2B 42e914e06d12ce6ebff4251fa81c28970676bb6cad7e9b1591dbbf79e45a8805fad6ee3bfb7c1b81f47e91e101091fbfcd565a0cc47f8280b9f169559ca61f2c SHA512 a30553dc4878fdb70546a1dbcb8c38ac42b0bddd500e1d09ba5a8414f681b3304e9a6a02e734c1e7eb58e782f30f6390be97b4a22996788e7639e8a9feb01ee9

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,10 @@
--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
@@ -19,7 +19,6 @@ limitations under the License.
#include <cstdio>
#include "absl/strings/string_view.h" // from @com_google_absl
-#include "third_party/zlib/contrib/minizip/ioapi.h"
namespace tflite {
namespace metadata {

View File

@ -0,0 +1,25 @@
https://chromium-review.googlesource.com/c/chromium/src/+/2959890
--- a/ui/views/animation/ink_drop_host.h
+++ b/ui/views/animation/ink_drop_host.h
@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
// Used to observe View and inform the InkDrop of host-transform changes.
ViewLayerTransformObserver host_view_transform_observer_;
+ // Declared before |ink_drop_|, because InkDropImpl may call
+ // RemoveInkDropLayer on partly destructed InkDropHost. In
+ // that case |ink_drop_mask_| must be still valid.
+ std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+
// Should not be accessed directly. Use GetInkDrop() instead.
std::unique_ptr<InkDrop> ink_drop_;
@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
int ink_drop_small_corner_radius_ = 2;
int ink_drop_large_corner_radius_ = 4;
- std::unique_ptr<views::InkDropMask> ink_drop_mask_;
-
base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
create_ink_drop_ripple_callback_;

View File

@ -0,0 +1,46 @@
From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001
From: Matt Jolly <Matt.Jolly@footclan.ninja>
Date: Sun, 17 Sep 2023 16:51:42 +1000
Subject: [PATCH] Add system-zstd
--- a/build/linux/unbundle/replace_gn_files.py
+++ b/build/linux/unbundle/replace_gn_files.py
@@ -74,6 +74,7 @@ REPLACEMENTS = {
#
'woff2': 'third_party/woff2/BUILD.gn',
'zlib': 'third_party/zlib/BUILD.gn',
+ 'zstd': 'third_party/zstd/BUILD.gn',
}
--- /dev/null
+++ b/build/linux/unbundle/zstd.gn
@@ -0,0 +1,25 @@
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_zstd") {
+ packages = [ "libzstd" ]
+}
+
+shim_headers("zstd_shim") {
+ root_path = "src/lib"
+ headers = [
+ "zdict.h",
+ "zstd.h",
+ "zstd_errors.h",
+ ]
+}
+
+source_set("zstd") {
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
+
+source_set("decompress") {
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
--
2.42.0

View File

@ -0,0 +1,36 @@
From 40c466949bd8ccb61cb55655848d23684a9f8a94 Mon Sep 17 00:00:00 2001
From: Matt Jolly <kangie@gentoo.org>
Date: Mon, 25 Mar 2024 21:38:35 +1000
Subject: [PATCH] libwebp shim: add libwebp_sharpyuv target
Signed-off-by: Matt Jolly <Kangie@gentoo.org>
--- a/build/linux/unbundle/libwebp.gn
+++ b/build/linux/unbundle/libwebp.gn
@@ -22,14 +22,24 @@ shim_headers("libwebp_shim") {
"webp/mux.h",
"webp/mux_types.h",
"webp/types.h",
+ "webp/sharpyuv/sharpyuv.h",
+ "webp/sharpyuv/sharpyuv_csp.h",
]
}
+source_set("libwebp_sharpyuv") {
+ deps = [ ":libwebp_shim" ]
+ public_configs = [ ":system_libwebp" ]
+}
+
source_set("libwebp_webp") {
deps = [ ":libwebp_shim" ]
public_configs = [ ":system_libwebp" ]
}
group("libwebp") {
- deps = [ ":libwebp_webp" ]
+ deps = [
+ ":libwebp_webp",
+ ":libwebp_sharpyuv"
+ ]
}
--
2.44.0

View File

@ -0,0 +1,17 @@
https://chromium-review.googlesource.com/c/chromium/src/+/5487538
commit a976cb05b4024b7a6452d1541378d718cdfe33e6
Author: Takuto Ikuta <tikuta@chromium.org>
Date: Thu Apr 25 07:25:32 2024
[devtools] fix a missing build dependency to a generated file
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -117,6 +117,7 @@
"//chrome/browser/autofill:autofill",
"//components/autofill/content/browser:browser",
"//components/autofill/core/browser:browser",
+ "//components/enterprise/buildflags",
"//components/paint_preview/buildflags:buildflags",
"//components/variations/service:service",
"//components/webapps/common:common",

View File

@ -0,0 +1,45 @@
From 6a84205d0399a94e8b526176a7dcafd6c2051a95 Mon Sep 17 00:00:00 2001
From: Matt Jolly <Matt.Jolly@footclan.ninja>
Date: Thu, 18 Apr 2024 21:15:20 +1000
Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
125 update
125 moved the content to a new file.
Google doesn't let us bake in OAuth2 credentials, and for some time,
Google sign-in has been broken. Arch dealt with this in March, and so
did we to some degree, but in the last few months, our sign-in
credentials have been broken. It appears that we actually did remove API
credentials in March around Chrome 89, but they got added back, perhaps
when rotating newer versions to replace older versions. Work around this
by following Arch's lead: we remove the predefined credentials, as
before, but also we patch Chromium so that people can use their own
easily, using Arch's patch for that.
For more info, see:
https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
Bug: https://bugs.gentoo.org/791871
Signed-off-by: Matt Jolly <kangie@gentoo.org>
--- a/google_apis/google_api_keys-inc.cc
+++ b/google_apis/google_api_keys-inc.cc
@@ -182,11 +182,11 @@ class APIKeyCache {
std::string default_client_id = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_ID,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
std::string(), environment.get(), command_line, gaia_config);
std::string default_client_secret = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_SECRET,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
std::string(), environment.get(), command_line, gaia_config);
// We currently only allow overriding the baked-in values for the
--
2.44.0

View File

@ -0,0 +1,53 @@
From 4ac5e29c999c7bbcb8409a2008b0061e1ae365dd Mon Sep 17 00:00:00 2001
From: Matt Jolly <Matt.Jolly@footclan.ninja>
Date: Thu, 18 Apr 2024 21:54:54 +1000
Subject: [PATCH] Zstd now needs compress, too
Existing patch updated for 125, added source_set("compress")
--- a/build/linux/unbundle/replace_gn_files.py
+++ b/build/linux/unbundle/replace_gn_files.py
@@ -80,6 +80,7 @@ REPLACEMENTS = {
'vulkan_memory_allocator' : 'third_party/vulkan_memory_allocator/BUILD.gn',
'woff2': 'third_party/woff2/BUILD.gn',
'zlib': 'third_party/zlib/BUILD.gn',
+ 'zstd': 'third_party/zstd/BUILD.gn',
}
--- /dev/null
+++ b/build/linux/unbundle/zstd.gn
@@ -0,0 +1,30 @@
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_zstd") {
+ packages = [ "libzstd" ]
+}
+
+shim_headers("zstd_shim") {
+ root_path = "src/lib"
+ headers = [
+ "zdict.h",
+ "zstd.h",
+ "zstd_errors.h",
+ ]
+}
+
+source_set("zstd") {
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
+
+source_set("compress") {
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
+
+source_set("decompress") {
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
--
2.44.0

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd">
<default-apps>
<web-browsers>
<web-browser>
<name>Chromium</name>
<executable>chromium-browser</executable>
<command>chromium-browser %s</command>
<icon-name>chromium-browser</icon-name>
<run-in-terminal>false</run-in-terminal>
</web-browser>
</web-browsers>
</default-apps>

View File

@ -0,0 +1,12 @@
--- a/build/toolchain/linux/unbundle/BUILD.gn
+++ b/build/toolchain/linux/unbundle/BUILD.gn
@@ -35,7 +35,7 @@ gcc_toolchain("host") {
extra_ldflags = getenv("BUILD_LDFLAGS")
toolchain_args = {
- current_cpu = current_cpu
- current_os = current_os
+ current_cpu = host_cpu
+ current_os = host_os
}
}

View File

@ -0,0 +1,59 @@
#!/bin/bash
# Allow the user to override command-line flags, bug #357629.
# This is based on Debian's chromium-browser package, and is intended
# to be consistent with Debian.
for f in /etc/chromium/*; do
[[ -f ${f} ]] && source "${f}"
done
# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
# default CHROMIUM_FLAGS (from /etc/chromium/default).
CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
# Let the wrapped binary know that it has been run through the wrapper
export CHROME_WRAPPER=$(readlink -f "$0")
PROGDIR=${CHROME_WRAPPER%/*}
case ":$PATH:" in
*:$PROGDIR:*)
# $PATH already contains $PROGDIR
;;
*)
# Append $PROGDIR to $PATH
export PATH="$PATH:$PROGDIR"
;;
esac
if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
# Running as root with HOME owned by root.
# Pass --user-data-dir to work around upstream failsafe.
CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
${CHROMIUM_FLAGS}"
fi
# Select session type and platform
if @@OZONE_AUTO_SESSION@@; then
platform=
if [[ ${XDG_SESSION_TYPE} == x11 ]]; then
platform=x11
elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then
platform=wayland
else
if [[ -n ${WAYLAND_DISPLAY} ]]; then
platform=wayland
else
platform=x11
fi
fi
if ${DISABLE_OZONE_PLATFORM:-false}; then
platform=x11
fi
CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}"
fi
# Set the .desktop file name
export CHROME_DESKTOP="chromium-browser-chromium.desktop"
exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"

View File

@ -0,0 +1,17 @@
diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc
--- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000
+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000
@@ -154,11 +154,11 @@ class APIKeyCache {
std::string default_client_id = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_ID,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
std::string(), environment.get(), command_line, gaia_config);
std::string default_client_secret = CalculateKeyValue(
GOOGLE_DEFAULT_CLIENT_SECRET,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
std::string(), environment.get(), command_line, gaia_config);
// We currently only allow overriding the baked-in values for the

View File

@ -0,0 +1,5 @@
# Default settings for chromium. This file is sourced by /bin/bash from
# the chromium launcher.
# Options to pass to chromium.
#CHROMIUM_FLAGS=""

View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>chromium@gentoo.org</email>
<name>Chromium in Gentoo Project</name>
</maintainer>
<maintainer type="person">
<email>kangie@gentoo.org</email>
<name>Matt Jolly</name>
</maintainer>
<use>
<flag name="ffmpeg-chromium">(binpkg only) Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag>
<flag name="debug">Enable DCHECK feature with severity configurable at runtime. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
<flag name="gtk4">Build with GTK4 headers.</flag>
<flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag>
<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
<flag name="libcxx">Use bundled libc++ instead of libstdc++ for building.</flag>
<flag name="lto">Build with Link Time Optimizations (via clang's ThinLTO)</flag>
<flag name="official">Enable Official build instead of Developer build.</flag>
<flag name="pax-kernel">Allow building on a PaX-enabled kernel</flag>
<flag name="pgo">Build with Profile Guided Optimizations (2-stage compilation)</flag>
<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
<flag name="system-harfbuzz">Use system <pkg>media-libs/harfbuzz</pkg> instead of the bundled library.</flag>
<flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled one</flag>
<flag name="system-png">Use system <pkg>media-libs/libpng</pkg> instead of the bundled library</flag>
<flag name="system-toolchain">Use system toolchain instead of the bundled one (if possible)</flag>
<flag name="system-zstd">Use system <pkg>app-arch/zstd</pkg> instead of the bundled one.</flag>
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
</use>
<upstream>
<remote-id type="github">chromium/chromium</remote-id>
<remote-id type="gitlab">Matt.Jolly/chromium-patches</remote-id>
</upstream>
</pkgmetadata>