diff options
| -rw-r--r-- | sys-kernel/nvidia-drivers-dkms/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/nvidia-drivers-dkms/files/dkms.patch (renamed from sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch) | 15 | ||||
| -rw-r--r-- | sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.39.ebuild (renamed from sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-455.45.01.ebuild) | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild | 8 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/Manifest | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/dkms.patch (renamed from x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-dkms-kmalloc.patch) | 15 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/locale.patch (renamed from x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch) | 0 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf | 4 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-460.39.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild) | 10 | ||||
| -rw-r--r-- | x11-misc/nvidia-settings/Manifest | 2 | ||||
| -rw-r--r-- | x11-misc/nvidia-settings/nvidia-settings-460.39.ebuild (renamed from x11-misc/nvidia-settings/nvidia-settings-455.45.01.ebuild) | 11 |
11 files changed, 21 insertions, 50 deletions
diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index a5f2344d..1df42e7d 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-455.45.01.run 183481072 BLAKE2B 5756c788cff136692f0d6de4b33d74ad698fcc75cf2fb6f0adc6381a0377bea18eae0f728151ac8b2efb5508c7420c2df3be3fd7d0035b4477e3e3c97e85ab5c SHA512 dd2743cd2304d7f3afc0c3761cf6c848561bcaabcbdc27157d091a89974aff81bcd28aa3e204d33d406abdbafd14e9162f3cbabc950309e06e6cad7b6fa8df69 +DIST NVIDIA-Linux-x86_64-460.39.run 178310565 BLAKE2B 65931f34ff47de02933797f60128c66c8774f3b217b79e82f781cd50560835ec79c37b7e63fb50231a22646f0cd7cf968d1fbe1ec6c2b3732a1c565b68de7bcb SHA512 9275a58ff0e72c3ee033bd18fa9e9dbb0203d2961a63e7cc04444889118eb4029c60bb10c2af8f230c1aa4aa30769131ea8c01f3bc4e7453336ad9c03ba23b42 diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms.patch index c3e9fbfb..3485b3ea 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.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="455.45.01" ++PACKAGE_VERSION="460.39" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, @@ -25,16 +25,3 @@ +BUILT_MODULE_NAME[3]="nvidia-drm" +DEST_MODULE_LOCATION[3]="/extra/dkms" + ---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-11-05 23:19:28.000000000 +0000 -+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-12-31 22:27:16.878028504 +0000 -@@ -282,8 +282,8 @@ - * are called while nvkms_lock is held. - *************************************************************************/ - --/* Don't use kmalloc for allocations larger than 128k */ --#define KMALLOC_LIMIT (128 * 1024) -+/* Don't use kmalloc for allocations larger than one page */ -+#define KMALLOC_LIMIT PAGE_SIZE - - void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero) - { diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-455.45.01.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.39.ebuild index 63ad5443..63bdc6ce 100644 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-455.45.01.ebuild +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-460.39.ebuild @@ -24,7 +24,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/fs62142.patch - "${FILESDIR}"/${P}-dkms-kmalloc.patch + "${FILESDIR}"/dkms.patch ) S="${WORKDIR}/${AMD64_NV_PACKAGE}" diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild index 22df8001..84610822 100644 --- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild +++ b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.141.ebuild @@ -173,10 +173,10 @@ src_install() { 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 + doexe ${NV_OBJ}/nvidia-modprobe + fowners root:video /opt/bin/nvidia-modprobe + fperms 4710 /opt/bin/nvidia-modprobe + dosym /{opt,usr}/bin/nvidia-modprobe # init newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index a5f2344d..1df42e7d 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-455.45.01.run 183481072 BLAKE2B 5756c788cff136692f0d6de4b33d74ad698fcc75cf2fb6f0adc6381a0377bea18eae0f728151ac8b2efb5508c7420c2df3be3fd7d0035b4477e3e3c97e85ab5c SHA512 dd2743cd2304d7f3afc0c3761cf6c848561bcaabcbdc27157d091a89974aff81bcd28aa3e204d33d406abdbafd14e9162f3cbabc950309e06e6cad7b6fa8df69 +DIST NVIDIA-Linux-x86_64-460.39.run 178310565 BLAKE2B 65931f34ff47de02933797f60128c66c8774f3b217b79e82f781cd50560835ec79c37b7e63fb50231a22646f0cd7cf968d1fbe1ec6c2b3732a1c565b68de7bcb SHA512 9275a58ff0e72c3ee033bd18fa9e9dbb0203d2961a63e7cc04444889118eb4029c60bb10c2af8f230c1aa4aa30769131ea8c01f3bc4e7453336ad9c03ba23b42 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-dkms-kmalloc.patch b/x11-drivers/nvidia-drivers/files/dkms.patch index c3e9fbfb..3485b3ea 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-dkms-kmalloc.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="455.45.01" ++PACKAGE_VERSION="460.39" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, @@ -25,16 +25,3 @@ +BUILT_MODULE_NAME[3]="nvidia-drm" +DEST_MODULE_LOCATION[3]="/extra/dkms" + ---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-11-05 23:19:28.000000000 +0000 -+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c 2020-12-31 22:27:16.878028504 +0000 -@@ -282,8 +282,8 @@ - * are called while nvkms_lock is held. - *************************************************************************/ - --/* Don't use kmalloc for allocations larger than 128k */ --#define KMALLOC_LIMIT (128 * 1024) -+/* Don't use kmalloc for allocations larger than one page */ -+#define KMALLOC_LIMIT PAGE_SIZE - - void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero) - { diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch b/x11-drivers/nvidia-drivers/files/locale.patch index aa2a7434..aa2a7434 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-440.26-locale.patch +++ b/x11-drivers/nvidia-drivers/files/locale.patch diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf index 9c36f59b..a94d18ca 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf +++ b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass.conf @@ -3,6 +3,6 @@ Section "OutputClass" MatchDriver "nvidia-drm" Driver "nvidia" Option "AllowEmptyInitialConfiguration" - ModulePath "/usr/lib/nvidia/xorg" - ModulePath "/usr/lib/xorg/modules" + ModulePath "/usr/lib64/nvidia/xorg" + ModulePath "/usr/lib64/xorg/modules" EndSection diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39.ebuild index 74242854..f65ee453 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.45.01-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.39.ebuild @@ -49,8 +49,8 @@ RDEPEND=" QA_PREBUILT="opt/* usr/lib*" S=${WORKDIR}/ PATCHES=( - "${FILESDIR}"/${P}-dkms-kmalloc.patch - "${FILESDIR}"/${PN}-440.26-locale.patch + "${FILESDIR}"/dkms.patch + "${FILESDIR}"/locale.patch ) pkg_setup() { @@ -192,8 +192,6 @@ src_install() { newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced - dobin ${NV_OBJ}/nvidia-bug-report.sh - if has_multilib_profile && use multilib; then local OABI=${ABI} for ABI in $(multilib_get_enabled_abis); do @@ -214,10 +212,6 @@ src_install() { use X && doman "${NV_MAN}"/nvidia-xconfig.1 doman "${NV_MAN}"/nvidia-cuda-mps-control.1 - readme.gentoo_create_doc - - dodoc supported-gpus.json - docinto html dodoc -r ${NV_DOC}/html/* } diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest index 99b51e8f..2ef4f624 100644 --- a/x11-misc/nvidia-settings/Manifest +++ b/x11-misc/nvidia-settings/Manifest @@ -1 +1 @@ -DIST nvidia-settings-455.45.01.tar.gz 1229448 BLAKE2B 6e8f98a2a9358a2975b8331f2c1351afdbfe9f33407d48020e3e010fc633e4f3c6a76f2fbfa91e69d77ea5823b941b481d4854e226ba41d7cc84a3a591d652b8 SHA512 c29575cc7133c2c6d49b2435fc1d57285b744341adb96c7a7a060362ac2077e99b31fde28702ac0d1c6ad18178967c21340f968d13e74642b3ccb1fb47757ed5 +DIST nvidia-settings-460.39.tar.gz 1233261 BLAKE2B 1bc9c31bd64ed1f5282b854592317b3a9df6402f5c6e805a8ea705a2c04e93ef15ae0b18f93a8707072d58c6a3015dc90d95431611e7c492a624765d662c00ba SHA512 765e645ec96977a78d9ebfbfcfa3352be9593f12899e4207eef90389f352d13aeb5e1004271d267f588c64ba2adbfcce155c9857cb36949bd21e3290221558d0 diff --git a/x11-misc/nvidia-settings/nvidia-settings-455.45.01.ebuild b/x11-misc/nvidia-settings/nvidia-settings-460.39.ebuild index ff324d3b..0b05240a 100644 --- a/x11-misc/nvidia-settings/nvidia-settings-455.45.01.ebuild +++ b/x11-misc/nvidia-settings/nvidia-settings-460.39.ebuild @@ -12,12 +12,13 @@ SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/${PV}.tar.gz -> nvidi LICENSE="GPL-2" SLOT="0" KEYWORDS="-* amd64" -IUSE="+gtk3" +IUSE="" QA_PREBUILT= COMMON_DEPEND=" - gtk3? ( x11-libs/gtk+:3 ) + x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm @@ -56,7 +57,7 @@ src_compile() { einfo "Building nvidia-settings..." emake -C src/ \ DO_STRIP= \ - GTK3_AVAILABLE=$(usex gtk3 1 0) \ + GTK3_AVAILABLE=1 \ LIBDIR="$(get_libdir)" \ NVLD="$(tc-getLD)" \ NVML_ENABLED=0 \ @@ -69,7 +70,7 @@ src_install() { emake -C src/ \ DESTDIR="${D}" \ DO_STRIP= \ - GTK3_AVAILABLE=$(usex gtk3 1 0) \ + GTK3_AVAILABLE=1 \ LIBDIR="${D}/usr/$(get_libdir)" \ NV_USE_BUNDLED_LIBJANSSON=0 \ NV_VERBOSE=1 \ @@ -87,4 +88,6 @@ src_install() { domenu ${FILESDIR}/${PN}.desktop dodoc doc/*.txt + + rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV} } |