+++ /dev/null
---- NVIDIA-Linux-x86_64-346.35-no-compat32/kernel/nv-linux.h~ 2015-01-11 05:30:46.000000000 +0100
-+++ NVIDIA-Linux-x86_64-346.35-no-compat32/kernel/nv-linux.h 2015-04-19 13:51:50.919754915 +0200
-@@ -336,6 +336,11 @@
- #define NV_SPIN_UNLOCK(lock) spin_unlock(lock)
- #define NV_SPIN_UNLOCK_WAIT(lock) spin_unlock_wait(lock)
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
-+#define read_cr4 __read_cr4
-+#define write_cr4 __write_cr4
-+#endif
-+
- #if defined(NVCPU_X86)
- #ifndef write_cr4
- #define write_cr4(x) __asm__ ("movl %0,%%cr4" :: "r" (x));
+++ /dev/null
---- kernel/nv-drm.c~ 2014-11-08 00:57:53.000000000 +0100
-+++ kernel/nv-drm.c 2014-11-13 21:03:37.589650873 +0100
-@@ -128,6 +128,10 @@ static struct drm_driver nv_drm_driver =
- .gem_prime_vmap = nv_gem_prime_vmap,
- .gem_prime_vunmap = nv_gem_prime_vunmap,
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
-+ .set_busid = drm_pci_set_busid,
-+#endif
-+
- .name = "nvidia-drm",
- .desc = "NVIDIA DRM driver",
- .date = "20130102",
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: 352.21
+Version: 355.11
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: c91760a04f658845722380f6c7fd4709
+# Source0-md5: 16d143ccafe99328a2ca8e5a396fd4bc
Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 4eea308a1b04553f720f82fd2fac79d3
+# Source1-md5: 30133d89690f4683c4e289ec6c0247dc
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}}
#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}
%endif
%patch0 -p1
%patch1 -p1
-%patch2 -p0
-%patch3 -p1
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
%build