diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-07-30 17:57:01 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-07-30 18:26:58 -0400 |
| commit | f6848db8a0ebdf15540633639fa0154961e9aa3f (patch) | |
| tree | fb8e6c36c0c10e5d8ff796ab513bfb58915e65a8 /x11-drivers | |
| parent | gui-libs/egl-gbm: backport fix for nvidia-drivers:0/560 (diff) | |
| download | gentoo-f6848db8a0ebdf15540633639fa0154961e9aa3f.tar.gz gentoo-f6848db8a0ebdf15540633639fa0154961e9aa3f.tar.bz2 gentoo-f6848db8a0ebdf15540633639fa0154961e9aa3f.zip | |
x11-drivers/nvidia-drivers: try using source-built egl-gbm again
It *looked* like egl-gbm repo was missing changes, but the single
1 line commit from 3 months ago turned out to be relevant for 560
and egl-gbm hadn't got a release in the interim.
Source egl-gbm is now patched, so let's go back to it before we
keyword a 560 release.
Also cleanup outdated egl-wayland comment, that's resolved thanks
to 1.1.13.1 receiving the same change as egl-gbm.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r3.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r2.ebuild) | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r3.ebuild index c6503b3615b4..662958bb9a1b 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r3.ebuild @@ -25,9 +25,6 @@ S=${WORKDIR} LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl" SLOT="0/${PV%%.*}" # no keywords due to being a beta, feel free to opt-in for testing -# note: before keywording a 560 release, should likely unmask -# egl-wayland-1.1.14 (maybe do a snapshot) and >=depend on it, -# it seems to fix a fair amount of issues with 560 #KEYWORDS="-* ~amd64 ~arm64" # note: kernel-open is an upstream default in >=560 if all GPUs on the system # support it but, since no automagic here, keeping it off for the wider support @@ -66,10 +63,8 @@ RDEPEND=" ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( + >=gui-libs/egl-gbm-1.1.1-r2[abi_x86_32(-)?] >=gui-libs/egl-wayland-1.1.13.1[abi_x86_32(-)?] - media-libs/mesa[gbm(+),abi_x86_32(-)?] - x11-libs/libdrm[abi_x86_32(-)?] - !gui-libs/egl-gbm ) " DEPEND=" @@ -247,9 +242,9 @@ src_install() { local skip_files=( $(usev !X "libGLX_nvidia libglxserver_nvidia") - $(usev !wayland "libnvidia-egl-gbm 15_nvidia_gbm") libGLX_indirect # non-glvnd unused fallback libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source + libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland libnvidia-pkcs11.so # using the openssl3 version instead ) |