diff --git a/nvidia.spec b/nvidia.spec index 2413d69..ba70ead 100644 --- a/nvidia.spec +++ b/nvidia.spec @@ -1,9 +1,9 @@ %define nvidia_current_ver %version %define nvidia_current_libver %version Name: nvidia -Version: 560.35.03 +Version: 565.57.01 Epoch: 1 -Release: 2mamba +Release: 1mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -29,7 +29,10 @@ BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgtk3-devel BuildRequires: libmesa-devel +BuildRequires: libopenssl-devel +BuildRequires: libopenssl111 BuildRequires: libpango-devel +BuildRequires: libxcb-devel ## AUTOBUILDREQ-END ExclusiveArch: x86_64 @@ -70,6 +73,8 @@ Conflicts: xorg-apps-nvidia_304 Conflicts: xorg-apps-nvidia_340 Conflicts: xorg-apps-nvidia_390 Obsoletes: xorg-apps-nvidia_450 <= 1:460.39 +Obsoletes: xorg-drv-video-nvidia_450-doc <= 1:460.39 +Obsoletes: xorg-drv-video-nvidia-doc < 1:560.35.03-3mamba %description -n xorg-drv-video-%{name} The NVIDIA Accelerated Linux Driver Set brings both accelerated 2D functionality and high performance OpenGL support to Linux x86 with theuse of NVIDIA graphics processing units (GPUs). @@ -77,20 +82,6 @@ These drivers provide optimized hardware acceleration of OpenGL applications via TwinView, TV-Out and flat panel displays are also supported. This package contains the Xorg libraries, DKMS kernel driver and all the NVIDIA libraries. -%package -n xorg-drv-video-%{name}-doc -Group: Documentation -Summary: HTML documentation for NVIDIA Accelerated Libraries for Xorg -Conflicts: xorg-drv-video-nvidia_304-doc -Conflicts: xorg-drv-video-nvidia_340-doc -Conflicts: xorg-drv-video-nvidia_390-doc -Obsoletes: xorg-drv-video-nvidia_450-doc <= 1:460.39 - -%description -n xorg-drv-video-%{name}-doc -The NVIDIA Accelerated Linux Driver Set brings both accelerated 2D functionality and high performance OpenGL support to Linux x86 with theuse of NVIDIA graphics processing units (GPUs). -These drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server and support nearly all NVIDIA graphics chips. -TwinView, TV-Out and flat panel displays are also supported. -This package contains the HTML documentation. - # Turn off strip'ng of binaries %global __strip /bin/true @@ -125,9 +116,13 @@ pushd current # X driver install -D -m755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so +# Xorg +install -D -m755 libnvidia-egl-xcb.so.1.0.0 -t %{buildroot}%{_libdir} +install -D -m755 libnvidia-egl-xlib.so.1.0.0 -t %{buildroot}%{_libdir} +install -D -m644 20_nvidia_xcb.json -t %{buildroot}%{_datadir}/egl/egl_external_platform.d +install -D -m644 20_nvidia_xlib.json -t %{buildroot}%{_datadir}/egl/egl_external_platform.d + # Wayland/GBM -install -D -m755 libnvidia-egl-gbm.so.1* -t %{buildroot}%{_libdir}/ -install -D -m644 15_nvidia_gbm.json %{buildroot}%{_datadir}/egl/egl_external_platform.d/15_nvidia_gbm.json mkdir -p %{buildroot}%{_libdir}/gbm ln -sr ../libnvidia-allocator.so.%{version} %{buildroot}%{_libdir}/gbm/nvidia-drm_gbm.so @@ -156,11 +151,10 @@ install -D -m755 libnvidia-glsi.so.%{version} %{buildroot}%{_libdir}/libnvidia-g # OpenCL install -D -m644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/nvidia.icd -#install -D -m755 libnvidia-compiler.so.%{version} %{buildroot}%{_libdir}/libnvidia-compiler.so.%{version} install -D -m755 libnvidia-opencl.so.%{version} %{buildroot}%{_libdir}/libnvidia-opencl.so.%{version} # misc -#install -D -m755 libnvidia-ifr.so.%{version} %{buildroot}%{_libdir}/libnvidia-ifr.so.%{version} +install -D -m755 libnvidia-api.so.1 %{buildroot}%{_libdir}/libnvidia-api.so.1 install -D -m755 libnvidia-fbc.so.%{version} %{buildroot}%{_libdir}/libnvidia-fbc.so.%{version} install -D -m755 libnvidia-encode.so.%{version} %{buildroot}%{_libdir}/libnvidia-encode.so.%{version} install -D -m755 libnvidia-cfg.so.%{version} %{buildroot}%{_libdir}/libnvidia-cfg.so.%{version} @@ -182,6 +176,7 @@ install -D -m755 libnvidia-tls.so.%{version} %{buildroot}%{_libdir}/libnvidia-tl # CUDA install -D -m755 libcuda.so.%{version} %{buildroot}%{_libdir}/libcuda.so.%{version} install -D -m755 libnvcuvid.so.%{version} %{buildroot}%{_libdir}/libnvcuvid.so.%{version} +install -D -m755 libcudadebugger.so.%{version} %{buildroot}%{_libdir}/libcudadebugger.so.%{version} # NVVM Compiler library loaded by the CUDA driver to do JIT link-time-optimization install -D -m644 libnvidia-nvvm.so.%{version} %{buildroot}%{_libdir}/libnvidia-nvvm.so.%{version} @@ -190,10 +185,10 @@ install -D -m644 libnvidia-nvvm.so.%{version} %{buildroot}%{_libdir}/libnvidia-n install -D -m755 libnvidia-ptxjitcompiler.so.%{version} %{buildroot}%{_libdir}/libnvidia-ptxjitcompiler.so.%{version} # raytracing +install -D -m0644 nvoptix.bin %{buildroot}%{_datadir}/nvidia/nvoptix.bin install -D -m755 libnvoptix.so.%{version} %{buildroot}%{_libdir}/libnvoptix.so.%{version} install -D -m755 libnvidia-rtcore.so.%{version} %{buildroot}%{_libdir}/libnvidia-rtcore.so.%{version} -#install -D -m755 libnvidia-cbl.so.%{version} %{buildroot}%{_libdir}/libnvidia-cbl.so.%{version} -install -D -m0644 nvoptix.bin %{buildroot}%{_datadir}/nvidia/nvoptix.bin + # NGX install -D -m755 nvidia-ngx-updater %{buildroot}%{_bindir}/nvidia-ngx-updater install -D -m755 libnvidia-ngx.so.%{version} %{buildroot}%{_libdir}/libnvidia-ngx.so.%{version} @@ -203,25 +198,17 @@ install -D -m755 nvngx.dll %{buildroot}%{_libdir}/nvidia/wine/nvngx.dll # Optical flow install -D -m755 libnvidia-opticalflow.so.%{version} %{buildroot}%{_libdir}/libnvidia-opticalflow.so.%{version} -# DEBUG +# Cryptography library wrapper +install -D -m755 libnvidia-pkcs11.so.%{version} %{buildroot}%{_libdir}/libnvidia-pkcs11.so.%{version} +install -D -m755 libnvidia-pkcs11-openssl3.so.%{version} %{buildroot}%{_libdir}/libnvidia-pkcs11-openssl3.so.%{version} + +# Debug install -D -m755 nvidia-debugdump %{buildroot}%{_bindir}/nvidia-debugdump # nvidia-xconfig install -D -m755 nvidia-xconfig %{buildroot}%{_bindir}/nvidia-xconfig install -D -m644 nvidia-xconfig.1.gz %{buildroot}%{_mandir}/man1/nvidia-xconfig.1.gz -# nvidia-settings -install -D -m755 nvidia-settings %{buildroot}%{_bindir}/nvidia-settings -install -D -m644 nvidia-settings.1.gz %{buildroot}%{_mandir}/man1/nvidia-settings.1.gz -install -D -m644 nvidia-settings.desktop %{buildroot}%{_datadir}/applications/nvidia-settings.desktop -install -D -m644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/nvidia-settings.png -sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i %{buildroot}%{_datadir}/applications/nvidia-settings.desktop -install -D -m755 libnvidia-gtk3.so.%{version} %{buildroot}%{_libdir}/libnvidia-gtk3.so.%{version} -install -D -m 644 nvidia-settings.desktop \ - %{buildroot}%{_datadir}/applications/nvidia-settings.desktop -install -D -m 644 nvidia-settings.png \ - %{buildroot}%{_datadir}/pixmaps/nvidia-settings.png - # nvidia-bug-report install -D -m755 nvidia-bug-report.sh %{buildroot}%{_bindir}/nvidia-bug-report.sh @@ -255,12 +242,24 @@ install -D -m755 systemd/system-sleep/nvidia %{buildroot}%{_systemd_util_dir}/sy install -D -m755 systemd/nvidia-sleep.sh %{buildroot}%{_bindir}/nvidia-sleep.sh install -Dm755 nvidia-powerd %{buildroot}%{_bindir}/nvidia-powerd install -Dm644 nvidia-dbus.conf %{buildroot}%{_datadir}/dbus-1/system.d/nvidia-dbus.conf - + # distro specific files must be installed in /usr/share/X11/xorg.conf.d install -D -m644 %{SOURCE2} %{buildroot}%{_datadir}/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf install -Dm644 %{SOURCE1} %{buildroot}%{_sysusersdir}/nvidia.conf +# nvidia-settings +install -D -m755 nvidia-settings %{buildroot}%{_bindir}/nvidia-settings +install -D -m644 nvidia-settings.1.gz %{buildroot}%{_mandir}/man1/nvidia-settings.1.gz +install -D -m644 nvidia-settings.desktop %{buildroot}%{_datadir}/applications/nvidia-settings.desktop +install -D -m644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/nvidia-settings.png +sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i %{buildroot}%{_datadir}/applications/nvidia-settings.desktop +install -D -m755 libnvidia-gtk3.so.%{version} %{buildroot}%{_libdir}/libnvidia-gtk3.so.%{version} +install -D -m 644 nvidia-settings.desktop \ + %{buildroot}%{_datadir}/applications/nvidia-settings.desktop +install -D -m 644 nvidia-settings.png \ + %{buildroot}%{_datadir}/pixmaps/nvidia-settings.png + ## Clutter workaround (http://blog.sukimashita.com/2015/04/13/gnome-3-16-and-nvidia-binary-driver-crash-with-totem-gnome-maps-cheese-and-others/) #mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ #cat > %{buildroot}%{_sysconfdir}/profile.d/nvidia-clutter.sh << _EOF @@ -271,7 +270,7 @@ install -Dm644 %{SOURCE1} %{buildroot}%{_sysusersdir}/nvidia.conf install -d -m0755 %{buildroot}%{_modprobedir} cat > %{buildroot}%{_modprobedir}/nvidia.conf << _EOF blacklist nouveau -options nvidia_drm modeset=1 +options nvidia_drm modeset=1 fbdev=1 _EOF #install -d -m0755 %{buildroot}%{_modulesloaddir} @@ -285,7 +284,7 @@ add_drivers+=" nvidia nvidia_drm nvidia_modeset " __EOF # fallback service which loads nouveau driver if nvidia was not loaded -install %{SOURCE3} %{buildroot}%{_unitdir}/nvidia-fallback.service +install -D -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/nvidia-fallback.service # dkms install -d -m0755 %{buildroot}%{_prefix}/src/%{name}-%{version} @@ -361,8 +360,9 @@ fi KVER=`uname -r` INITRAMFS=/boot/initramfs-${KVER}.img -[ -e ${INITRAMFS} -a %{_modprobedir}/nvidia.conf -nt ${INITRAMFS} ] || continue -[ -e /usr/sbin/mkinitrd ] && /usr/sbin/mkinitrd ${INITRAMFS} ${KVER} -f -H -q +[ -e ${INITRAMFS} -a %{_modprobedir}/nvidia.conf -nt ${INITRAMFS} ] && { + dracut $INITRAMFS $KVER -H -f -q +} : %files -n xorg-drv-video-%{name} @@ -374,7 +374,6 @@ INITRAMFS=/boot/initramfs-${KVER}.img %{_prefix}/lib/firmware/nvidia/%{version}/*.bin %{_bindir}/nvidia-* %{_modprobedir}/nvidia.conf -#%{_modulesloaddir}/nvidia.conf %{_systemd_util_dir}/system-sleep/nvidia %{_unitdir}/nvidia-hibernate.service %{_unitdir}/nvidia-persistenced.service @@ -389,6 +388,7 @@ INITRAMFS=/boot/initramfs-${KVER}.img %{_libdir}/libGLESv2_nvidia.so.* %{_libdir}/libGLX_nvidia.so.* %{_libdir}/libcuda.so.* +%{_libdir}/libcudadebugger.so.* %{_libdir}/libnvcuvid.so.* %{_libdir}/libnvidia-*.so.* %{_libdir}/libnvoptix.so.* @@ -403,7 +403,8 @@ INITRAMFS=/boot/initramfs-${KVER}.img %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_datadir}/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf %{_datadir}/applications/nvidia-settings.desktop -%{_datadir}/egl/egl_external_platform.d/15_nvidia_gbm.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_xcb.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_xlib.json %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json %{_datadir}/nvidia/nvidia-application-profiles-%{version}-key-documentation %{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc @@ -414,11 +415,13 @@ INITRAMFS=/boot/initramfs-${KVER}.img %{_mandir}/man1/nvidia-*.1* %doc current/LICENSE -%files -n xorg-drv-video-%{name}-doc -%defattr(-,root,root) -%doc current/{NVIDIA_Changelog,README.txt} current/html - %changelog +* Thu Oct 24 2024 Automatic Build System 565.57.01-1mamba +- automatic version update by autodist + +* Tue Oct 22 2024 Silvan Calarco 560.35.03-3mamba +- load nvidia_drm with modeset=1 fbdev=1. install new libraries and binaries + * Sun Aug 25 2024 Silvan Calarco 560.35.03-2mamba - added nvidia-fallback service which loads nouveau as fallback if nvidia driver is not loaded before display-manager - remove simplefb causing plymouth to block at boot if nvidia driver is not loaded