Skip to content

Commit

Permalink
x11-drivers/nvidia-drivers: remove egl-wayland support for 390.141
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David Seifert <[email protected]>
  • Loading branch information
ionenwks authored and SoapGentoo committed Apr 17, 2021
1 parent 1577baf commit 54827cc
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand All @@ -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"
Expand All @@ -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
}

0 comments on commit 54827cc

Please sign in to comment.