X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=deae57db2c34e124ee9b52335a9cf9421b966bef;hp=f4227b8288b068a6677a195a73b774f3789f3da8;hb=1ac8b58dc1febfc89bfc8596ee51ffd7bb20e934;hpb=d4127c3b4c0a5f57d888a7708f4985f893a29ded

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index f4227b8..deae57d 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -25,30 +25,28 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	4
+%define		rel	3
 %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:	346.35
+Version:	358.16
 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/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5:	d2b8f7f90ef5037f03f94519f9809511
+# Source0-md5:	5dfe11ca13548ca4813b10f3223d6014
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	9ca9f07f91361362f304ca8317ddd453
+# Source1-md5:	efb1e649c0e0d62e92774bbf2c124488
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
-Patch2:		nvidia-kernel-3.18.patch
-Patch3:		linux-4.0.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.20.2}}
@@ -56,7 +54,7 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 19.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 20.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	ocl-icd(nvidia)
 Provides:	ocl-icd-driver
@@ -231,7 +229,7 @@ cd kernel\
 #mv nv-kernel.o{,.bin}\
 #build_kernel_modules -m nvidia\
 %{__make} SYSSRC=%{_kernelsrcdir} clean\
-%{__make} SYSSRC=%{_kernelsrcdir} module\
+%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 module\
 cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia -d misc\
 %{nil}
@@ -250,8 +248,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build