From 405fcdaa373f699f835b85cd3d02448103b6bc35 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 23 Jul 2024 17:33:40 +0100 Subject: [PATCH 01/13] Update to 560.28.03 beta --- sources | 4 ++-- xorg-x11-drv-nvidia.spec | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 53e76f1..bade2e7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (NVIDIA-Linux-x86_64-555.58.02.run) = 7a8c84c15d87d2cf5f6261b12d3d683e0a7a1847d7c5461b3995f78b8dd862272fd11be07018593a8d5ef5d8274040f15b9e6fe92e9212dcd7a97be668852433 -SHA512 (NVIDIA-Linux-aarch64-555.58.02.run) = 9c4d78ec381bb6163c6591309a9a40f1dfdb5f3d6b983e1728c17383c5f0871bf3879b32f93c7892d33577a9dacf2dcb1d14639bcc4ca510104f33cb54e83df0 +SHA512 (NVIDIA-Linux-aarch64-560.28.03.run) = be09b9a57b048b757d1f1392e0d7775b4fd9810c0e651354f224740258889a20f5f7154c541b9227839cce0a0a808a1b5f880cb2a073c53774dec060977256f7 +SHA512 (NVIDIA-Linux-x86_64-560.28.03.run) = 0ab19203be58c22f29a393280eb4aaae18949744af301c224ac9c691c168444cf9b780f5d7fb51a9987019e3dab18f706e92c6a5e40717dbf02af3a3def2e4f0 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 8896ed1..51f7993 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -21,7 +21,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 555.58.02 +Version: 560.28.03 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -222,6 +222,8 @@ cp -a \ libnvcuvid.so.%{version} \ libnvidia-allocator.so.%{version} \ libnvidia-eglcore.so.%{version} \ + libnvidia-egl-xcb.so.1 \ + libnvidia-egl-xlib.so.1 \ libnvidia-encode.so.%{version} \ libnvidia-fbc.so.%{version} \ libnvidia-glcore.so.%{version} \ @@ -241,6 +243,7 @@ cp -a \ %endif libnvidia-ngx.so.%{version} \ %ifnarch aarch64 + libnvidia-vksc-core.so.%{version} \ %if 0%{?fedora} || 0%{?rhel} > 8 libnvidia-pkcs11-openssl3.so.%{version} \ %else @@ -295,12 +298,19 @@ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/ install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json +# EGL config +install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ +install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json %{buildroot}%{_datadir}/egl/egl_external_platform.d/ + # Blacklist nouveau, autoload nvidia-uvm module after nvidia module mkdir -p %{buildroot}%{_modprobedir} install -p -m 0644 %{SOURCE11} %{buildroot}%{_modprobedir} install -p -m 0644 %{SOURCE16} %{buildroot}%{_modprobedir} %ifarch x86_64 +# Install VulkanSC config +install -m 0755 -d %{buildroot}%{_sysconfdir}/vulkansc/icd.d/ +install -p -m 0644 nvidia_icd_vksc.json %{buildroot}%{_sysconfdir}/vulkansc/icd.d/ # Install dbus config install -m 0755 -d %{buildroot}%{_dbus_systemd_dir} install -p -m 0644 nvidia-dbus.conf %{buildroot}%{_dbus_systemd_dir} @@ -315,7 +325,7 @@ install -m 0755 -d %{buildroot}%{_bindir} install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,ngx-updater} \ %{buildroot}%{_bindir} %ifarch x86_64 -install -p -m 0755 nvidia-powerd \ +install -p -m 0755 nvidia-powerd nvidia-pcc \ %{buildroot}%{_bindir} %endif @@ -446,10 +456,14 @@ fi ||: %doc nvidiapkg/README.txt %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html +%ifarch x86_64 +%{_bindir}/nvidia-pcc +%endif %{_firmwarepath} %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf @@ -489,6 +503,8 @@ fi ||: %{_libdir}/libnvidia-allocator.so.1 %{_libdir}/libnvidia-allocator.so.%{version} %{_libdir}/libnvidia-eglcore.so.%{version} +%{_libdir}/libnvidia-egl-xcb.so.1 +%{_libdir}/libnvidia-egl-xlib.so.1 %{_libdir}/libnvidia-fbc.so.1 %{_libdir}/libnvidia-fbc.so.%{version} %{_libdir}/libnvidia-glcore.so.%{version} @@ -522,6 +538,9 @@ fi ||: %{_libdir}/libnvoptix.so.1 %{_libdir}/libnvoptix.so.%{version} %ifarch x86_64 +%{_sysconfdir}/vulkansc/icd.d/nvidia_icd_vksc.json +%{_libdir}/libnvidia-vksc-core.so.%{version} +%{_libdir}/libnvidia-vksc-core.so.1 %{_winedir}/ %endif %endif @@ -611,6 +630,9 @@ fi ||: %endif %changelog +* Tue Jul 23 2024 Leigh Scott - 3:560.28.03-1 +- Update to 560.28.03 beta + * Mon Jul 01 2024 Leigh Scott - 3:555.58.02-1 - Update to 555.58.02 From 07d55b674480e104f342f50250ccc74703db2c36 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 24 Jul 2024 01:10:29 +0100 Subject: [PATCH 02/13] Fix requires on i686 libs --- xorg-x11-drv-nvidia.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 51f7993..911578d 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -157,9 +157,8 @@ Requires: libglvnd-gles%{?_isa} >= 0.2 Requires: libglvnd-glx%{?_isa} >= 0.2 Requires: libglvnd-opengl%{?_isa} >= 0.2 Requires: vulkan-loader%{?_isa} -%ifarch x86_64 aarch64 # Fedora 35 has early XWayland support using recent egl-wayland -Requires: egl-wayland%{?_isa} %{?fc35: >= 1.1.9-2} +Requires: egl-wayland%{?_isa} %if 0%{?fedora} Requires: egl-gbm%{?_isa} %endif @@ -167,7 +166,6 @@ Requires: egl-gbm%{?_isa} %ifarch x86_64 Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32)) %endif -%endif Requires: mesa-libEGL%{?_isa} Requires: mesa-libGL%{?_isa} Requires: mesa-libGLES%{?_isa} From 16f0c94998c63004e2a8b3c68e7f7751ffa20ba0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 24 Jul 2024 12:27:06 +0100 Subject: [PATCH 03/13] Use bundled egl-wayland and egl-gbm --- xorg-x11-drv-nvidia.spec | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 911578d..146e905 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,7 +22,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 560.28.03 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -157,11 +157,10 @@ Requires: libglvnd-gles%{?_isa} >= 0.2 Requires: libglvnd-glx%{?_isa} >= 0.2 Requires: libglvnd-opengl%{?_isa} >= 0.2 Requires: vulkan-loader%{?_isa} -# Fedora 35 has early XWayland support using recent egl-wayland -Requires: egl-wayland%{?_isa} -%if 0%{?fedora} -Requires: egl-gbm%{?_isa} -%endif + +Obsoletes: egl-wayland < 1.1.15 +Obsoletes: egl-gbm < 2:1.1.2 + # Boolean dependencies are only fedora and el8 %ifarch x86_64 Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32)) @@ -220,6 +219,8 @@ cp -a \ libnvcuvid.so.%{version} \ libnvidia-allocator.so.%{version} \ libnvidia-eglcore.so.%{version} \ + libnvidia-egl-gbm.so.1.1.1 \ + libnvidia-egl-wayland.so.1.1.13 \ libnvidia-egl-xcb.so.1 \ libnvidia-egl-xlib.so.1 \ libnvidia-encode.so.%{version} \ @@ -236,9 +237,6 @@ cp -a \ libcudadebugger.so.%{version} \ libnvidia-api.so.1 \ libnvidia-cfg.so.%{version} \ -%if 0%{?rhel} - libnvidia-egl-gbm.so.1.1.1 \ -%endif libnvidia-ngx.so.%{version} \ %ifnarch aarch64 libnvidia-vksc-core.so.%{version} \ @@ -296,9 +294,10 @@ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/ install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -# EGL config +# EGL configs install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ -install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json %{buildroot}%{_datadir}/egl/egl_external_platform.d/ +install -pm 0644 10_nvidia_wayland.json 15_nvidia_gbm.json 20_nvidia_xcb.json 20_nvidia_xlib.json \ + %{buildroot}%{_datadir}/egl/egl_external_platform.d/ # Blacklist nouveau, autoload nvidia-uvm module after nvidia module mkdir -p %{buildroot}%{_modprobedir} @@ -461,7 +460,7 @@ fi ||: %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json +%{_datadir}/egl/egl_external_platform.d/*.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf @@ -501,6 +500,10 @@ fi ||: %{_libdir}/libnvidia-allocator.so.1 %{_libdir}/libnvidia-allocator.so.%{version} %{_libdir}/libnvidia-eglcore.so.%{version} +%{_libdir}/libnvidia-egl-gbm.so.1 +%{_libdir}/libnvidia-egl-gbm.so.1.1.1 +%{_libdir}/libnvidia-egl-wayland.so.1 +%{_libdir}/libnvidia-egl-wayland.so.1.1.13 %{_libdir}/libnvidia-egl-xcb.so.1 %{_libdir}/libnvidia-egl-xlib.so.1 %{_libdir}/libnvidia-fbc.so.1 @@ -526,10 +529,6 @@ fi ||: %{_libdir}/libnvidia-pkcs11.so.%{version} %endif %endif -%if 0%{?rhel} -%{_libdir}/libnvidia-egl-gbm.so.1 -%{_libdir}/libnvidia-egl-gbm.so.1.1.1 -%endif %{_libdir}/libnvidia-ngx.so.1 %{_libdir}/libnvidia-ngx.so.%{version} %{_libdir}/libnvidia-rtcore.so.%{version} @@ -628,6 +627,9 @@ fi ||: %endif %changelog +* Wed Jul 24 2024 Leigh Scott - 3:560.28.03-2 +- Use bundled egl-wayland and egl-gbm + * Tue Jul 23 2024 Leigh Scott - 3:560.28.03-1 - Update to 560.28.03 beta From e007ef98834dddce0212b3d59a7c03ccde0d6e5d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 6 Aug 2024 15:20:54 +0100 Subject: [PATCH 04/13] Update to 560.31.02 beta --- sources | 4 ++-- xorg-x11-drv-nvidia.spec | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sources b/sources index bade2e7..90e40d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (NVIDIA-Linux-aarch64-560.28.03.run) = be09b9a57b048b757d1f1392e0d7775b4fd9810c0e651354f224740258889a20f5f7154c541b9227839cce0a0a808a1b5f880cb2a073c53774dec060977256f7 -SHA512 (NVIDIA-Linux-x86_64-560.28.03.run) = 0ab19203be58c22f29a393280eb4aaae18949744af301c224ac9c691c168444cf9b780f5d7fb51a9987019e3dab18f706e92c6a5e40717dbf02af3a3def2e4f0 +SHA512 (NVIDIA-Linux-aarch64-560.31.02.run) = 068f2ab92454679abdbfddafda36b98d3d045237baabe5f717005d73efdd6c6e36773ceea5915a9811ee21736d031131d77c41fb10b2b386878f7dbe6355ab6c +SHA512 (NVIDIA-Linux-x86_64-560.31.02.run) = ac54cc6f5820b523c894df2a7591c634f0337d5de72044ef9736218c5ec1e531a7347a4faa7a11eeaa7c3156884c0c909f766dce484cb51f9c68f6b5f83c8935 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 146e905..450a8bb 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -21,8 +21,8 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 560.28.03 -Release: 2%{?dist} +Version: 560.31.02 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -306,8 +306,8 @@ install -p -m 0644 %{SOURCE16} %{buildroot}%{_modprobedir} %ifarch x86_64 # Install VulkanSC config -install -m 0755 -d %{buildroot}%{_sysconfdir}/vulkansc/icd.d/ -install -p -m 0644 nvidia_icd_vksc.json %{buildroot}%{_sysconfdir}/vulkansc/icd.d/ +install -m 0755 -d %{buildroot}%{_datadir}/vulkansc/icd.d/ +install -p -m 0644 nvidia_icd_vksc.json %{buildroot}%{_datadir}/vulkansc/icd.d/ # Install dbus config install -m 0755 -d %{buildroot}%{_dbus_systemd_dir} install -p -m 0644 nvidia-dbus.conf %{buildroot}%{_dbus_systemd_dir} @@ -535,7 +535,7 @@ fi ||: %{_libdir}/libnvoptix.so.1 %{_libdir}/libnvoptix.so.%{version} %ifarch x86_64 -%{_sysconfdir}/vulkansc/icd.d/nvidia_icd_vksc.json +%{_datadir}/vulkansc/icd.d/nvidia_icd_vksc.json %{_libdir}/libnvidia-vksc-core.so.%{version} %{_libdir}/libnvidia-vksc-core.so.1 %{_winedir}/ @@ -627,6 +627,9 @@ fi ||: %endif %changelog +* Tue Aug 06 2024 Leigh Scott - 3:560.31.02-1 +- Update to 560.31.02 beta + * Wed Jul 24 2024 Leigh Scott - 3:560.28.03-2 - Use bundled egl-wayland and egl-gbm From 2c6bcb76ec126e8c1aa559db64cd10b7201c1ed2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 12 Aug 2024 10:18:28 +0200 Subject: [PATCH 05/13] Provides nvidia-open for cuda-12-6 Not due to be enforced at the packaging level --- xorg-x11-drv-nvidia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 450a8bb..2d72f6e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -132,6 +132,8 @@ Provides: nvidia-driver = %{?epoch}:%{version}-100 Provides: nvidia-driver%{?_isa} = %{?epoch}:%{version}-100 Provides: nvidia-drivers = %{?epoch}:%{version}-100 Provides: nvidia-drivers%{?_isa} = %{?epoch}:%{version}-100 +Provides: nvidia-open = %{?epoch}:%{version}-100 +Provides: nvidia-open%{?_isa} = %{?epoch}:%{version}-100 %description cuda This package provides the CUDA driver. From 67c01ff3cb6b396383d24352034b24f6a4cc123d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 12 Aug 2024 10:19:18 +0200 Subject: [PATCH 06/13] Add changelog --- xorg-x11-drv-nvidia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2d72f6e..aa9f491 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,7 +22,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 560.31.02 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -629,6 +629,9 @@ fi ||: %endif %changelog +* Mon Aug 12 2024 Nicolas Chauvet - 3:560.31.02-2 +- Provides nvidia-open for cuda-12-6 + * Tue Aug 06 2024 Leigh Scott - 3:560.31.02-1 - Update to 560.31.02 beta From 777679f389212c01333211cfe1718c5ec5a33dd2 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 18 Aug 2024 14:38:42 +0100 Subject: [PATCH 07/13] Use system egl-wayland and egl-gbm --- xorg-x11-drv-nvidia.spec | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index aa9f491..30e5282 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,7 +22,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 560.31.02 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -160,10 +160,16 @@ Requires: libglvnd-glx%{?_isa} >= 0.2 Requires: libglvnd-opengl%{?_isa} >= 0.2 Requires: vulkan-loader%{?_isa} -Obsoletes: egl-wayland < 1.1.15 -Obsoletes: egl-gbm < 2:1.1.2 +%if 0%{?fedora} +Requires: egl-wayland%{?_isa} >= 1.1.15 +Requires: egl-gbm%{?_isa} >= 2:1.1.2 +%else +%ifnarch i686 +Requires: egl-wayland%{?_isa} >= 1.1.15 +Requires: egl-gbm%{?_isa} >= 2:1.1.2 +%endif +%endif -# Boolean dependencies are only fedora and el8 %ifarch x86_64 Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32)) %endif @@ -221,8 +227,6 @@ cp -a \ libnvcuvid.so.%{version} \ libnvidia-allocator.so.%{version} \ libnvidia-eglcore.so.%{version} \ - libnvidia-egl-gbm.so.1.1.1 \ - libnvidia-egl-wayland.so.1.1.13 \ libnvidia-egl-xcb.so.1 \ libnvidia-egl-xlib.so.1 \ libnvidia-encode.so.%{version} \ @@ -242,11 +246,7 @@ cp -a \ libnvidia-ngx.so.%{version} \ %ifnarch aarch64 libnvidia-vksc-core.so.%{version} \ -%if 0%{?fedora} || 0%{?rhel} > 8 libnvidia-pkcs11-openssl3.so.%{version} \ -%else - libnvidia-pkcs11.so.%{version} \ -%endif %endif libnvidia-rtcore.so.%{version} \ libnvoptix.so.%{version} \ @@ -298,7 +298,7 @@ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_ # EGL configs install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ -install -pm 0644 10_nvidia_wayland.json 15_nvidia_gbm.json 20_nvidia_xcb.json 20_nvidia_xlib.json \ +install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json \ %{buildroot}%{_datadir}/egl/egl_external_platform.d/ # Blacklist nouveau, autoload nvidia-uvm module after nvidia module @@ -462,7 +462,7 @@ fi ||: %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -%{_datadir}/egl/egl_external_platform.d/*.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf @@ -502,10 +502,6 @@ fi ||: %{_libdir}/libnvidia-allocator.so.1 %{_libdir}/libnvidia-allocator.so.%{version} %{_libdir}/libnvidia-eglcore.so.%{version} -%{_libdir}/libnvidia-egl-gbm.so.1 -%{_libdir}/libnvidia-egl-gbm.so.1.1.1 -%{_libdir}/libnvidia-egl-wayland.so.1 -%{_libdir}/libnvidia-egl-wayland.so.1.1.13 %{_libdir}/libnvidia-egl-xcb.so.1 %{_libdir}/libnvidia-egl-xlib.so.1 %{_libdir}/libnvidia-fbc.so.1 @@ -525,11 +521,7 @@ fi ||: %{_libdir}/libnvidia-cfg.so.1 %{_libdir}/libnvidia-cfg.so.%{version} %ifnarch aarch64 -%if 0%{?fedora} || 0%{?rhel} > 8 %{_libdir}/libnvidia-pkcs11-openssl3.so.%{version} -%else -%{_libdir}/libnvidia-pkcs11.so.%{version} -%endif %endif %{_libdir}/libnvidia-ngx.so.1 %{_libdir}/libnvidia-ngx.so.%{version} @@ -629,6 +621,10 @@ fi ||: %endif %changelog +* Sun Aug 18 2024 Leigh Scott - 3:560.31.02-3 +- Use system egl-wayland and egl-gbm +- Remove old rhel conditionals + * Mon Aug 12 2024 Nicolas Chauvet - 3:560.31.02-2 - Provides nvidia-open for cuda-12-6 From d96c31a950f3254655b4329f5272d4f5c0328b36 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 20 Aug 2024 18:14:15 +0200 Subject: [PATCH 08/13] Add nvidia-open-560 --- xorg-x11-drv-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 30e5282..827e759 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -134,6 +134,7 @@ Provides: nvidia-drivers = %{?epoch}:%{version}-100 Provides: nvidia-drivers%{?_isa} = %{?epoch}:%{version}-100 Provides: nvidia-open = %{?epoch}:%{version}-100 Provides: nvidia-open%{?_isa} = %{?epoch}:%{version}-100 +Provides: nvidia-open-%(echo %{version} | cut -f 1 -d .) = %{version} %description cuda This package provides the CUDA driver. From d0ed206c962f3b1aa0cbca0b7c62a0c5a1bbf85d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 20 Aug 2024 18:34:59 +0200 Subject: [PATCH 09/13] Add conflicts --- xorg-x11-drv-nvidia.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 827e759..e79cff9 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -76,6 +76,7 @@ Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version} Provides: %{_nvidia_serie}-open-kmod-common = %{?epoch}:%{version} Conflicts: xorg-x11-drv-nvidia-340xx Conflicts: xorg-x11-drv-nvidia-390xx +Conflicts: xorg-x11-drv-nvidia-470xx %global __provides_exclude ^(lib.*GL.*\\.so.*)$ %global __requires_exclude ^libglxserver_nvidia.so|^(lib.*GL.*\\.so.*)$ @@ -122,6 +123,8 @@ Requires: ocl-icd%{?_isa} Requires: opencl-filesystem Conflicts: xorg-x11-drv-nvidia-340xx-cuda +Conflicts: xorg-x11-drv-nvidia-390xx-cuda +Conflicts: xorg-x11-drv-nvidia-470xx-cuda #Don't put an epoch here Provides: cuda-drivers-%(echo %{version} | cut -f 1 -d .) = %{version} From 1326a0f7f921a461d33ab7e6548157862e2270f0 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 20 Aug 2024 18:35:13 +0200 Subject: [PATCH 10/13] Bump release --- xorg-x11-drv-nvidia.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index e79cff9..d4243fd 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,7 +22,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 560.31.02 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -625,6 +625,10 @@ fi ||: %endif %changelog +* Tue Aug 20 2024 Nicolas Chauvet - 3:560.31.02-4 +- Add nvidia-open-560 +- Add missing conflicts + * Sun Aug 18 2024 Leigh Scott - 3:560.31.02-3 - Use system egl-wayland and egl-gbm - Remove old rhel conditionals From 507088ca97ae75f3b560603b58fa4b46c03cfd6b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 21 Aug 2024 08:07:03 +0100 Subject: [PATCH 11/13] Fix triggerun scriptlet --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d4243fd..ccac764 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -430,7 +430,7 @@ fi || : if [ -f %{_sysconfdir}/default/grub ] ; then sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub . %{_sysconfdir}/default/grub - if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then + if [ -z "${GRUB_CMDLINE_LINUX}" ]; then echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub else for i in %{_dracutopts} ; do From bb1a8cf1f801d1a7df8b37e9ff609d809e787b42 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 21 Aug 2024 13:39:00 +0200 Subject: [PATCH 12/13] Drop tweaks for /etc/default/grub - rfbz#7034 Add --remove-args for deprecated/old cmdline options in triggerin --- xorg-x11-drv-nvidia.spec | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ccac764..bccba22 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -10,6 +10,7 @@ %global _firmwarepath %{_prefix}/lib/firmware %global _winedir %{_libdir}/nvidia/wine %global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau +%global _dracutopts_removed initcall_blacklist=simpledrm_platform_driver_init nvidia-drm.modeset=1 %if 0%{?rhel} %global _systemd_util_dir %{_prefix}/lib/systemd %endif @@ -22,7 +23,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 560.31.02 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -423,31 +424,14 @@ fi %post if [ "$1" -eq "1" ]; then %{_grubby} --remove-args='nomodeset' --args='%{_dracutopts}' &>/dev/null - sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub fi || : -%triggerun -- xorg-x11-drv-nvidia < 3:545.23.06-1 -if [ -f %{_sysconfdir}/default/grub ] ; then - sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub - . %{_sysconfdir}/default/grub - if [ -z "${GRUB_CMDLINE_LINUX}" ]; then - echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub - else - for i in %{_dracutopts} ; do - _has_string=$(echo ${GRUB_CMDLINE_LINUX} | grep -F -c $i) - if [ x"$_has_string" = x0 ] ; then - GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}" - fi - done - sed -i -e "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"|g" %{_sysconfdir}/default/grub - fi -fi -%{_grubby} --args='%{_dracutopts}' &>/dev/null || : +%triggerun -- xorg-x11-drv-nvidia < 3:560.31.02-5 +%{_grubby} --remove-args='%{_dracutopts_remove}' &>/dev/null || : %preun if [ "$1" -eq "0" ]; then %{_grubby} --remove-args='%{_dracutopts}' &>/dev/null - sed -i -e 's/%{_dracutopts} //g' /etc/default/grub # Backup and disable previously used xorg.conf [ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null fi ||: @@ -625,6 +609,10 @@ fi ||: %endif %changelog +* Wed Aug 21 2024 Nicolas Chauvet - 3:560.31.02-5 +- Drop tweaks for /etc/default/grub - rfbz#7034 +- Add --remove-args for deprecated/old cmdline options in triggerin + * Tue Aug 20 2024 Nicolas Chauvet - 3:560.31.02-4 - Add nvidia-open-560 - Add missing conflicts From 369406d89b2f7cb54db6ea8e1d55d87f92de6f2f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 21 Aug 2024 17:05:39 +0100 Subject: [PATCH 13/13] Update to 560.35.03 Release --- sources | 4 ++-- xorg-x11-drv-nvidia.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 90e40d5..8497954 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (NVIDIA-Linux-aarch64-560.31.02.run) = 068f2ab92454679abdbfddafda36b98d3d045237baabe5f717005d73efdd6c6e36773ceea5915a9811ee21736d031131d77c41fb10b2b386878f7dbe6355ab6c -SHA512 (NVIDIA-Linux-x86_64-560.31.02.run) = ac54cc6f5820b523c894df2a7591c634f0337d5de72044ef9736218c5ec1e531a7347a4faa7a11eeaa7c3156884c0c909f766dce484cb51f9c68f6b5f83c8935 +SHA512 (NVIDIA-Linux-x86_64-560.35.03.run) = 97137160b64928ff84fd6145a0ebc209c045d6a07ccc53ec6df6ba1fda2ad72038eda7ecdc0a0178a2628aa4e18819a9b3ff3b693b22bdc9de543be0a968f8aa +SHA512 (NVIDIA-Linux-aarch64-560.35.03.run) = 8df331104f3d63d4aaeeace412a986a93355be3ce69a968fbc12b7d0b21a34e71cdf37758c23a392c358a1c3ba1da21115002f55017c2a829c7bb4d41536e543 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index bccba22..f7d4bde 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,8 +22,8 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 560.31.02 -Release: 5%{?dist} +Version: 560.35.03 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -609,6 +609,9 @@ fi ||: %endif %changelog +* Wed Aug 21 2024 Leigh Scott - 3:560.35.03-1 +- Update to 560.35.03 Release + * Wed Aug 21 2024 Nicolas Chauvet - 3:560.31.02-5 - Drop tweaks for /etc/default/grub - rfbz#7034 - Add --remove-args for deprecated/old cmdline options in triggerin