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=af4c16aae11ee4693bcd6e042d7b15a09fedf0e8;hp=49f9156d14713c047fe53a28080f97ffb071880c;hb=c18f94711f11d1974ea9f3616ad03b84f058c436;hpb=5bf93a3456090d2ef65cb96a9aac5acfa7a20cbc

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 49f9156..af4c16a 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -1,6 +1,5 @@
 # TODO
-# - should -libs Require main package?
-# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it?
+# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it
 # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
@@ -21,20 +20,20 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	2
+%define		rel	1
 %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:	465.27
+Version:	470.63.01
 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:	212e7765216ca3961409637360acce4c
+# Source0-md5:	24ffc518e708addc9728f7f356f56ef7
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
@@ -66,6 +65,8 @@ BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 # libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1
 %define		_noautoreq	libnvcuvid.so
 
+%define		_noautostrip	.*/lib/firmware/.*
+
 %description
 This driver set adds improved 2D functionality to the Xorg X server as
 well as high performance OpenGL acceleration, AGP support, support for
@@ -277,6 +278,9 @@ sterownik nVidii dla Xorg/XFree86.\
 %if %{with kernel}\
 %files -n kernel%{_alt_kernel}-video-nvidia\
 %defattr(644,root,root,755)\
+%dir /lib/firmware/nvidia\
+%dir /lib/firmware/nvidia/%{version}\
+/lib/firmware/nvidia/%{version}/gsp.bin\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
 \
@@ -367,7 +371,7 @@ for f in \
 	%{srcdir}/libGLESv1_CM_nvidia.so.%{version}	\
 	%{srcdir}/libGLESv2_nvidia.so.%{version}		\
 %ifarch %{x8664}
-	%{srcdir}/libnvidia-egl-wayland.so.1.1.5		\
+	%{srcdir}/libnvidia-egl-wayland.so.1.1.7		\
 	%{srcdir}/libnvidia-eglcore.so.%{version}		\
 %endif
 	%{srcdir}/libcuda.so.%{version}			\
@@ -376,6 +380,7 @@ for f in \
 	%{srcdir}/libnvidia-cbl.so.%{version}	\
 	%{srcdir}/libnvidia-cfg.so.%{version}		\
 	%{srcdir}/libnvidia-ngx.so.%{version}		\
+	%{srcdir}/libnvidia-nvvm.so.4.0.0		\
 	%{srcdir}/libnvidia-rtcore.so.%{version}	\
 	%{srcdir}/libnvoptix.so.%{version}	\
 %endif
@@ -452,6 +457,7 @@ install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d
 %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
 %endif
 %endif
 
@@ -542,6 +548,8 @@ EOF
 %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/libnvvm.so.4
 %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