X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=9db1b0fbd5e039ee85adc50d69a8f196ff1b91c8;hb=2dfd3de269936696724ade42233a9f4baa5686fb;hp=ee6446a9feadafdc9cce926bbad6739b4529bb62;hpb=f88bf51d2d9ba145d650c52271a9501cb68196b7;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index ee6446a..9db1b0f 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -20,20 +20,20 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	1
+%define		rel	2
 %define		pname	xorg-driver-video-nvidia
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:	510.54
+Version:	535.54.03
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5:	044021a5f5b624eeb1c9d6c51c02ed7b
+# Source0-md5:	ae579c6b94300b9d0f9289c9eaa704bb
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
@@ -51,7 +51,7 @@ Requires:	xorg-xserver-server(videodrv-abi) <= 25.2
 Requires:	xorg-xserver-server(videodrv-abi) >= 4.0
 Provides:	ocl-icd(nvidia)
 Provides:	ocl-icd-driver
-Provides:	vulkan(icd) = 1.2.155
+Provides:	vulkan(icd) = 1.3.194
 Provides:	xorg-driver-video
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	XFree86-driver-nvidia < 1.0.5336-4
@@ -280,7 +280,8 @@ sterownik nVidii dla Xorg/XFree86.\
 %defattr(644,root,root,755)\
 %dir /lib/firmware/nvidia\
 %dir /lib/firmware/nvidia/%{version}\
-/lib/firmware/nvidia/%{version}/gsp.bin\
+/lib/firmware/nvidia/%{version}/gsp_ga10x.bin\
+/lib/firmware/nvidia/%{version}/gsp_tu10x.bin\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
 \
@@ -370,33 +371,33 @@ for f in \
 	%{srcdir}/libEGL_nvidia.so.%{version}		\
 	%{srcdir}/libGLESv1_CM_nvidia.so.%{version}	\
 	%{srcdir}/libGLESv2_nvidia.so.%{version}		\
-%ifarch %{x8664}
-	%{srcdir}/libnvidia-egl-gbm.so.1.1.0		\
-	%{srcdir}/libnvidia-egl-wayland.so.1.1.9		\
-	%{srcdir}/libnvidia-eglcore.so.%{version}		\
-%endif
 	%{srcdir}/libcuda.so.%{version}			\
 	%{srcdir}/libnvcuvid.so.%{version}		\
-%ifarch %{x8664}
-	%{srcdir}/libnvidia-cfg.so.%{version}		\
-	%{srcdir}/libnvidia-ngx.so.%{version}		\
-	%{srcdir}/libnvidia-nvvm.so.4.0.0		\
-	%{srcdir}/libnvidia-rtcore.so.%{version}	\
-	%{srcdir}/libnvidia-vulkan-producer.so.%{version}	\
-	%{srcdir}/libnvoptix.so.%{version}	\
-%endif
 	%{srcdir}/libnvidia-allocator.so.%{version}	\
-	%{srcdir}/libnvidia-compiler.so.%{version}	\
 	%{srcdir}/libnvidia-encode.so.%{version}		\
 	%{srcdir}/libnvidia-fbc.so.%{version}	\
 	%{srcdir}/libnvidia-glcore.so.%{version}		\
 	%{srcdir}/libnvidia-glsi.so.%{version}		\
 	%{srcdir}/libnvidia-glvkspirv.so.%{version}		\
 	%{srcdir}/libnvidia-ml.so.%{version}		\
+	%{srcdir}/libnvidia-nvvm.so.%{version}		\
 	%{srcdir}/libnvidia-opencl.so.%{version}		\
 	%{srcdir}/libnvidia-opticalflow.so.%{version}		\
 	%{srcdir}/libnvidia-ptxjitcompiler.so.%{version}	\
 	%{srcdir}/libnvidia-tls.so.%{version}		\
+%ifarch %{x8664}
+	%{srcdir}/libcudadebugger.so.%{version}		\
+	%{srcdir}/libnvidia-api.so.1			\
+	%{srcdir}/libnvidia-egl-gbm.so.1.1.0		\
+	%{srcdir}/libnvidia-egl-wayland.so.1.1.11		\
+	%{srcdir}/libnvidia-eglcore.so.%{version}		\
+	%{srcdir}/libnvidia-cfg.so.%{version}		\
+	%{srcdir}/libnvidia-ngx.so.%{version}		\
+	%{srcdir}/libnvidia-pkcs11-openssl3.so.%{version}		\
+	%{srcdir}/libnvidia-rtcore.so.%{version}	\
+	%{srcdir}/libnvidia-vulkan-producer.so.%{version}	\
+	%{srcdir}/libnvoptix.so.%{version}	\
+%endif
 ; do
 	install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
 done
@@ -458,7 +459,8 @@ ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT
 cp -a installed/* $RPM_BUILD_ROOT
-install -D firmware/gsp.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp.bin
+install -D firmware/gsp_ga10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_ga10x.bin
+install -D firmware/gsp_tu10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_tu10x.bin
 %endif
 %endif
 
@@ -533,34 +535,14 @@ EOF
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_indirect.so.0
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_nvidia.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLX_nvidia.so.*.*
-%ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-gbm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-gbm.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so
 %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvcuvid.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so
-%ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ngx.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ngx.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-nvvm.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-nvvm.so.4
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-rtcore.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-vulkan-producer.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvoptix.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvoptix.so.1
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-allocator.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-allocator.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-encode.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-encode.so.1
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-fbc.so.1
@@ -570,6 +552,8 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-nvvm.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-nvvm.so.4
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opticalflow.so.*.*
@@ -580,6 +564,23 @@ EOF
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
 %ifarch %{x8664}
+%attr(755,root,root) %{_libdir}/nvidia/libcudadebugger.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libcudadebugger.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-api.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-gbm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-gbm.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ngx.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ngx.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-pkcs11-openssl3.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-rtcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-vulkan-producer.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvoptix.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvoptix.so.1
 # which package should own those?
 %dir %{_datadir}/egl
 %dir %{_datadir}/egl/egl_external_platform.d