commit: 4d896678b0ffc41c19ce2aa0a72a55fe6e02215b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 02:42:44 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 03:06:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d896678
x11-drivers/nvidia-drivers: make egl-x11 X+wayland conditional
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 <AT> gentoo.org>
...57.01.ebuild => nvidia-drivers-565.57.01-r1.ebuild} | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r1.ebuild
similarity index 97%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r1.ebuild
index f9ce1a16cbf2..943fe4d2048c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-565.57.01-r1.ebuild
@@ -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
