From: Jan Palus <atler@pld-linux.org>
Date: Mon, 30 Oct 2017 19:10:00 +0000 (+0100)
Subject: up to 378.22
X-Git-Tag: auto/th/xorg-driver-video-nvidia-387.22-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=91a928f

up to 378.22

- patch for kernel <= 4.1 does not seem necessary anymore
---

diff --git a/X11-driver-nvidia-desktop.patch b/X11-driver-nvidia-desktop.patch
index dcf9ea5..688061d 100644
--- a/X11-driver-nvidia-desktop.patch
+++ b/X11-driver-nvidia-desktop.patch
@@ -1,6 +1,6 @@
---- NVIDIA-Linux-x86_64-270.30-no-compat32/nvidia-settings.desktop	2011-02-26 00:54:20.000000000 +0200
-+++ NVIDIA-Linux-x86_64-270.30-no-compat32/nvidia-settings.desktop	2011-03-13 22:15:28.674244734 +0200
-@@ -1,9 +1,10 @@
+--- NVIDIA-Linux-x86_64-387.22-no-compat32/nvidia-settings.desktop.orig	2017-10-30 19:01:41.321706656 +0100
++++ NVIDIA-Linux-x86_64-387.22-no-compat32/nvidia-settings.desktop	2017-10-30 19:04:57.757191009 +0100
+@@ -1,9 +1,11 @@
  [Desktop Entry]
  Type=Application
  Encoding=UTF-8
@@ -8,12 +8,11 @@
 -Comment=Configure NVIDIA X Server Settings
 -Exec=__UTILS_PATH__/nvidia-settings
 -Icon=__PIXMAP_PATH__/nvidia-settings.png
--Categories=Application;Settings;
--
 +Name=nVidia X Server Settings
 +Name[pl]=Ustawienia X serwera nVidii
 +Comment=Configure nVidia X Server Settings
 +Comment[pl]=Konfiguracja ustawień X serwera NVndii
 +Exec=nvidia-settings
 +Icon=nvidia-settings
-+Categories=Settings;HardwareSettings;
+ Categories=Settings;HardwareSettings;
+ 
diff --git a/linux-4.1-and-older.patch b/linux-4.1-and-older.patch
deleted file mode 100644
index 3f0b751..0000000
--- a/linux-4.1-and-older.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- NVIDIA-Linux-x86_64-375.20-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c~	2016-11-16 00:44:48.000000000 +0100
-+++ NVIDIA-Linux-x86_64-375.20-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c	2016-12-05 00:09:42.798550337 +0100
-@@ -21,6 +21,7 @@
-  */
- 
- #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
-+#include <linux/version.h>
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
-@@ -299,7 +299,12 @@
-     return count;
- }
- 
--static int nvidia_drm_atomic_helper_connector_dpms(
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0))
-+static void
-+#else
-+static int
-+#endif
-+nvidia_drm_atomic_helper_connector_dpms(
-     struct drm_connector *connector,
-     int mode)
- {
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 68209f0..435797a 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -40,22 +40,21 @@ 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:	384.90
+Version:	387.22
 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:	9423e4bdef7745c7b57a75c24f853b53
+# Source0-md5:	abdbb3c813e52148f7435308121e6a37
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	d33916ac2d962a7e6acc803cf6fd677c
+# Source1-md5:	b21f9bafb20409b337505c9b1d362c34
 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.1-and-older.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}}
@@ -269,7 +268,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build