diff options
| -rw-r--r-- | metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.151 (renamed from metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147) | 8 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers-legacy/Manifest | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers-legacy/files/dkms.patch | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch | 82 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.151.ebuild (renamed from x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.147.ebuild) | 1 |
6 files changed, 7 insertions, 90 deletions
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147 b/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.151 index 4a2bbef5..1037f610 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.151 @@ -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.147: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.147: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-legacy-390.151: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.151: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(-)?] ) RESTRICT=bindist mirror SLOT=0 -SRC_URI=amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run ) +SRC_URI=amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.151/NVIDIA-Linux-x86_64-390.151.run ) _eclasses_=desktop 22952d8f27cac191d75529d4c38e6bfa edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 6af347b3c27477b48efaaa1261a0dd69 estack 055c42df72f76a4f45ec92b35e83cd56 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b ltprune 97143780d341cc8d8f1d4c6187a36d29 multibuild d26d81f242cb193d899a72bca423d0bd multilib 4fbbbc98f236f1b43acd99476bc3cd85 multilib-build 05f207909a804c9174bc39a00547d598 multilib-minimal 4b0f1857965db8869a729948d5277e0b portability d33a77692bb47e8227f27e17fb9c3c05 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb unpacker 697382d119fd3d195f110b7979184285 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=ef40703191930a0fd31b0ab0ffc609a2 +_md5_=bd9145b857a88f0329ca846ace8a4465 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index ff9a0284..abeb019d 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -87,7 +87,7 @@ x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg driver 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.129.06: NVIDIA Accelerated Graphics Driver -x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver +x11-drivers/nvidia-drivers-legacy 390.151: NVIDIA Accelerated Graphics Driver x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit + x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities x11-misc/nvidia-settings 470.129.06: NVIDIA Linux X11 Settings Utility diff --git a/x11-drivers/nvidia-drivers-legacy/Manifest b/x11-drivers/nvidia-drivers-legacy/Manifest index edb57fcb..957bad0a 100644 --- a/x11-drivers/nvidia-drivers-legacy/Manifest +++ b/x11-drivers/nvidia-drivers-legacy/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-390.147.run 85930997 BLAKE2B a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc SHA512 0d8bda32e916d71da2ea74bc12a4f3cb0a0c2ddda27511cf3c89bbf4aeb28db68f6b7261639d88dd1c0180b91213c09de930d233158268c5d9ab3b223510e964 +DIST NVIDIA-Linux-x86_64-390.151.run 86025677 BLAKE2B 8f78ee00d15ffac9f371e8302541eee8b033670953850dd770c6615eb674fcda2adcea52582284c59a9d7e32943a445d65515b1cacd6f8e5fcbe6c9e94080fb0 SHA512 aad962e4132c8ab031b5f72e47fbd4b5c49824bc175f13fd2c6fb3e539d41ff9829835ce4928bbfa56aba2ffa43fbe3d8049e9246e29b19abcea0ac89bdae5d4 diff --git a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch b/x11-drivers/nvidia-drivers-legacy/files/dkms.patch index 96a0cd74..c839a849 100644 --- a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch +++ b/x11-drivers/nvidia-drivers-legacy/files/dkms.patch @@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-legacy-dkms" -+PACKAGE_VERSION="390.147" ++PACKAGE_VERSION="390.151" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, diff --git a/x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch b/x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch deleted file mode 100644 index a4242ec7..00000000 --- a/x11-drivers/nvidia-drivers-legacy/files/kernel-5.14.patch +++ /dev/null @@ -1,82 +0,0 @@ -Taken from https://build.opensuse.org/package/view_file/X11:Drivers:Video/nvidia-gfxG04/kernel-5.14.patch?rev=233 -Credit to Stefan Dirsch <sndirsch@suse.com> - -diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh ---- NVIDIA-Linux-x86_64-390.144/kernel.orig/conftest.sh 2021-08-31 16:58:57.799629833 +0200 -+++ NVIDIA-Linux-x86_64-390.144/kernel/conftest.sh 2021-08-31 18:00:09.257825534 +0200 -@@ -4493,6 +4493,30 @@ compile_test() { - fi - ;; - -+ drm_device_has_pdev) -+ # -+ # Determine if the 'drm_device' structure has a 'pdev' field. -+ # -+ # Removed by commit b347e04452ff ("drm: Remove pdev field from -+ # struct drm_device") in v5.14-rc1. -+ # -+ CODE=" -+ #if defined(NV_DRM_DRMP_H_PRESENT) -+ #include <drm/drmP.h> -+ #endif -+ -+ #if defined(NV_DRM_DRM_DEVICE_H_PRESENT) -+ #include <drm/drm_device.h> -+ #endif -+ -+ int conftest_drm_device_has_pdev(void) { -+ return offsetof(struct drm_device, pdev); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_DRM_DEVICE_HAS_PDEV" "" "types" -+ ;; -+ -+ - esac - } - -diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c ---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/nvlink_linux.c 2021-08-31 16:58:57.787629590 +0200 -+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/nvlink_linux.c 2021-08-31 17:51:49.207744327 +0200 -@@ -597,7 +597,7 @@ void NVLINK_API_CALL nvlink_sleep(unsign - // the requested timeout has expired, loop until less - // than a jiffie of the desired delay remains. - // -- current->state = TASK_INTERRUPTIBLE; -+ set_current_state(TASK_INTERRUPTIBLE); - do - { - schedule_timeout(jiffies); -diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c ---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia/os-interface.c 2021-08-31 16:58:57.787629590 +0200 -+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia/os-interface.c 2021-08-31 17:51:58.043922420 +0200 -@@ -580,7 +580,7 @@ NV_STATUS NV_API_CALL os_delay(NvU32 Mil - // the requested timeout has expired, loop until less - // than a jiffie of the desired delay remains. - // -- current->state = TASK_INTERRUPTIBLE; -+ set_current_state(TASK_INTERRUPTIBLE); - do - { - schedule_timeout(jiffies); -diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c ---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm-drv.c 2021-08-31 16:58:57.783629508 +0200 -+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm-drv.c 2021-08-31 17:56:41.345633279 +0200 -@@ -811,7 +811,9 @@ static void nv_drm_register_drm_device(c - - dev->dev_private = nv_dev; - nv_dev->dev = dev; -+#if defined(NV_DRM_DEVICE_HAS_PDEV) - dev->pdev = pdev; -+#endif - - /* Register DRM device to DRM sub-system */ - -diff -u -p -r NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild ---- NVIDIA-Linux-x86_64-390.144/kernel.orig/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 16:58:57.783629508 +0200 -+++ NVIDIA-Linux-x86_64-390.144/kernel/nvidia-drm/nvidia-drm.Kbuild 2021-08-31 17:53:18.265539346 +0200 -@@ -102,3 +102,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_dr - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_atomic_check_has_atomic_state_arg - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_gem_object_vmap_has_map_arg - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_plane_atomic_check_has_atomic_state_arg -+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_device_has_pdev diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.147.ebuild b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.151.ebuild index 2dbaa099..1d3c98cc 100644 --- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.147.ebuild +++ b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.151.ebuild @@ -49,7 +49,6 @@ QA_PREBUILT="opt/* usr/lib*" PATCHES=( "${FILESDIR}"/dkms.patch - "${FILESDIR}"/kernel-5.14.patch ) S=${WORKDIR}/ |