summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2024-07-24 08:21:29 -0400
committerIonen Wolkens <ionen@gentoo.org>2024-07-24 08:54:01 -0400
commit96b53cf79818f6b7e85b20df9c14f2155aa83b1a (patch)
treebcb805eb0db1ff6c2ad342c38987d0bf695d3612 /x11-drivers
parentdev-python/tifffile: Enable py3.13 (diff)
downloadgentoo-96b53cf79818f6b7e85b20df9c14f2155aa83b1a.tar.gz
gentoo-96b53cf79818f6b7e85b20df9c14f2155aa83b1a.tar.bz2
gentoo-96b53cf79818f6b7e85b20df9c14f2155aa83b1a.zip
x11-drivers/nvidia-drivers: use prebuilt egl-gbm
Seems nvidia is no longer updating the egl-gbm repo, and unless we use the bundled copy wayland w/ gbm is entirely broken. 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-r1.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03.ebuild)13
1 files changed, 8 insertions, 5 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r1.ebuild
index 15575a6949ab..9114d6c41be5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.28.03-r1.ebuild
@@ -63,8 +63,10 @@ RDEPEND="
)
powerd? ( sys-apps/dbus[abi_x86_32(-)?] )
wayland? (
- gui-libs/egl-gbm[abi_x86_32(-)?]
- >=gui-libs/egl-wayland-1.1.10[abi_x86_32(-)?]
+ gui-libs/egl-wayland[abi_x86_32(-)?]
+ media-libs/mesa[gbm(+),abi_x86_32(-)?]
+ x11-libs/libdrm[abi_x86_32(-)?]
+ !gui-libs/egl-gbm
)
"
DEPEND="
@@ -242,9 +244,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
)
@@ -377,8 +379,9 @@ documentation that is installed alongside this README."
dosym ${m[4]} ${into}/${m[0]}
continue
fi
- [[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
- dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
+ # avoid portage warning due to missing soname links in manifest
+ [[ ${m[0]} =~ .*((libnvidia-ngx.so|libnvidia-egl-gbm.so).*) ]] &&
+ dosym ${BASH_REMATCH[1]} ${into}/${BASH_REMATCH[2]}.1
printf -v m[1] %o $((m[1] | 0200)) # 444->644
insopts -m${m[1]}