X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=d9735ccae615de798ff3a2fb7c2e70dc7ae1703e;hp=d2d1d7a3790a95cb5b5f91ace6e6de08db93bc72;hb=HEAD;hpb=574556b1c10c4ce497abf9f701a3c7ea72f12aee

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d2d1d7a..cfb3c08 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -27,13 +27,13 @@ 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:	525.89.02
+Version:	550.54.14
 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:	2cd1ed226595db34f9390d0a85f370ff
+# Source0-md5:	69e77647875bef192f8458912027e44b
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
@@ -175,6 +175,11 @@ Requires:	libglvnd-libGLES >= 1.3.4-2
 Requires:	libvdpau >= 0.3
 Provides:	OpenGL = 4.6
 Provides:	OpenGL-GLX = 1.4
+%if %{with system_libglvnd}
+Provides:	glvnd(EGL)%{?_isa}
+Provides:	glvnd(GL)%{?_isa}
+Provides:	glvnd(GLES)%{?_isa}
+%endif
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
@@ -280,7 +285,7 @@ sterownik nVidii dla Xorg/XFree86.\
 %defattr(644,root,root,755)\
 %dir /lib/firmware/nvidia\
 %dir /lib/firmware/nvidia/%{version}\
-/lib/firmware/nvidia/%{version}/gsp_ad10x.bin\
+/lib/firmware/nvidia/%{version}/gsp_ga10x.bin\
 /lib/firmware/nvidia/%{version}/gsp_tu10x.bin\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
@@ -371,33 +376,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.10		\
-	%{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-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-gpucomp.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.1		\
+	%{srcdir}/libnvidia-egl-wayland.so.1.1.13		\
+	%{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}/libnvoptix.so.%{version}	\
+%endif
 ; do
 	install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
 done
@@ -459,7 +464,7 @@ 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_ad10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_ad10x.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
@@ -535,32 +540,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-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
@@ -568,6 +555,7 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-gpucomp.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.*.*
@@ -582,6 +570,22 @@ 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/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