[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[David Seifert]

commit:     54827cc7051bafd5ecab89306286804d8d3c8eb8
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sat Apr 17 14:44:10 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 14:44:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54827cc7

x11-drivers/nvidia-drivers: remove egl-wayland support for 390.141

Current egl-wayland does not work as expected with legacy drivers, and
old versions are lacking some features that will make it difficult to
support in the future.

Remove optfeature and add a warning just-in-case (unlikely was used).

Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
index baff134c695..d86ba28da9e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
+inherit desktop linux-info linux-mod multilib-build \
        readme.gentoo-r1 systemd toolchain-funcs unpacker
 
 NV_KERNEL_MAX="5.10"
@@ -345,6 +345,8 @@ src_install() {
 }
 
 pkg_preinst() {
+       has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+
        use driver || return
        linux-mod_pkg_preinst
 
@@ -360,8 +362,6 @@ pkg_postinst() {
 
        readme.gentoo_print_elog
 
-       optfeature "wayland EGLStream with nvidia-drm.modeset=1" 
gui-libs/egl-wayland
-
        if [[ -r /proc/driver/nvidia/version &&
                $(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  
${PV}  " ]]; then
                ewarn "Currently loaded NVIDIA modules do not match the newly 
installed"
@@ -375,4 +375,9 @@ pkg_postinst() {
                elog "This means OpenCL/CUDA (and related, like nvenc) cannot 
be used."
                elog "Other functions, like OpenGL, will continue to work."
        fi
+
+       if [[ ${NV_HAD_WAYLAND} ]]; then
+               elog "Support for EGLStream (egl-wayland) is no longer offered 
with legacy"
+               elog "nvidia-drivers. It is recommended to use nouveau drivers 
for wayland."
+       fi
 }