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=bd7a47bf2e3c6a1842a356d90e3b79234b632589;hp=5ebf09022a2ed9dfad84501230211d6409a72e6e;hb=594c0c864ff30f97d1653fad2b5a63bf266bec18;hpb=cf8c2cd48a62dbe659e0395c38f8cf9fea10bbbe

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 5ebf090..bd7a47b 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -33,18 +33,19 @@ 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:	440.44
+Version:	450.57
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5:	8b72e9af14e43171405526a308a08796
+# Source0-md5:	f51c0f6d5b0d6075367366e01919aeb6
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-desktop.patch
+Patch1:		kernel-5.7.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
@@ -52,7 +53,7 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 24.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 24.1
 Requires:	xorg-xserver-server(videodrv-abi) >= 4.0
 Provides:	ocl-icd(nvidia)
 Provides:	ocl-icd-driver
@@ -229,13 +230,6 @@ sterownik nVidii dla Xorg/XFree86.\
 
 %define build_kernel_pkg()\
 cd kernel\
-#cat >> Makefile <<'EOF'\
-#\
-#$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin\
-#	cp $< $@\
-#EOF\
-#mv nv-kernel.o{,.bin}\
-#build_kernel_modules -m nvidia\
 %{__make} SYSSRC=%{_kernelsrcdir} clean\
 %{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
 cd ..\
@@ -252,6 +246,7 @@ rm -rf NVIDIA-Linux-x86_64-%{version}
 /bin/sh %{SOURCE0} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}
 %patch0 -p1
+%patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -321,12 +316,13 @@ for f in \
 %ifarch %{x8664}
 	%{srcdir}/libnvidia-cbl.so.%{version}	\
 	%{srcdir}/libnvidia-cfg.so.%{version}		\
+	%{srcdir}/libnvidia-ngx.so.%{version}		\
 	%{srcdir}/libnvidia-rtcore.so.%{version}	\
 	%{srcdir}/libnvoptix.so.%{version}	\
 %endif
+	%{srcdir}/libnvidia-allocator.so.%{version}	\
 	%{srcdir}/libnvidia-compiler.so.%{version}	\
 	%{srcdir}/libnvidia-encode.so.%{version}		\
-	%{srcdir}/libnvidia-fatbinaryloader.so.%{version}	\
 	%{srcdir}/libnvidia-fbc.so.%{version}	\
 	%{srcdir}/libnvidia-glcore.so.%{version}		\
 	%{srcdir}/libnvidia-glsi.so.%{version}		\
@@ -334,6 +330,7 @@ for f in \
 	%{srcdir}/libnvidia-ifr.so.%{version}		\
 	%{srcdir}/libnvidia-ml.so.%{version}		\
 	%{srcdir}/libnvidia-opencl.so.%{version}		\
+	%{srcdir}/libnvidia-opticalflow.so.%{version}		\
 	%{srcdir}/libnvidia-ptxjitcompiler.so.%{version}	\
 	%{srcdir}/libnvidia-tls.so.%{version}		\
 ; do
@@ -483,14 +480,17 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cbl.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-rtcore.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) %{_libdir}/nvidia/libnvidia-fatbinaryloader.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-fbc.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-fbc.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
@@ -498,12 +498,14 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ifr.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ifr.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1
 %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-opencl.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-opticalflow.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opticalflow.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1