[packages/xorg-driver-video-nvidia] up to 367.44

[atler]

commit ef40d8b8ca7dc3a5eaa2094335d349f93ad6ecf3
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Aug 23 21:46:44 2016 +0200

    up to 367.44
    
    - patches for kernel 4.7 no longer needed
    - enabled verbose output
    - pass CC explicitly

 linux-4.7-uvm.patch           | 15 ---------------
 linux-4.7.patch               | 45 -------------------------------------------
 xorg-driver-video-nvidia.spec | 16 +++++----------
 3 files changed, 5 insertions(+), 71 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 3a1e8e0..d4e5bd6 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	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:	367.35
+Version:	367.44
 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:	42db6f6485c3c337c7c756380ec64b7a
+# Source0-md5:	93ff8e1fe32939ca4fd6522b93825edc
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	24f1fc19fe10bcc6ff264fb5034c4ccc
+# Source1-md5:	7478b957513f3f9234b71b88b6d032b9
 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:		linux-4.7.patch
-Patch3:		linux-4.7-uvm.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}}
@@ -231,7 +229,7 @@ cd kernel\
 #mv nv-kernel.o{,.bin}\
 #build_kernel_modules -m nvidia\
 %{__make} SYSSRC=%{_kernelsrcdir} clean\
-%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 module\
+%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
 cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-drm,kernel/nvidia-modeset -d misc\
 %ifarch %{x8664}\
@@ -253,10 +251,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%ifarch %{x8664}
-%patch3 -p1
-%endif
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
diff --git a/linux-4.7-uvm.patch b/linux-4.7-uvm.patch
deleted file mode 100644
index 786db7f..0000000
--- a/linux-4.7-uvm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/kernel/nvidia-uvm/uvm_linux.h
-+++ b/kernel/nvidia-uvm/uvm_linux.h
-@@ -547,7 +547,11 @@
-     INIT_RADIX_TREE(tree, GFP_NOWAIT);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+static bool radix_tree_is_empty(struct radix_tree_root *tree)
-+#else
- static bool radix_tree_empty(struct radix_tree_root *tree)
-+#endif
- {
-     void *dummy;
-     return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
-
diff --git a/linux-4.7.patch b/linux-4.7.patch
deleted file mode 100644
index 97a0b48..0000000
--- a/linux-4.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/kernel/nvidia-drm/nvidia-drm-fb.c
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.c
-@@ -20,6 +20,7 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
- #include "conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -114,7 +115,11 @@
-      * We don't support any planar format, pick up first buffer only.
-      */
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    gem = drm_gem_object_lookup(file, cmd->handles[0]);
-+#else
-     gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
-+#endif
- 
-     if (gem == NULL)
-     {
---- a/kernel/nvidia-drm/nvidia-drm-gem.c
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.c
-@@ -24,6 +24,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
-+#include <linux/version.h>
- #include "nvidia-drm-priv.h"
- #include "nvidia-drm-ioctl.h"
- #include "nvidia-drm-gem.h"
-@@ -405,7 +406,11 @@
- 
-     mutex_lock(&dev->struct_mutex);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    gem = drm_gem_object_lookup(file, handle);
-+#else
-     gem = drm_gem_object_lookup(dev, file, handle);
-+#endif
- 
-     if (gem == NULL)
-     {
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/ef40d8b8ca7dc3a5eaa2094335d349f93ad6ecf3