1 |
commit: 54827cc7051bafd5ecab89306286804d8d3c8eb8 |
2 |
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Apr 17 14:44:10 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 17 14:44:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54827cc7 |
7 |
|
8 |
x11-drivers/nvidia-drivers: remove egl-wayland support for 390.141 |
9 |
|
10 |
Current egl-wayland does not work as expected with legacy drivers, and |
11 |
old versions are lacking some features that will make it difficult to |
12 |
support in the future. |
13 |
|
14 |
Remove optfeature and add a warning just-in-case (unlikely was used). |
15 |
|
16 |
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> |
17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
18 |
|
19 |
x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild | 11 ++++++++--- |
20 |
1 file changed, 8 insertions(+), 3 deletions(-) |
21 |
|
22 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild |
23 |
index baff134c695..d86ba28da9e 100644 |
24 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild |
25 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild |
26 |
@@ -4,7 +4,7 @@ |
27 |
EAPI=7 |
28 |
|
29 |
MODULES_OPTIONAL_USE="driver" |
30 |
-inherit desktop linux-info linux-mod multilib-build optfeature \ |
31 |
+inherit desktop linux-info linux-mod multilib-build \ |
32 |
readme.gentoo-r1 systemd toolchain-funcs unpacker |
33 |
|
34 |
NV_KERNEL_MAX="5.10" |
35 |
@@ -345,6 +345,8 @@ src_install() { |
36 |
} |
37 |
|
38 |
pkg_preinst() { |
39 |
+ has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1 |
40 |
+ |
41 |
use driver || return |
42 |
linux-mod_pkg_preinst |
43 |
|
44 |
@@ -360,8 +362,6 @@ pkg_postinst() { |
45 |
|
46 |
readme.gentoo_print_elog |
47 |
|
48 |
- optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland |
49 |
- |
50 |
if [[ -r /proc/driver/nvidia/version && |
51 |
$(grep -o ' [0-9.]* ' /proc/driver/nvidia/version) != " ${PV} " ]]; then |
52 |
ewarn "Currently loaded NVIDIA modules do not match the newly installed" |
53 |
@@ -375,4 +375,9 @@ pkg_postinst() { |
54 |
elog "This means OpenCL/CUDA (and related, like nvenc) cannot be used." |
55 |
elog "Other functions, like OpenGL, will continue to work." |
56 |
fi |
57 |
+ |
58 |
+ if [[ ${NV_HAD_WAYLAND} ]]; then |
59 |
+ elog "Support for EGLStream (egl-wayland) is no longer offered with legacy" |
60 |
+ elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland." |
61 |
+ fi |
62 |
} |