From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 30 Jan 2018 00:31:41 +0000 (+0100)
Subject: - up to 340.106
X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-340xx-340.106-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-340xx.git;a=commitdiff_plain;h=5f838bc

- up to 340.106
---

diff --git a/kernel-4.14.patch b/kernel-4.14.patch
deleted file mode 100644
index 02f2730..0000000
--- a/kernel-4.14.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 5c9e8a994fe8529388ab159e0aa371c75bc3d17b Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Thu, 21 Sep 2017 04:22:12 +0100
-Subject: [PATCH] drm/pci: drm_pci_init/exit now deprecated
-
-As per: https://github.com/torvalds/linux/commit/10631d724deff712343d96dd3017cd323349f761
-
-Use legacy variant, as pci_[un]register_driver currently fails.
----
- kernel/nv-drm.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
-index 2aa7cc8..23df996 100644
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -173,7 +173,11 @@ int __init nv_drm_init(
- {
-     int ret = 0;
- #if defined(NV_DRM_AVAILABLE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-     ret = drm_pci_init(&nv_drm_driver, pci_driver);
-+#else
-+    ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
-+#endif
- #endif
-     return ret;
- }
-@@ -183,7 +183,11 @@ void nv_drm_exit(
- )
- {
- #if defined(NV_DRM_AVAILABLE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-     drm_pci_exit(&nv_drm_driver, pci_driver);
-+#else
-+    drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
-+#endif
- #endif
- }
- 
--- 
-2.7.4
-
diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index ea08d38..3d00910 100644
--- a/xorg-driver-video-nvidia-legacy-340xx.spec
+++ b/xorg-driver-video-nvidia-legacy-340xx.spec
@@ -25,22 +25,22 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	2
+%define		rel	1
 %define		pname	xorg-driver-video-nvidia-legacy-340xx
 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:	340.104
+Version:	340.106
 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:	42e9c98e156f6ac2658ee526d796a428
+# Source0-md5:	a2895c566341506677d8293b4aec0dc0
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	efbd37cde63d50f657d55a6f2b321142
+# Source1-md5:	37c84428b64696be2b104edbc9855f57
 Source2:	xorg-driver-video-nvidia-xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
@@ -48,7 +48,6 @@ Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
 Patch2:		linux-4.0.patch
-Patch3:		kernel-4.14.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}}
@@ -251,7 +250,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build