gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-02 11:38:07 -07:00
Code Issues Projects Releases Wiki Activity

x11-drivers/nvidia-drivers: make egl-x11 X+wayland conditional

Browse Source 
Upon closer look, this should only be for xwayland, so can skip
a few dependencies for pure X users. Pure wayland users (no
xwayland), also shouldn't need it.

Should likely package this separately like egl-wayland too, but
currently egl-x11 has no releases and little activity not sure
if we should be using it yet. Overall it'd be simpler to just use
the provided egl-gbm/wayland/x11 but this is about building from
source when we can.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2024-10-22 22:42:44 -04:00
parent a8d1cb9881
commit 4d896678b0
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01.ebuild → x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r1.ebuild
View File

@@ -57,18 +57,19 @@ RDEPEND="
dev-libs/openssl:0/3
sys-libs/glibc
X? (
>=gui-libs/egl-gbm-1.1.1-r2[abi_x86_32(-)?]
media-libs/libglvnd[X,abi_x86_32(-)?]
media-libs/mesa[gbm(+),abi_x86_32(-)?]
x11-libs/libX11[abi_x86_32(-)?]
x11-libs/libXext[abi_x86_32(-)?]
x11-libs/libdrm[abi_x86_32(-)?]
x11-libs/libxcb:=[abi_x86_32(-)?]
)
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(-)?]
X? (
media-libs/mesa[gbm(+),abi_x86_32(-)?]
x11-libs/libdrm[abi_x86_32(-)?]
x11-libs/libxcb:=[abi_x86_32(-)?]
)
)
"
DEPEND="
@@ -259,9 +260,12 @@ src_install() {
)
local skip_files=(
$(usev !X "
libGLX_nvidia libglxserver_nvidia
libnvidia-egl-xcb libnvidia-egl-xlib
$(usev !X "libGLX_nvidia libglxserver_nvidia")
# TODO?: package egl-x11 separately and drop wayland? ( X? ( deps ) )
# https://github.com/NVIDIA/egl-x11 (but no release yet, maybe wait)
$(use !X || use !wayland && echo "
libnvidia-egl-xcb 20_nvidia_xcb.json
libnvidia-egl-xlib 20_nvidia_xlib.json
")
libGLX_indirect # non-glvnd unused fallback
libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source