1 |
commit: 8f441534b905c0fd42a9f6acf8359f259db09482 |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 10 16:06:46 2020 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 10 16:07:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f441534 |
7 |
|
8 |
www-client/chromium: beta channel bump to 86.0.4240.30 |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
12 |
|
13 |
www-client/chromium/Manifest | 2 +- |
14 |
...4240.22.ebuild => chromium-86.0.4240.30.ebuild} | 27 ++++++++++++++-------- |
15 |
2 files changed, 19 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
18 |
index 35cc95d35e4..a41404cd8ce 100644 |
19 |
--- a/www-client/chromium/Manifest |
20 |
+++ b/www-client/chromium/Manifest |
21 |
@@ -1,7 +1,7 @@ |
22 |
DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e |
23 |
DIST chromium-85.0.4183.102.tar.xz 833172260 BLAKE2B f10cd8579db8c5d61d818604da0353baf5848b7658ec3942bd67471d29b4b4399d989349b1830009df139db9061452ce66fdedfec09f66074e37594584f546b3 SHA512 acd6f0a7b74018098752b6598e09a2bd6d1c9f1120c39a5c6cd3d924c466be92b854f3c7f91693ba9506e47b173ef12c14427f998362524b2497fbe5587a6b6c |
24 |
DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef |
25 |
-DIST chromium-86.0.4240.22.tar.xz 826192852 BLAKE2B 5316bbd211dabfbe76be7718ba54751005dfb91ae342d3e7861700e75669a90393c55a386836ad1f66c330d46227271857d326bd265d68ca3e471e5ebaa6a116 SHA512 ae4243bcd42e20701ac7e45d4fcd301ea6d7190aed961a4ccfc1f57e2dac7e583fbb664ea62f9cf75a556a76804a4488a4e571389d7b09acbe793917f647f6c0 |
26 |
+DIST chromium-86.0.4240.30.tar.xz 826279324 BLAKE2B 133a696f326627dc07234ceaba006bce27ea57a0c857727759caab34e32c2dd3b16d1bb4e1a20d575595636b241cf2c0264a921f2aedcdd3ce05abb45b3f0090 SHA512 c45e7c0df5ba5e589b34785e1b2b448cb95cd1352642a97cdbddce47db33024b3411e5b76380f54c64e27bd077a0b645896a641d712b35a60a9ddf85260e0f70 |
27 |
DIST chromium-87-patchset-1.tar.xz 8528 BLAKE2B 5595819da4051f8cdffaa9ae878902a44f1d56c6d360aa1bf3e9cc40e267dd9860c46d51df44a1ec72bb503e0fb6dda5cdcb1383168bfe56c414f8cae5c974b3 SHA512 8e335ae85796174c11b15cc8a79a7986751fcb14f197f88a2c76ee7ec8c733184f55dd0440d20f9543ca3abdb11dad37c4e9b7d540ed783cdd663a873b43ec78 |
28 |
DIST chromium-87.0.4252.0.tar.xz 828988988 BLAKE2B acc7fb9466e1dccde6eda1a2a4ae978606ae0c18f755cb64828a806868b8388be67770ad411680a66d01faee328558087968a34281d100bbe93dca49d62bceae SHA512 2c9202233439629ce67abed4fc67790aa7c27eb8b981ebcbf90f8e89082c2926824632b11ba56df04f7478207080a9b78f52ecf3ad23f7a7958064f4e68df6f0 |
29 |
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf |
30 |
|
31 |
diff --git a/www-client/chromium/chromium-86.0.4240.22.ebuild b/www-client/chromium/chromium-86.0.4240.30.ebuild |
32 |
similarity index 96% |
33 |
rename from www-client/chromium/chromium-86.0.4240.22.ebuild |
34 |
rename to www-client/chromium/chromium-86.0.4240.30.ebuild |
35 |
index 52e0c137635..fcb525d806f 100644 |
36 |
--- a/www-client/chromium/chromium-86.0.4240.22.ebuild |
37 |
+++ b/www-client/chromium/chromium-86.0.4240.30.ebuild |
38 |
@@ -21,11 +21,12 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
39 |
LICENSE="BSD" |
40 |
SLOT="0" |
41 |
KEYWORDS="~amd64 ~arm64 ~x86" |
42 |
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine" |
43 |
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
44 |
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
45 |
REQUIRED_USE=" |
46 |
component-build? ( !suid ) |
47 |
- wayland? ( ozone ) |
48 |
+ headless? ( ozone ) |
49 |
+ ozone-wayland? ( ozone ) |
50 |
" |
51 |
|
52 |
COMMON_X_DEPEND=" |
53 |
@@ -58,7 +59,7 @@ COMMON_DEPEND=" |
54 |
>=media-libs/harfbuzz-2.4.0:0=[icu(-)] |
55 |
media-libs/libjpeg-turbo:= |
56 |
media-libs/libpng:= |
57 |
- system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) |
58 |
+ system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc] ) |
59 |
pulseaudio? ( media-sound/pulseaudio:= ) |
60 |
system-ffmpeg? ( |
61 |
>=media-video/ffmpeg-4.3:= |
62 |
@@ -81,11 +82,12 @@ COMMON_DEPEND=" |
63 |
ozone? ( |
64 |
!headless? ( |
65 |
${COMMON_X_DEPEND} |
66 |
- x11-libs/gtk+:3[wayland?,X] |
67 |
- wayland? ( |
68 |
+ x11-libs/gtk+:3[X] |
69 |
+ ozone-wayland? ( |
70 |
dev-libs/wayland:= |
71 |
dev-libs/libffi:= |
72 |
x11-libs/libdrm:= |
73 |
+ x11-libs/gtk+:3[wayland,X] |
74 |
x11-libs/libxkbcommon:= |
75 |
) |
76 |
) |
77 |
@@ -220,6 +222,13 @@ pkg_setup() { |
78 |
pre_build_checks |
79 |
|
80 |
chromium_suid_sandbox_check_kernel_config |
81 |
+ |
82 |
+ # nvidia-drivers does not work correctly with Ozone due to unsupported EGLStreams |
83 |
+ if use ozone && ! use headless && has_version "x11-drivers/nvidia-drivers"; then |
84 |
+ ewarn "Proprietary nVidia driver does not work correctly with Ozone. You might be" |
85 |
+ ewarn "able to work around this problem by using SwiftShader OpenGL implementation." |
86 |
+ ewarn "Add --use-gl=swiftshader to CHROMIUM_FLAGS in /etc/chromium/default to force SwiftShader." |
87 |
+ fi |
88 |
} |
89 |
|
90 |
src_prepare() { |
91 |
@@ -464,7 +473,7 @@ src_prepare() { |
92 |
if use tcmalloc; then |
93 |
keeplibs+=( third_party/tcmalloc ) |
94 |
fi |
95 |
- if use ozone && use wayland && ! use headless ; then |
96 |
+ if use ozone && use ozone-wayland && ! use headless ; then |
97 |
keeplibs+=( third_party/wayland ) |
98 |
fi |
99 |
if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then |
100 |
@@ -708,10 +717,10 @@ src_configure() { |
101 |
myconf_gn+=" ozone_platform_headless=true" |
102 |
if ! use headless; then |
103 |
myconf_gn+=" use_system_libdrm=true" |
104 |
- myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)" |
105 |
+ myconf_gn+=" ozone_platform_wayland=$(usex ozone-wayland true false)" |
106 |
myconf_gn+=" ozone_platform_x11=true" |
107 |
myconf_gn+=" ozone_platform_headless=true" |
108 |
- if use wayland; then |
109 |
+ if use ozone-wayland; then |
110 |
myconf_gn+=" use_system_minigbm=true use_xkbcommon=true" |
111 |
myconf_gn+=" ozone_platform=\"wayland\"" |
112 |
else |
113 |
@@ -797,7 +806,7 @@ src_install() { |
114 |
doexe out/Release/chromedriver |
115 |
|
116 |
ozone_auto_session () { |
117 |
- use ozone && use wayland && ! use headless && echo true || echo false |
118 |
+ use ozone && use ozone-wayland && ! use headless && echo true || echo false |
119 |
} |
120 |
local sedargs=( -e |
121 |
"s:/usr/lib/:/usr/$(get_libdir)/:g; |