From 47eedac9b37ff00889d0bdcde000d691b6024939 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Mar 2021 14:08:23 +0000 Subject: x11-drivers/nvidia-drivers : version bump (v460.67) --- .../sys-kernel/nvidia-drivers-dkms-460.56 | 12 - .../sys-kernel/nvidia-drivers-dkms-460.67 | 12 + .../md5-cache/x11-drivers/nvidia-drivers-460.56 | 13 - .../md5-cache/x11-drivers/nvidia-drivers-460.67 | 13 + metadata/md5-cache/x11-misc/nvidia-settings-460.56 | 12 - metadata/md5-cache/x11-misc/nvidia-settings-460.67 | 12 + metadata/pkg_desc_index | 6 +- sys-kernel/nvidia-drivers-dkms/Manifest | 2 +- sys-kernel/nvidia-drivers-dkms/files/dkms.patch | 2 +- .../nvidia-drivers-dkms-460.56.ebuild | 48 ---- .../nvidia-drivers-dkms-460.67.ebuild | 48 ++++ x11-drivers/nvidia-drivers/Manifest | 2 +- x11-drivers/nvidia-drivers/files/dkms.patch | 2 +- .../nvidia-drivers/nvidia-drivers-460.56.ebuild | 316 --------------------- .../nvidia-drivers/nvidia-drivers-460.67.ebuild | 316 +++++++++++++++++++++ x11-misc/nvidia-settings/Manifest | 2 +- .../nvidia-settings/nvidia-settings-460.56.ebuild | 93 ------ .../nvidia-settings/nvidia-settings-460.67.ebuild | 93 ++++++ 18 files changed, 502 insertions(+), 502 deletions(-) delete mode 100644 metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.56 create mode 100644 metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.67 delete mode 100644 metadata/md5-cache/x11-drivers/nvidia-drivers-460.56 create mode 100644 metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 delete mode 100644 metadata/md5-cache/x11-misc/nvidia-settings-460.56 create mode 100644 metadata/md5-cache/x11-misc/nvidia-settings-460.67 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.56.ebuild create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.67.ebuild delete mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild delete mode 100644 x11-misc/nvidia-settings/nvidia-settings-460.56.ebuild create mode 100644 x11-misc/nvidia-settings/nvidia-settings-460.67.ebuild diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.56 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.56 deleted file mode 100644 index 5ebab318..00000000 --- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.56 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install postinst prerm unpack -DEPEND=sys-kernel/dkms -DESCRIPTION=NVIDIA driver sources for linux -EAPI=6 -HOMEPAGE=http://www.nvidia.com/ -KEYWORDS=amd64 -LICENSE=GPL-2 NVIDIA-r2 -RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-legacy-dkms -SLOT=0 -SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/460.56/NVIDIA-Linux-x86_64-460.56.run ) -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=4877cba8e9c34ad8a2ff1cfd47be0f1c diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.67 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.67 new file mode 100644 index 00000000..34cb8aa1 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-460.67 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst prerm unpack +DEPEND=sys-kernel/dkms +DESCRIPTION=NVIDIA driver sources for linux +EAPI=6 +HOMEPAGE=http://www.nvidia.com/ +KEYWORDS=amd64 +LICENSE=GPL-2 NVIDIA-r2 +RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-legacy-dkms +SLOT=0 +SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run ) +_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=4877cba8e9c34ad8a2ff1cfd47be0f1c diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.56 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.56 deleted file mode 100644 index 1aa56115..00000000 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.56 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=acct-group/video >=sys-libs/glibc-2.6.1 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(-)?] app-misc/pax-utils libglvnd? ( 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(-)?] ) ) -DESCRIPTION=NVIDIA Accelerated Graphics Driver -EAPI=6 -IUSE=acpi compat +dkms +libglvnd 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 -RDEPEND=acct-group/video >=sys-libs/glibc-2.6.1 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(-)?] app-misc/pax-utils libglvnd? ( 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-460.56:0 ) tools? ( ~x11-misc/nvidia-settings-460.56: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(-)?] ) net-libs/libtirpc -REQUIRED_USE=tools? ( X ) -SLOT=0 -SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/460.56/NVIDIA-Linux-x86_64-460.56.run ) -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability b2e405b5a3f051d58b50c9ffc6b883cf preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=f0b4156e0ae58a793cc5cb33674818de diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 new file mode 100644 index 00000000..4f0e099e --- /dev/null +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=acct-group/video >=sys-libs/glibc-2.6.1 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(-)?] app-misc/pax-utils libglvnd? ( 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(-)?] ) ) +DESCRIPTION=NVIDIA Accelerated Graphics Driver +EAPI=6 +IUSE=acpi compat +dkms +libglvnd 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 +RDEPEND=acct-group/video >=sys-libs/glibc-2.6.1 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(-)?] app-misc/pax-utils libglvnd? ( 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-460.67:0 ) tools? ( ~x11-misc/nvidia-settings-460.67: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(-)?] ) net-libs/libtirpc +REQUIRED_USE=tools? ( X ) +SLOT=0 +SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run ) +_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability b2e405b5a3f051d58b50c9ffc6b883cf preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=f0b4156e0ae58a793cc5cb33674818de diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-460.56 b/metadata/md5-cache/x11-misc/nvidia-settings-460.56 deleted file mode 100644 index b8fab44a..00000000 --- a/metadata/md5-cache/x11-misc/nvidia-settings-460.56 +++ /dev/null @@ -1,12 +0,0 @@ -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 -DESCRIPTION=NVIDIA Linux X11 Settings Utility -EAPI=6 -HOMEPAGE=http://www.nvidia.com/ -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 -SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/460.56.tar.gz -> nvidia-settings-460.56.tar.gz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=7328851830b7018c9f0ab80e5584ddb7 diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-460.67 b/metadata/md5-cache/x11-misc/nvidia-settings-460.67 new file mode 100644 index 00000000..8ace0a46 --- /dev/null +++ b/metadata/md5-cache/x11-misc/nvidia-settings-460.67 @@ -0,0 +1,12 @@ +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 +DESCRIPTION=NVIDIA Linux X11 Settings Utility +EAPI=6 +HOMEPAGE=http://www.nvidia.com/ +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 +SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/460.67.tar.gz -> nvidia-settings-460.67.tar.gz +_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=7328851830b7018c9f0ab80e5584ddb7 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index b915c598..8373f9b8 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -69,7 +69,7 @@ sys-kernel/linux-image-redcore-lts-legacy 5.4.107: Redcore Linux Kernel Image (L sys-kernel/linux-sources-redcore 5.11.8: Redcore Linux Kernel Sources sys-kernel/linux-sources-redcore-lts 5.10.25: Redcore Linux Kernel Sources (LTS) sys-kernel/linux-sources-redcore-lts-legacy 5.4.107: Redcore Linux Kernel Sources (LTS Legacy 5.4) -sys-kernel/nvidia-drivers-dkms 460.56: NVIDIA driver sources for linux +sys-kernel/nvidia-drivers-dkms 460.67: NVIDIA driver sources for linux sys-kernel/nvidia-drivers-legacy-dkms 390.141-r1: NVIDIA driver sources for linux sys-kernel/rtl8821cu-dkms 5.8.1: Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver for Linux sys-kernel/vhba-dkms 20190831: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources @@ -85,11 +85,11 @@ virtual/rust 10: Virtual for Rust language compiler virtual/tmpfiles 0-r10: Virtual to select between different tmpfiles.d handlers x11-base/xorg-drivers 1.20-r10: Meta package containing deps on all xorg drivers (dummy package) x11-base/xorg-server 1.20.10-r100: X.Org X servers -x11-drivers/nvidia-drivers 460.56: NVIDIA Accelerated Graphics Driver +x11-drivers/nvidia-drivers 460.67: NVIDIA Accelerated Graphics Driver x11-drivers/nvidia-drivers-legacy 390.141-r1: NVIDIA Accelerated Graphics Driver x11-libs/gtk+ 2.24.32-r314 3.24.20-r314: Gimp ToolKit + x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities -x11-misc/nvidia-settings 460.56: NVIDIA Linux X11 Settings Utility +x11-misc/nvidia-settings 460.67: NVIDIA Linux X11 Settings Utility x11-misc/nvidia-settings-legacy 390.141: 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-r10: Simple Desktop Display Manager diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index 6e0a7e39..29750026 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-460.56.run 178496173 BLAKE2B 8f84a403ccaa9a92186cac9fb2dee9600cd29915cdacf475b6a1105772ffd52c671ef217a1201fbcd9192e858ec17796fd77b817887c79c43c266d32671fe7d0 SHA512 a61855576a27cdd2e48906ecb49cd1e9f88d14a8358aa4bdc57d59e2dfa64b394b2dcee45184d75e889fac6ebedcaaff902a07428c7f9eb011cf265228c6eb4e +DIST NVIDIA-Linux-x86_64-460.67.run 177691692 BLAKE2B 25a7d87cc128933a98100d7c5ef37f93c3a870c096eea3228a28ef79d712ce104608f9422221cc1eadc21dccbbc8bc41ab1832795cfee75e217600ed0d76489e SHA512 80fdc023a8ce80e3a103896f28a5564bb43903af6bfc719f755c48eb225e79ec6abf219ab20eb80ada5808ef932ef5fa0fe710c6e0a07dd8a248daff2ba3b898 diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms.patch index 04d1f79d..533aa46a 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/dkms.patch @@ -4,7 +4,7 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-dkms" -+PACKAGE_VERSION="460.56" ++PACKAGE_VERSION="460.67" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.56.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.56.ebuild deleted file mode 100644 index 63bdc6ce..00000000 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.56.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# 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="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND} - !!sys-kernel/nvidia-drivers-legacy-dkms" - -PATCHES=( - "${FILESDIR}"/fs62142.patch - "${FILESDIR}"/dkms.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} - doins -r "${S}"/kernel/* -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.67.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.67.ebuild new file mode 100644 index 00000000..63bdc6ce --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.67.ebuild @@ -0,0 +1,48 @@ +# 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="0" +KEYWORDS="amd64" +IUSE="" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND} + !!sys-kernel/nvidia-drivers-legacy-dkms" + +PATCHES=( + "${FILESDIR}"/fs62142.patch + "${FILESDIR}"/dkms.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} + doins -r "${S}"/kernel/* +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 6e0a7e39..29750026 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-460.56.run 178496173 BLAKE2B 8f84a403ccaa9a92186cac9fb2dee9600cd29915cdacf475b6a1105772ffd52c671ef217a1201fbcd9192e858ec17796fd77b817887c79c43c266d32671fe7d0 SHA512 a61855576a27cdd2e48906ecb49cd1e9f88d14a8358aa4bdc57d59e2dfa64b394b2dcee45184d75e889fac6ebedcaaff902a07428c7f9eb011cf265228c6eb4e +DIST NVIDIA-Linux-x86_64-460.67.run 177691692 BLAKE2B 25a7d87cc128933a98100d7c5ef37f93c3a870c096eea3228a28ef79d712ce104608f9422221cc1eadc21dccbbc8bc41ab1832795cfee75e217600ed0d76489e SHA512 80fdc023a8ce80e3a103896f28a5564bb43903af6bfc719f755c48eb225e79ec6abf219ab20eb80ada5808ef932ef5fa0fe710c6e0a07dd8a248daff2ba3b898 diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms.patch index 04d1f79d..533aa46a 100644 --- a/x11-drivers/nvidia-drivers/files/dkms.patch +++ b/x11-drivers/nvidia-drivers/files/dkms.patch @@ -4,7 +4,7 @@ -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-dkms" -+PACKAGE_VERSION="460.56" ++PACKAGE_VERSION="460.67" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild deleted file mode 100644 index c3e5f7c6..00000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic multilib-minimal portability toolchain-funcs unpacker - -NV_URI="https://us.download.nvidia.com/XFree86/" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -DESCRIPTION="NVIDIA Accelerated Graphics Driver" - -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" - -IUSE="acpi compat +dkms +libglvnd multilib +tools wayland +X" -REQUIRED_USE="tools? ( X )" - -COMMON=" - acct-group/video - >=sys-libs/glibc-2.6.1 - X? ( - >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}] - app-misc/pax-utils - libglvnd? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) - ) -" - -DEPEND="${COMMON}" - -RDEPEND=" - ${COMMON} - >=virtual/opencl-3 - !!x11-drivers/nvidia-drivers-legacy - acpi? ( sys-power/acpid ) - dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} ) - tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} ) - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - X? ( - =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - ) - net-libs/libtirpc -" - -QA_PREBUILT="opt/* usr/lib*" -S=${WORKDIR}/ -PATCHES=( - "${FILESDIR}"/dkms.patch - "${FILESDIR}"/locale.patch -) - -pkg_setup() { - - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - NV_DOC="${S}" - NV_OBJ="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_SOVER=${PV} -} - -src_prepare() { - default - local man_file - for man_file in "${NV_MAN}"/*1.gz; do - gunzip $man_file || die - done - - if ! [ -f nvidia_icd.json ]; then - cp nvidia_icd.json.template nvidia_icd.json || die - sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die - fi -} - -# Install nvidia library: -# the first parameter is the library to install -# the second parameter is the provided soversion -# the third parameter is the target directory if it is not /usr/lib -donvidia() { - # Full path to library - nv_LIB="${1}" - - # SOVER to use - nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})" - - # Where to install - nv_DEST="${2}" - - # Get just the library name - nv_LIBNAME=$(basename "${nv_LIB}") - - if [[ "${nv_DEST}" ]]; then - exeinto ${nv_DEST} - action="doexe" - else - nv_DEST="/usr/$(get_libdir)" - action="dolib.so" - fi - - # Install the library - ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}" - - # If the library has a SONAME and SONAME does not match the library name, - # then we need to create a symlink - if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} - fi - - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} -} - -src_install() { - # blacklist nouveau - insinto /etc/modprobe.d - doins "${FILESDIR}"/nouveau.conf - - # NVIDIA kernel <-> userspace driver config lib - donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} - - # NVIDIA framebuffer capture library - donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} - - # NVIDIA video encode/decode <-> CUDA - donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} - donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} - - if use X; then - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11}/nvidia_drv.so - - # Xorg GLX driver - donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \ - /usr/$(get_libdir)/nvidia/xorg - - # Xorg nvidia.conf - if has_version '>=x11-base/xorg-server-1.16'; then - insinto /usr/share/X11/xorg.conf.d - newins ${FILESDIR}/nvidia-drm-outputclass.conf 50-nvidia-drm-outputclass.conf - fi - - insinto /usr/share/glvnd/egl_vendor.d - doins ${NV_X11}/10_nvidia.json - fi - - if use wayland; then - insinto /usr/share/egl/egl_external_platform.d - doins ${NV_X11}/10_nvidia_wayland.json - fi - - insinto /etc/vulkan/icd.d - doins nvidia_icd.json - - insinto /etc/vulkan/implicit_layer.d - doins nvidia_layers.json - - # OpenCL ICD for NVIDIA - insinto /etc/OpenCL/vendors - doins ${NV_OBJ}/nvidia.icd - - # Helper Apps - exeinto /opt/bin/ - - if use X; then - doexe ${NV_OBJ}/nvidia-xconfig - fi - - doexe ${NV_OBJ}/nvidia-cuda-mps-control - doexe ${NV_OBJ}/nvidia-cuda-mps-server - doexe ${NV_OBJ}/nvidia-debugdump - doexe ${NV_OBJ}/nvidia-persistenced - doexe ${NV_OBJ}/nvidia-smi - - # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) - doexe ${NV_OBJ}/nvidia-modprobe - fowners root:video /opt/bin/nvidia-modprobe - fperms 4710 /opt/bin/nvidia-modprobe - dosym /{opt,usr}/bin/nvidia-modprobe - - doman nvidia-cuda-mps-control.1 - doman nvidia-modprobe.1 - doman nvidia-persistenced.1 - newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi - newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced - newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced - - if has_multilib_profile && use multilib; then - local OABI=${ABI} - for ABI in $(multilib_get_enabled_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" - - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}"/nvidia-smi.1 - use X && doman "${NV_MAN}"/nvidia-xconfig.1 - doman "${NV_MAN}"/nvidia-cuda-mps-control.1 - - docinto html - dodoc -r ${NV_DOC}/html/* -} - -src_install-libs() { - local inslibdir=$(get_libdir) - if use libglvnd; then - local GL_ROOT="/usr/$(get_libdir)" - else - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" - fi - local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" - local nv_libdir="${NV_OBJ}" - - if has_multilib_profile && [[ ${ABI} == "x86" ]]; then - nv_libdir="${NV_OBJ}"/32 - fi - - if use X; then - NV_GLX_LIBRARIES=( - "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" - "libOpenCL.so.1.0.0 ${CL_ROOT}" - "libcuda.so.${NV_SOVER}" - "libnvcuvid.so.${NV_SOVER}" - "libnvidia-compiler.so.${NV_SOVER}" - "libnvidia-eglcore.so.${NV_SOVER}" - "libnvidia-encode.so.${NV_SOVER}" - "libnvidia-fbc.so.${NV_SOVER}" - "libnvidia-glcore.so.${NV_SOVER}" - "libnvidia-glsi.so.${NV_SOVER}" - "libnvidia-glvkspirv.so.${NV_SOVER}" - "libnvidia-ifr.so.${NV_SOVER}" - "libnvidia-opencl.so.${NV_SOVER}" - "libnvidia-ptxjitcompiler.so.${NV_SOVER}" - "libvdpau_nvidia.so.${NV_SOVER}" - "libnvidia-ml.so.${NV_SOVER}" - "libnvidia-tls.so.${NV_SOVER}" - ) - if ! use libglvnd; then - NV_GLX_LIBRARIES+=( - "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}" - "libGL.so.1.7.0 ${GL_ROOT}" - "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" - "libGLESv2.so.2.1.0 ${GL_ROOT}" - "libGLX.so.0 ${GL_ROOT}" - "libGLdispatch.so.0 ${GL_ROOT}" - "libOpenGL.so.0 ${GL_ROOT}" - ) - fi - - if use wayland && [[ ${ABI} == "amd64" ]]; then - NV_GLX_LIBRARIES+=( - "libnvidia-egl-wayland.so.1.1.5" - ) - fi - - if has_multilib_profile && [[ ${ABI} == "amd64" ]]; then - NV_GLX_LIBRARIES+=( - "libnvidia-cbl.so.${NV_SOVER}" - "libnvidia-ngx.so.${NV_SOVER}" - "libnvidia-rtcore.so.${NV_SOVER}" - "libnvoptix.so.${NV_SOVER}" - ) - fi - - for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do - donvidia "${nv_libdir}"/${NV_LIB} - done - fi -} - -_dracut_initramfs_regen() { - if [ -x $(which dracut) ]; then - dracut -N -f --no-hostonly-cmdline - fi -} - -pkg_preinst() { - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - - if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then - _dracut_initramfs_regen - fi -} - -pkg_postrm() { - if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then - _dracut_initramfs_regen - fi -} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild new file mode 100644 index 00000000..c3e5f7c6 --- /dev/null +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic multilib-minimal portability toolchain-funcs unpacker + +NV_URI="https://us.download.nvidia.com/XFree86/" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" +DESCRIPTION="NVIDIA Accelerated Graphics Driver" + +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" + +IUSE="acpi compat +dkms +libglvnd multilib +tools wayland +X" +REQUIRED_USE="tools? ( X )" + +COMMON=" + acct-group/video + >=sys-libs/glibc-2.6.1 + X? ( + >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}] + app-misc/pax-utils + libglvnd? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) + ) +" + +DEPEND="${COMMON}" + +RDEPEND=" + ${COMMON} + >=virtual/opencl-3 + !!x11-drivers/nvidia-drivers-legacy + acpi? ( sys-power/acpid ) + dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} ) + tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} ) + wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + X? ( + =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + ) + net-libs/libtirpc +" + +QA_PREBUILT="opt/* usr/lib*" +S=${WORKDIR}/ +PATCHES=( + "${FILESDIR}"/dkms.patch + "${FILESDIR}"/locale.patch +) + +pkg_setup() { + + # try to turn off distcc and ccache for people that have a problem with it + export DISTCC_DISABLE=1 + export CCACHE_DISABLE=1 + + NV_DOC="${S}" + NV_OBJ="${S}" + NV_SRC="${S}/kernel" + NV_MAN="${S}" + NV_X11="${S}" + NV_SOVER=${PV} +} + +src_prepare() { + default + local man_file + for man_file in "${NV_MAN}"/*1.gz; do + gunzip $man_file || die + done + + if ! [ -f nvidia_icd.json ]; then + cp nvidia_icd.json.template nvidia_icd.json || die + sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die + fi +} + +# Install nvidia library: +# the first parameter is the library to install +# the second parameter is the provided soversion +# the third parameter is the target directory if it is not /usr/lib +donvidia() { + # Full path to library + nv_LIB="${1}" + + # SOVER to use + nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})" + + # Where to install + nv_DEST="${2}" + + # Get just the library name + nv_LIBNAME=$(basename "${nv_LIB}") + + if [[ "${nv_DEST}" ]]; then + exeinto ${nv_DEST} + action="doexe" + else + nv_DEST="/usr/$(get_libdir)" + action="dolib.so" + fi + + # Install the library + ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}" + + # If the library has a SONAME and SONAME does not match the library name, + # then we need to create a symlink + if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} + fi + + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} +} + +src_install() { + # blacklist nouveau + insinto /etc/modprobe.d + doins "${FILESDIR}"/nouveau.conf + + # NVIDIA kernel <-> userspace driver config lib + donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} + + # NVIDIA framebuffer capture library + donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} + + # NVIDIA video encode/decode <-> CUDA + donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} + donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} + + if use X; then + # Xorg DDX driver + insinto /usr/$(get_libdir)/xorg/modules/drivers + doins ${NV_X11}/nvidia_drv.so + + # Xorg GLX driver + donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \ + /usr/$(get_libdir)/nvidia/xorg + + # Xorg nvidia.conf + if has_version '>=x11-base/xorg-server-1.16'; then + insinto /usr/share/X11/xorg.conf.d + newins ${FILESDIR}/nvidia-drm-outputclass.conf 50-nvidia-drm-outputclass.conf + fi + + insinto /usr/share/glvnd/egl_vendor.d + doins ${NV_X11}/10_nvidia.json + fi + + if use wayland; then + insinto /usr/share/egl/egl_external_platform.d + doins ${NV_X11}/10_nvidia_wayland.json + fi + + insinto /etc/vulkan/icd.d + doins nvidia_icd.json + + insinto /etc/vulkan/implicit_layer.d + doins nvidia_layers.json + + # OpenCL ICD for NVIDIA + insinto /etc/OpenCL/vendors + doins ${NV_OBJ}/nvidia.icd + + # Helper Apps + exeinto /opt/bin/ + + if use X; then + doexe ${NV_OBJ}/nvidia-xconfig + fi + + doexe ${NV_OBJ}/nvidia-cuda-mps-control + doexe ${NV_OBJ}/nvidia-cuda-mps-server + doexe ${NV_OBJ}/nvidia-debugdump + doexe ${NV_OBJ}/nvidia-persistenced + doexe ${NV_OBJ}/nvidia-smi + + # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) + doexe ${NV_OBJ}/nvidia-modprobe + fowners root:video /opt/bin/nvidia-modprobe + fperms 4710 /opt/bin/nvidia-modprobe + dosym /{opt,usr}/bin/nvidia-modprobe + + doman nvidia-cuda-mps-control.1 + doman nvidia-modprobe.1 + doman nvidia-persistenced.1 + newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi + newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced + newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced + + if has_multilib_profile && use multilib; then + local OABI=${ABI} + for ABI in $(multilib_get_enabled_abis); do + src_install-libs + done + ABI=${OABI} + unset OABI + else + src_install-libs + fi + + is_final_abi || die "failed to iterate through all ABIs" + + # Docs + newdoc "${NV_DOC}/README.txt" README + dodoc "${NV_DOC}/NVIDIA_Changelog" + doman "${NV_MAN}"/nvidia-smi.1 + use X && doman "${NV_MAN}"/nvidia-xconfig.1 + doman "${NV_MAN}"/nvidia-cuda-mps-control.1 + + docinto html + dodoc -r ${NV_DOC}/html/* +} + +src_install-libs() { + local inslibdir=$(get_libdir) + if use libglvnd; then + local GL_ROOT="/usr/$(get_libdir)" + else + local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib" + fi + local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" + local nv_libdir="${NV_OBJ}" + + if has_multilib_profile && [[ ${ABI} == "x86" ]]; then + nv_libdir="${NV_OBJ}"/32 + fi + + if use X; then + NV_GLX_LIBRARIES=( + "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" + "libOpenCL.so.1.0.0 ${CL_ROOT}" + "libcuda.so.${NV_SOVER}" + "libnvcuvid.so.${NV_SOVER}" + "libnvidia-compiler.so.${NV_SOVER}" + "libnvidia-eglcore.so.${NV_SOVER}" + "libnvidia-encode.so.${NV_SOVER}" + "libnvidia-fbc.so.${NV_SOVER}" + "libnvidia-glcore.so.${NV_SOVER}" + "libnvidia-glsi.so.${NV_SOVER}" + "libnvidia-glvkspirv.so.${NV_SOVER}" + "libnvidia-ifr.so.${NV_SOVER}" + "libnvidia-opencl.so.${NV_SOVER}" + "libnvidia-ptxjitcompiler.so.${NV_SOVER}" + "libvdpau_nvidia.so.${NV_SOVER}" + "libnvidia-ml.so.${NV_SOVER}" + "libnvidia-tls.so.${NV_SOVER}" + ) + if ! use libglvnd; then + NV_GLX_LIBRARIES+=( + "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}" + "libGL.so.1.7.0 ${GL_ROOT}" + "libGLESv1_CM.so.1.2.0 ${GL_ROOT}" + "libGLESv2.so.2.1.0 ${GL_ROOT}" + "libGLX.so.0 ${GL_ROOT}" + "libGLdispatch.so.0 ${GL_ROOT}" + "libOpenGL.so.0 ${GL_ROOT}" + ) + fi + + if use wayland && [[ ${ABI} == "amd64" ]]; then + NV_GLX_LIBRARIES+=( + "libnvidia-egl-wayland.so.1.1.5" + ) + fi + + if has_multilib_profile && [[ ${ABI} == "amd64" ]]; then + NV_GLX_LIBRARIES+=( + "libnvidia-cbl.so.${NV_SOVER}" + "libnvidia-ngx.so.${NV_SOVER}" + "libnvidia-rtcore.so.${NV_SOVER}" + "libnvoptix.so.${NV_SOVER}" + ) + fi + + for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do + donvidia "${nv_libdir}"/${NV_LIB} + done + fi +} + +_dracut_initramfs_regen() { + if [ -x $(which dracut) ]; then + dracut -N -f --no-hostonly-cmdline + fi +} + +pkg_preinst() { + if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then + rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* + fi + + if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then + rm -f "${ROOT}"/etc/env.d/09nvidia + fi +} + +pkg_postinst() { + if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then + _dracut_initramfs_regen + fi +} + +pkg_postrm() { + if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then + _dracut_initramfs_regen + fi +} diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest index acac7f67..8be8b23d 100644 --- a/x11-misc/nvidia-settings/Manifest +++ b/x11-misc/nvidia-settings/Manifest @@ -1 +1 @@ -DIST nvidia-settings-460.56.tar.gz 1233268 BLAKE2B 8f2c7aa105f1ca18c7b2298fb24d62614863f07ff38b2c2f5352848171b48c3413d4bb9973ce49a08522f38c49e0e0c0237d079f00eeadd52ce5fcc705a08c57 SHA512 a4dd13baaaaf0c384788984f322db5af4cf5547c3a3cfb44e97c160ed39042610441ef59e374fa7f986b89b7c148a32f975b32d7afeefe8f9d766b55f5b88572 +DIST nvidia-settings-460.67.tar.gz 1233189 BLAKE2B 33ffceefea4e184cb1873cdce97db26637e87cd20c82bcabcbfe88bcb084ac3d833ac5688cafa33a5a89383040d5c1c5d46de9c3f9a8ba6174574aa57aea2e46 SHA512 d1828379aa477394747ae3e5d3505e864d38a349dd159a04cb263613380afea9aea2081300b0d2b8ae205b800bfe6e8ba504e612989da394d757f00e4399b617 diff --git a/x11-misc/nvidia-settings/nvidia-settings-460.56.ebuild b/x11-misc/nvidia-settings/nvidia-settings-460.56.ebuild deleted file mode 100644 index 0b05240a..00000000 --- a/x11-misc/nvidia-settings/nvidia-settings-460.56.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -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-legacy" -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 - domenu ${FILESDIR}/${PN}.desktop - - dodoc doc/*.txt - - rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV} -} diff --git a/x11-misc/nvidia-settings/nvidia-settings-460.67.ebuild b/x11-misc/nvidia-settings/nvidia-settings-460.67.ebuild new file mode 100644 index 00000000..0b05240a --- /dev/null +++ b/x11-misc/nvidia-settings/nvidia-settings-460.67.ebuild @@ -0,0 +1,93 @@ +# 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/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +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-legacy" +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 + domenu ${FILESDIR}/${PN}.desktop + + dodoc doc/*.txt + + rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV} +} -- cgit v1.2.3