diff options
37 files changed, 311 insertions, 226 deletions
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.154 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.154 index 55217e33..695d816f 100644 --- a/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.154 +++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.154 @@ -6,8 +6,8 @@ HOMEPAGE=http://www.nvidia.com/ INHERIT=eutils KEYWORDS=amd64 LICENSE=GPL-2 NVIDIA-r2 -RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms -SLOT=0 +RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:470 !!sys-kernel/nvidia-drivers-dkms:515 +SLOT=390 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=3ee78272c14f43bb7f09b013dfe31bb8 +_md5_=8071db473cea8442c9d93a090435b9f0 diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r1 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r2 index e8aaebd3..c011758c 100644 --- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r1 +++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r2 @@ -6,8 +6,8 @@ HOMEPAGE=http://www.nvidia.com/ INHERIT=eutils KEYWORDS=amd64 LICENSE=GPL-2 NVIDIA-r2 -RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-legacy-dkms -SLOT=0 +RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:515 +SLOT=470 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run ) _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=cd77211d1b2a14ed00683d3638cad3ff +_md5_=d047fc7093d854a91575a3b6e63192c6 diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.65.01 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.65.01 new file mode 100644 index 00000000..19af6f2f --- /dev/null +++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.65.01 @@ -0,0 +1,14 @@ +DEFINED_PHASES=install postinst prerm unpack +DEPEND=sys-kernel/dkms +DESCRIPTION=NVIDIA driver sources for linux +EAPI=6 +HOMEPAGE=http://www.nvidia.com/ +INHERIT=eutils +IUSE=+kernel-open +KEYWORDS=amd64 +LICENSE=GPL-2 NVIDIA-r2 +RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:470 +SLOT=515 +SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/515.65.01/NVIDIA-Linux-x86_64-515.65.01.run ) +_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=c9a3c5a91867b882273a1b50f64f225b diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.154 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154 index c2e00391..c006febe 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.154 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154 @@ -7,10 +7,10 @@ INHERIT=eutils flag-o-matic multilib-minimal portability toolchain-funcs unpacke IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 KEYWORDS=-* ~amd64 LICENSE=GPL-2 NVIDIA-r2 -PDEPEND=tools? ( ~x11-misc/nvidia-settings-legacy-390.154:0 ) -RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-legacy-dkms-390.154:0 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +PDEPEND=tools? ( ~x11-misc/nvidia-settings-390.154:390 ) +RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers:470 !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-390.154:390 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) RESTRICT=bindist mirror -SLOT=0 +SLOT=390 SRC_URI=amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 29a755b1291d64133634d80b0328f153 ltprune 97143780d341cc8d8f1d4c6187a36d29 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 portability 58227860123d3e8da23290064ce3373e preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 unpacker bc57272a0491765c71d973c8cfd35063 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=bd9145b857a88f0329ca846ace8a4465 +_md5_=1b6f625d13d986d1c97170696e7fbc4d diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 index f797cbd8..49045a8f 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 @@ -6,10 +6,10 @@ INHERIT=flag-o-matic multilib-minimal portability toolchain-funcs unpacker IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 KEYWORDS=-* ~amd64 LICENSE=GPL-2 NVIDIA-r2 -PDEPEND=tools? ( ~x11-misc/nvidia-settings-470.141.03:0 ) -RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers-legacy acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.141.03:0 ) wayland? ( ~gui-libs/egl-wayland-1.1.7 ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +PDEPEND=tools? ( ~x11-misc/nvidia-settings-470.141.03:470 ) +RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers:390 !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.141.03:470 ) wayland? ( ~gui-libs/egl-wayland-1.1.7 ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) REQUIRED_USE=tools? ( X ) -SLOT=0 +SLOT=470 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run ) _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 29a755b1291d64133634d80b0328f153 ltprune 97143780d341cc8d8f1d4c6187a36d29 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 portability 58227860123d3e8da23290064ce3373e preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 unpacker bc57272a0491765c71d973c8cfd35063 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=b99afc09351dceaf344cc86bc9564ba1 +_md5_=012f56f4ba515617a06688d4b0e9d823 diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.154 b/metadata/md5-cache/x11-misc/nvidia-settings-390.154 index db9a9aa6..57b725c3 100644 --- a/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.154 +++ b/metadata/md5-cache/x11-misc/nvidia-settings-390.154 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile install prepare -DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings ~x11-drivers/nvidia-drivers-legacy-390.154:0 virtual/pkgconfig x11-base/xorg-proto +DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:470 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-390.154:390 virtual/pkgconfig x11-base/xorg-proto DESCRIPTION=NVIDIA Linux X11 Settings Utility EAPI=6 HOMEPAGE=http://www.nvidia.com/ INHERIT=eutils multilib toolchain-funcs KEYWORDS=-* amd64 LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings ~x11-drivers/nvidia-drivers-legacy-390.154:0 -SLOT=0 -SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/390.154.tar.gz -> nvidia-settings-legacy-390.154.tar.gz +RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:470 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-390.154:390 +SLOT=390 +SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/390.154.tar.gz -> nvidia-settings-390.154.tar.gz _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=ff3f923f11542429081fecb3172ef771 +_md5_=50691023f56a9fd28b7bc4eff1fe1ef2 diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r1 b/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r2 index c3764ac3..b1f35d2d 100644 --- a/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r1 +++ b/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r2 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile install prepare -DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings-legacy virtual/pkgconfig x11-base/xorg-proto +DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.141.03:470 virtual/pkgconfig x11-base/xorg-proto DESCRIPTION=NVIDIA Linux X11 Settings Utility EAPI=6 HOMEPAGE=http://www.nvidia.com/ INHERIT=eutils multilib toolchain-funcs KEYWORDS=-* amd64 LICENSE=GPL-2 -RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings-legacy -SLOT=0 +RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.141.03:470 +SLOT=470 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/470.141.03.tar.gz -> nvidia-settings-470.141.03.tar.gz _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=62d69382d455e26bc1d0139b17b75d90 +_md5_=773c5103e65a6b635dfc52bcf3a7cdef diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-515.65.01 b/metadata/md5-cache/x11-misc/nvidia-settings-515.65.01 new file mode 100644 index 00000000..46f57d5e --- /dev/null +++ b/metadata/md5-cache/x11-misc/nvidia-settings-515.65.01 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:470 ~x11-drivers/nvidia-drivers-515.65.01:515 virtual/pkgconfig x11-base/xorg-proto +DESCRIPTION=NVIDIA Linux X11 Settings Utility +EAPI=6 +HOMEPAGE=http://www.nvidia.com/ +INHERIT=eutils multilib toolchain-funcs +KEYWORDS=-* amd64 +LICENSE=GPL-2 +RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:470 ~x11-drivers/nvidia-drivers-515.65.01:515 +SLOT=515 +SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/515.65.01.tar.gz -> nvidia-settings-515.65.01.tar.gz +_eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c +_md5_=87877a6990b0bd63ab69a56430c87ef7 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 015644d0..15fbac05 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -64,8 +64,7 @@ sys-kernel/linux-image-redcore-lts-legacy 5.10.148: Redcore Linux Kernel Image ( sys-kernel/linux-sources-redcore 6.0.2: Redcore Linux Kernel Sources sys-kernel/linux-sources-redcore-lts 5.15.74: Redcore Linux Kernel Sources (LTS) sys-kernel/linux-sources-redcore-lts-legacy 5.10.148: Redcore Linux Kernel Sources (LTS Legacy v5.10) -sys-kernel/nvidia-drivers-dkms 470.141.03-r1: NVIDIA driver sources for linux -sys-kernel/nvidia-drivers-legacy-dkms 390.154: NVIDIA driver sources for linux +sys-kernel/nvidia-drivers-dkms 390.154 470.141.03-r2 515.65.01: NVIDIA driver sources for linux sys-kernel/vhba-dkms 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources sys-kernel/virtualbox-modules-dkms 6.1.38-r1: Kernel Modules source for Virtualbox sys-kernel/zfs-dkms 2.1.6: ZFS sources for linux @@ -80,13 +79,11 @@ virtual/udev 314.1337: Virtual to select between different udev daemon providers x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package) x11-base/xorg-server 21.1.4-r100: X.Org X servers x11-base/xwayland 22.1.3-r100: Standalone X server running under Wayland -x11-drivers/nvidia-drivers 470.141.03: NVIDIA Accelerated Graphics Driver -x11-drivers/nvidia-drivers-legacy 390.154: NVIDIA Accelerated Graphics Driver +x11-drivers/nvidia-drivers 390.154 470.141.03: NVIDIA Accelerated Graphics Driver x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit + x11-libs/libX11 1.8.1-r1: X.Org X11 library x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities -x11-misc/nvidia-settings 470.141.03-r1: NVIDIA Linux X11 Settings Utility -x11-misc/nvidia-settings-legacy 390.154: NVIDIA Linux X11 Settings Utility +x11-misc/nvidia-settings 390.154 470.141.03-r2 515.65.01: NVIDIA Linux X11 Settings Utility x11-misc/pcmanfm-qt-share 1337: PCManFM-QT custom action to share folder using Samba x11-misc/sddm 0.18.1-r100: Simple Desktop Display Manager x11-themes/material-icon-theme 1.314.1337: Icon theme following the Google's material design specifications diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index 08aba9c1..65c872ea 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1 +1,3 @@ +DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33 SHA512 cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3 DIST NVIDIA-Linux-x86_64-470.141.03.run 272986406 BLAKE2B 12ef580dd98146715442e6b8e9f27bab4a12121f3edb2e291961f8dea96ec1b81d2c974d380018223999c67a7bec9873675487f436e60aab34e83b1a5b7065f1 SHA512 07aca8ea6aac5592060b4177ef43e9a3a5b2e3bc1a2d5959bf2ae349763fc62ed80b987af5607bf2d9a48e25c4e38e64970bca0177d63bd57a703d47debf5e18 +DIST NVIDIA-Linux-x86_64-515.65.01.run 364182561 BLAKE2B 552084a5347c0388f5cb0a6eecf41fb3d401356cbbbe957569e3eb0a4ca03b3db0dea0f7f6a37a6b66cf6d5377677ee57a6df73668002a13efd8140b153fcf03 SHA512 5221a4ac071eb39a37a841f19cfe4983286dc35e918956b40604404ef36c122612475df7b9a391a9a70bd60f44e598c8a0e5ec54ccc3e90d51f01e1b2fbe5e33 diff --git a/sys-kernel/nvidia-drivers-legacy-dkms/files/dkms.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch index 1e9af552..19e98d8d 100644 --- a/sys-kernel/nvidia-drivers-legacy-dkms/files/dkms.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch @@ -1,11 +1,12 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2018-03-22 05:39:53.000000000 +0000 -+++ b/kernel/dkms.conf 2018-04-09 16:18:23.177125417 +0100 +--- a/kernel/dkms.conf 2021-11-02 06:16:12.000000000 +0000 ++++ b/kernel/dkms.conf 2022-10-16 15:03:27.841471738 +0100 @@ -1,12 +1,20 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" -+PACKAGE_NAME="nvidia-drivers-legacy-dkms" ++PACKAGE_NAME="nvidia-drivers-dkms" +PACKAGE_VERSION="390.154" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # only build for Kernel 5 AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, @@ -13,7 +14,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting # the 'make' command name to suppress this behavior. -MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" -+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" # The list of kernel modules will be generated by nvidia-installer at runtime. -__DKMS_MODULES @@ -25,4 +26,3 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +DEST_MODULE_LOCATION[2]="/extra/dkms" +BUILT_MODULE_NAME[3]="nvidia-drm" +DEST_MODULE_LOCATION[3]="/extra/dkms" -+ diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch index 3e2a7cd9..7ee395df 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch @@ -1,11 +1,12 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2021-07-07 23:03:22.000000000 +0100 -+++ b/kernel/dkms.conf 2021-08-07 22:05:52.634341135 +0100 -@@ -1,12 +1,21 @@ +--- a/kernel/dkms.conf 2022-06-30 19:31:05.000000000 +0100 ++++ b/kernel/dkms.conf 2022-10-16 15:06:33.644466229 +0100 +@@ -1,12 +1,22 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-dkms" +PACKAGE_VERSION="470.141.03" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # Only build for kernel 5 AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch new file mode 100644 index 00000000..fd79108e --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch @@ -0,0 +1,58 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2022-07-20 14:40:39.000000000 +0100 ++++ b/kernel/dkms.conf 2022-10-16 14:05:53.921574151 +0100 +@@ -1,12 +1,22 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="515.65.01" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++BUILT_MODULE_NAME[4]="nvidia-peermem" ++DEST_MODULE_LOCATION[4]="/extra/dkms" +diff -Nur a/kernel-open/dkms.conf b/kernel-open/dkms.conf +--- a/kernel-open/dkms.conf 2022-07-20 14:40:39.000000000 +0100 ++++ b/kernel-open/dkms.conf 2022-10-16 14:07:17.596571670 +0100 +@@ -1,12 +1,22 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="515.65.01" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++BUILT_MODULE_NAME[4]="nvidia-peermem" ++DEST_MODULE_LOCATION[4]="/extra/dkms" diff --git a/sys-kernel/nvidia-drivers-dkms/files/fs62142.patch b/sys-kernel/nvidia-drivers-dkms/files/fs62142.patch deleted file mode 100644 index 04806bd8..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/fs62142.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c -index 73cdeed..e691014 100644 ---- a/kernel/nvidia/nv-dma.c -+++ b/kernel/nvidia/nv-dma.c -@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented - #if defined(NV_DMA_MAP_RESOURCE_PRESENT) - const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev); - -- return (ops->map_resource != NULL); -+ return (ops && ops->map_resource); - #else - return NV_FALSE; - #endif diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-6.0.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-6.0.patch deleted file mode 100644 index 372b6572..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/kernel-6.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nur a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c ---- a/kernel/nvidia/nv-acpi.c 2022-06-30 20:05:22.000000000 +0100 -+++ b/kernel/nvidia/nv-acpi.c 2022-10-13 23:34:09.841766070 +0100 -@@ -16,7 +16,10 @@ - - #include <linux/acpi.h> - --#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) -+#include <linux/version.h> -+// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022) -+// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported) -+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) - static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *); - static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *); - static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *); -diff -Nur a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c ---- a/kernel/nvidia/nv.c 2022-06-30 20:05:22.000000000 +0100 -+++ b/kernel/nvidia/nv.c 2022-10-13 23:34:09.841766070 +0100 -@@ -5423,7 +5423,8 @@ - { - NvU8 buf[8]; - --#if defined(NV_SEQ_READ_ITER_PRESENT) -+// FIXME: Avoid this code path because on Linux 6.0-rc1, init_sync_kiocb references a GPL symbol -+#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) - struct file *file; - ssize_t num_read; - struct kiocb kiocb; -diff -Nur a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c ---- a/kernel/nvidia-drm/nvidia-drm-helper.c 2022-06-30 19:33:22.000000000 +0100 -+++ b/kernel/nvidia-drm/nvidia-drm-helper.c 2022-10-13 23:34:09.841766070 +0100 -@@ -41,6 +41,11 @@ - #include <drm/drm_atomic_uapi.h> - #endif - -+// Add header which is no longer indirectly referenced as of Linux 6.0-rc1 -+#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT) -+#include <drm/drm_framebuffer.h> -+#endif -+ - static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb) - { - #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT) diff --git a/sys-kernel/nvidia-drivers-legacy-dkms/nvidia-drivers-legacy-dkms-390.154.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.154.ebuild index e95877a1..5f6d75ec 100644 --- a/sys-kernel/nvidia-drivers-legacy-dkms/nvidia-drivers-legacy-dkms-390.154.ebuild +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.154.ebuild @@ -14,16 +14,17 @@ HOMEPAGE="http://www.nvidia.com/" SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" LICENSE="GPL-2 NVIDIA-r2" -SLOT="0" +SLOT="390" KEYWORDS="amd64" IUSE="" DEPEND="sys-kernel/dkms" RDEPEND="${DEPEND} - !!sys-kernel/nvidia-drivers-dkms" + !!sys-kernel/nvidia-drivers-dkms:470 + !!sys-kernel/nvidia-drivers-dkms:515" -PATCHES=( - "${FILESDIR}"/dkms.patch +PATCHES=( + "${FILESDIR}"/dkms390.patch ) S="${WORKDIR}/${AMD64_NV_PACKAGE}" diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r2.ebuild index a24cf3f6..a6b908d0 100644 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r1.ebuild +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r2.ebuild @@ -14,18 +14,17 @@ HOMEPAGE="http://www.nvidia.com/" SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" LICENSE="GPL-2 NVIDIA-r2" -SLOT="0" +SLOT="470" KEYWORDS="amd64" IUSE="" DEPEND="sys-kernel/dkms" RDEPEND="${DEPEND} - !!sys-kernel/nvidia-drivers-legacy-dkms" + !!sys-kernel/nvidia-drivers-dkms:390 + !!sys-kernel/nvidia-drivers-dkms:515" PATCHES=( - "${FILESDIR}"/fs62142.patch - "${FILESDIR}"/kernel-6.0.patch - "${FILESDIR}"/dkms.patch + "${FILESDIR}"/dkms470.patch ) S="${WORKDIR}/${AMD64_NV_PACKAGE}" diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.65.01.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.65.01.ebuild new file mode 100644 index 00000000..05200eca --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.65.01.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +NV_URI="http://us.download.nvidia.com/XFree86/" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" + +DESCRIPTION="NVIDIA driver sources for linux" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" + +LICENSE="GPL-2 NVIDIA-r2" +SLOT="515" +KEYWORDS="amd64" +IUSE="+kernel-open" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND} + !!sys-kernel/nvidia-drivers-dkms:390 + !!sys-kernel/nvidia-drivers-dkms:470" + +PATCHES=( + "${FILESDIR}"/dkms515.patch +) + +S="${WORKDIR}/${AMD64_NV_PACKAGE}" + +src_unpack() { + sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only +} + +src_install() { + dodir usr/src/${P} + insinto usr/src/${P} + if use kernel-open; then + doins -r "${S}"/kernel-open/* + else + doins -r "${S}"/kernel/* + fi +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} diff --git a/sys-kernel/nvidia-drivers-legacy-dkms/Manifest b/sys-kernel/nvidia-drivers-legacy-dkms/Manifest deleted file mode 100644 index ea3f9a24..00000000 --- a/sys-kernel/nvidia-drivers-legacy-dkms/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33 SHA512 cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3 diff --git a/x11-drivers/nvidia-drivers-legacy/Manifest b/x11-drivers/nvidia-drivers-legacy/Manifest deleted file mode 100644 index ea3f9a24..00000000 --- a/x11-drivers/nvidia-drivers-legacy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33 SHA512 cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3 diff --git a/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf b/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf deleted file mode 100644 index 00c6f588..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf +++ /dev/null @@ -1,3 +0,0 @@ -blacklist nouveau -options nouveau modeset=0 -alias nouveau off diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf deleted file mode 100644 index a94d18ca..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf +++ /dev/null @@ -1,8 +0,0 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" - Option "AllowEmptyInitialConfiguration" - ModulePath "/usr/lib64/nvidia/xorg" - ModulePath "/usr/lib64/xorg/modules" -EndSection diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf deleted file mode 100644 index b8be3b7c..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf +++ /dev/null @@ -1,8 +0,0 @@ -# run-time configuration file for /etc/init.d/nvidia-persistenced - -# NVPD_USER: The user nvidia-persistenced is intended to run for -NVPD_USER="nvpd" - -# ARGS: Additional arguments to set the default persistence mode -# (see nvidia-persistenced(1)) -ARGS="" diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init deleted file mode 100644 index f80456d1..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid" - -start() { - if ! [ "${NVPD_USER}x" = x ]; then - ebegin "Starting nvidia-persistenced for ${NVPD_USER}" - NVPD_USER_ARG="--user ${NVPD_USER}" - else - ebegin "Starting nvidia-persistenced" - fi - start-stop-daemon --start --quiet --pidfile ${pidfile} \ - --background --exec /opt/bin/nvidia-persistenced \ - -- ${NVPD_USER_ARG} ${ARGS} - eend $? -} - -stop() { - ebegin "Stopping nvidia-persistenced" - start-stop-daemon --stop --quiet --pidfile ${pidfile} - eend $? -} diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init deleted file mode 100644 index 8ee51e34..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/nvidia-smi.pid" - -depend() { - after modules -} - -start() { - ebegin "Starting NVIDIA System Management Interface" - rm -f ${pidfile} - start-stop-daemon --start --quiet --pidfile ${pidfile} \ - --make-pidfile --background --exec /opt/bin/nvidia-smi -- \ - -q -l 300 - eend $? -} - -stop() { - ebegin "Stopping NVIDIA System Management Interface" - start-stop-daemon --stop --quiet --pidfile ${pidfile} - eend $? -} diff --git a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms390.patch index 1e9af552..19e98d8d 100644 --- a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch +++ b/x11-drivers/nvidia-drivers/files/dkms390.patch @@ -1,11 +1,12 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2018-03-22 05:39:53.000000000 +0000 -+++ b/kernel/dkms.conf 2018-04-09 16:18:23.177125417 +0100 +--- a/kernel/dkms.conf 2021-11-02 06:16:12.000000000 +0000 ++++ b/kernel/dkms.conf 2022-10-16 15:03:27.841471738 +0100 @@ -1,12 +1,20 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" -+PACKAGE_NAME="nvidia-drivers-legacy-dkms" ++PACKAGE_NAME="nvidia-drivers-dkms" +PACKAGE_VERSION="390.154" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # only build for Kernel 5 AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, @@ -13,7 +14,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting # the 'make' command name to suppress this behavior. -MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" -+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules" # The list of kernel modules will be generated by nvidia-installer at runtime. -__DKMS_MODULES @@ -25,4 +26,3 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +DEST_MODULE_LOCATION[2]="/extra/dkms" +BUILT_MODULE_NAME[3]="nvidia-drm" +DEST_MODULE_LOCATION[3]="/extra/dkms" -+ diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms470.patch index 3e2a7cd9..7ee395df 100644 --- a/x11-drivers/nvidia-drivers/files/dkms.patch +++ b/x11-drivers/nvidia-drivers/files/dkms470.patch @@ -1,11 +1,12 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2021-07-07 23:03:22.000000000 +0100 -+++ b/kernel/dkms.conf 2021-08-07 22:05:52.634341135 +0100 -@@ -1,12 +1,21 @@ +--- a/kernel/dkms.conf 2022-06-30 19:31:05.000000000 +0100 ++++ b/kernel/dkms.conf 2022-10-16 15:06:33.644466229 +0100 +@@ -1,12 +1,22 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-dkms" +PACKAGE_VERSION="470.141.03" ++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # Only build for kernel 5 AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild index 1d3c98cc..daabea52 100644 --- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.154.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx" SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" LICENSE="GPL-2 NVIDIA-r2" -SLOT="0" +SLOT="390" KEYWORDS="-* ~amd64" RESTRICT="bindist mirror" EMULTILIB_PKG="true" @@ -29,12 +29,13 @@ COMMON=" )" DEPEND="${COMMON}" PDEPEND=" - tools? ( ~x11-misc/nvidia-settings-legacy-${PV}:${SLOT} ) + tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} ) " RDEPEND=" ${COMMON} >=virtual/opencl-3 - !!x11-drivers/nvidia-drivers + !!x11-drivers/nvidia-drivers:470 + !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} ) wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) @@ -47,8 +48,9 @@ RDEPEND=" QA_PREBUILT="opt/* usr/lib*" -PATCHES=( - "${FILESDIR}"/dkms.patch +PATCHES=( + "${FILESDIR}"/locale.patch + "${FILESDIR}"/dkms390.patch ) S=${WORKDIR}/ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild index 83d2dc99..7af11729 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild @@ -13,7 +13,7 @@ SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" EMULTILIB_PKG="true" KEYWORDS="-* ~amd64" LICENSE="GPL-2 NVIDIA-r2" -SLOT="0" +SLOT="470" IUSE="acpi +dkms multilib +tools wayland +X" REQUIRED_USE="tools? ( X )" @@ -33,7 +33,8 @@ DEPEND="${COMMON}" RDEPEND=" ${COMMON} >=virtual/opencl-3 - !!x11-drivers/nvidia-drivers-legacy + !!x11-drivers/nvidia-drivers:390 + !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} ) wayland? ( diff --git a/x11-misc/nvidia-settings-legacy/Manifest b/x11-misc/nvidia-settings-legacy/Manifest deleted file mode 100644 index b4a55135..00000000 --- a/x11-misc/nvidia-settings-legacy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nvidia-settings-legacy-390.154.tar.gz 1297258 BLAKE2B 16abb2f306684871d7a603b637086f37bc80391f60fd4b3bdb16aca1c5394daf5ddd126d18eb55948ee9e384f144431648d3a6a1d5e4d2e7dff3ce00edbab62b SHA512 cbb6b5f69784f66155a08da786b98de1de8659aa1b42af1a5baca02031e8e21c5d001292188994e01986dd4fca24ec9b7b5fb56491bfab889e7448cdde55f8ba diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch deleted file mode 100644 index de65a598..00000000 --- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/utils.mk -+++ b/utils.mk -@@ -475,7 +475,7 @@ - define READ_ONLY_OBJECT_FROM_FILE_RULE - $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) - $(at_if_quiet)cd $$(dir $(1)); \ -- $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \ -+ $$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \ - $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) - $$(call quiet_cmd,OBJCOPY) \ - --rename-section .data=.rodata,contents,alloc,load,data,readonly \ ---- a/src/libXNVCtrl/utils.mk -+++ b/src/libXNVCtrl/utils.mk -@@ -475,7 +475,7 @@ - define READ_ONLY_OBJECT_FROM_FILE_RULE - $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) - $(at_if_quiet)cd $$(dir $(1)); \ -- $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \ -+ $$(call quiet_cmd_no_at,NVLD) -r -z noexecstack --format=binary \ - $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) - $$(call quiet_cmd,OBJCOPY) \ - --rename-section .data=.rodata,contents,alloc,load,data,readonly \ diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop deleted file mode 100644 index 35f8aeee..00000000 --- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=NVIDIA X Server Settings -Type=Application -Comment=NVIDIA Linux X11 Settings Utility -Exec=nvidia-settings -TryExec=nvidia-settings -Icon=nvidia-settings -Categories=Settings;System; diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest index 441985ec..641c1527 100644 --- a/x11-misc/nvidia-settings/Manifest +++ b/x11-misc/nvidia-settings/Manifest @@ -1 +1,3 @@ +DIST nvidia-settings-390.154.tar.gz 1297258 BLAKE2B 16abb2f306684871d7a603b637086f37bc80391f60fd4b3bdb16aca1c5394daf5ddd126d18eb55948ee9e384f144431648d3a6a1d5e4d2e7dff3ce00edbab62b SHA512 cbb6b5f69784f66155a08da786b98de1de8659aa1b42af1a5baca02031e8e21c5d001292188994e01986dd4fca24ec9b7b5fb56491bfab889e7448cdde55f8ba DIST nvidia-settings-470.141.03.tar.gz 1235217 BLAKE2B 721377ad4431395cfd2989e8d21a1245892aafae5e37393750f6ae90e86f4ac768785fc38100f2295fc1ebdc7d2d1d823d72f8379232b3b28100f94c5a1a4a86 SHA512 3576b6296b5cc30dbca0158d0ca9691dc2e6b819aebe0dde0f0a6ff3e8672a1189e37f68fc7eefc4fd0b105131f7d644c7d27b0ed860c555e4b8fe7f4f60a625 +DIST nvidia-settings-515.65.01.tar.gz 1254045 BLAKE2B a2f572ac72d7a1c073d5ba3db713f6c8dea01728610232b478f297413492fe650617238c6c3a5008a72b1c897d52310e3a5955a5ee08499ac00835e6b230dffb SHA512 c7b6c1b9acdd9e4daa601fb27199946d48d1d59e1483f3187e93ee887a27027ef29f274ae068089b1abdf089b5c106aa09bd1c87bc7ace41606b019393106ea9 diff --git a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch index be03fa27..be03fa27 100644 --- a/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch +++ b/x11-misc/nvidia-settings/files/nvidia-settings-fno-common.patch diff --git a/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.154.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.154.ebuild index dd128301..90ab9567 100644 --- a/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.154.ebuild +++ b/x11-misc/nvidia-settings/nvidia-settings-390.154.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.nvidia.com/" SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" -SLOT="0" +SLOT="390" KEYWORDS="-* amd64" IUSE="" @@ -33,8 +33,9 @@ COMMON_DEPEND=" >=x11-libs/libvdpau-1.0" RDEPEND="${COMMON_DEPEND} - !!x11-misc/nvidia-settings - ~x11-drivers/nvidia-drivers-legacy-${PV}:${SLOT}" + !!x11-misc/nvidia-settings:470 + !!x11-misc/nvidia-settings:515 + ~x11-drivers/nvidia-drivers-${PV}:${SLOT}" DEPEND="${RDEPEND} virtual/pkgconfig x11-base/xorg-proto" @@ -88,8 +89,8 @@ src_install() { insinto /usr/include/NVCtrl doins src/libXNVCtrl/*.h - doicon doc/nvidia-settings.png - domenu ${FILESDIR}/${PN}.desktop + doicon doc/nvidia-settings.png || die + domenu ${FILESDIR}/${PN}.desktop || die dodoc doc/*.txt diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r1.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild index 61a6c330..6e773e3b 100644 --- a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r1.ebuild +++ b/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.nvidia.com/" SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" LICENSE="GPL-2" -SLOT="0" +SLOT="470" KEYWORDS="-* amd64" IUSE="" @@ -33,7 +33,9 @@ COMMON_DEPEND=" >=x11-libs/libvdpau-1.0" RDEPEND="${COMMON_DEPEND} - !!x11-misc/nvidia-settings-legacy" + !!x11-misc/nvidia-settings:390 + !!x11-misc/nvidia-settings:515 + ~x11-drivers/nvidia-drivers-${PV}:${SLOT}" DEPEND="${RDEPEND} virtual/pkgconfig x11-base/xorg-proto" @@ -84,8 +86,8 @@ src_install() { insinto /usr/include/NVCtrl doins src/libXNVCtrl/*.h - doicon doc/${PN}.png - domenu ${FILESDIR}/${PN}.desktop + doicon doc/${PN}.png || die + domenu ${FILESDIR}/${PN}.desktop || die dodoc doc/*.txt diff --git a/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild b/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild new file mode 100644 index 00000000..25ad942d --- /dev/null +++ b/x11-misc/nvidia-settings/nvidia-settings-515.65.01.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="NVIDIA Linux X11 Settings Utility" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="515" +KEYWORDS="-* amd64" +IUSE="" + +QA_PREBUILT= + +COMMON_DEPEND=" + x11-libs/gtk+:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/gdk-pixbuf-xlib + media-libs/mesa + x11-libs/pango[X] + x11-libs/libXv + x11-libs/libXrandr + dev-libs/glib:2 + dev-libs/jansson + x11-libs/cairo + >=x11-libs/libvdpau-1.0" + +RDEPEND="${COMMON_DEPEND} + !!x11-misc/nvidia-settings:390 + !!x11-misc/nvidia-settings:470 + ~x11-drivers/nvidia-drivers-${PV}:${SLOT}" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto" + +src_prepare() { + default + eapply "${FILESDIR}"/"${PN}"-linker.patch +} + + +src_compile() { + einfo "Building libXNVCtrl..." + emake -C src/libXNVCtrl \ + DO_STRIP= \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + RANLIB="$(tc-getRANLIB)" + + einfo "Building nvidia-settings..." + emake -C src/ \ + DO_STRIP= \ + GTK3_AVAILABLE=1 \ + LIBDIR="$(get_libdir)" \ + NVLD="$(tc-getLD)" \ + NVML_ENABLED=0 \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. +} + +src_install() { + emake -C src/ \ + DESTDIR="${D}" \ + DO_STRIP= \ + GTK3_AVAILABLE=1 \ + LIBDIR="${D}/usr/$(get_libdir)" \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ + OUTPUTDIR=. \ + PREFIX=/usr \ + install + + insinto /usr/$(get_libdir) + doins src/libXNVCtrl/libXNVCtrl.a + + insinto /usr/include/NVCtrl + doins src/libXNVCtrl/*.h + + doicon doc/${PN}.png || die + domenu ${FILESDIR}/${PN}.desktop || die + + dodoc doc/*.txt + + rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV} +} |