From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CD251382C5 for ; Sat, 17 Apr 2021 14:44:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE487E0833; Sat, 17 Apr 2021 14:44:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A42B9E0833 for ; Sat, 17 Apr 2021 14:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 800BF340B9E for ; Sat, 17 Apr 2021 14:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB3EF66A for ; Sat, 17 Apr 2021 14:44:55 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1618670650.54827cc7051bafd5ecab89306286804d8d3c8eb8.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 54827cc7051bafd5ecab89306286804d8d3c8eb8 X-VCS-Branch: master Date: Sat, 17 Apr 2021 14:44:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f3b0939-7d8a-42f9-a8ba-914e37485b2d X-Archives-Hash: cbdac70bae6acb4d33d818ef0af95a8d commit: 54827cc7051bafd5ecab89306286804d8d3c8eb8 Author: Ionen Wolkens gmail com> AuthorDate: Sat Apr 17 14:44:10 2021 +0000 Commit: David Seifert gentoo 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 gmail.com> Signed-off-by: David Seifert 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 }