From: Jan Palus <atler@pld-linux.org>
Date: Mon, 29 Jan 2018 17:46:56 +0000 (+0100)
Subject: up to 390.25
X-Git-Tag: auto/th/xorg-driver-video-nvidia-390.25-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=b440dd78acc03d131d9685d0e7a4050dac9cb917;hp=3427c6f3b50edaab4f13aa7523ba881f70234f6f

up to 390.25
---

diff --git a/structrand.patch b/structrand.patch
deleted file mode 100644
index 959c484..0000000
--- a/structrand.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kernel/nvidia-modeset/nvidia-modeset-linux.c.dist	2017-07-20 04:25:38.000000000 -0400
-+++ kernel/nvidia-modeset/nvidia-modeset-linux.c	2017-08-02 14:44:22.979688575 -0400
-@@ -337,8 +337,8 @@
- 
- static nvidia_modeset_rm_ops_t __rm_ops = { 0 };
- static nvidia_modeset_callbacks_t nvkms_rm_callbacks = {
--    nvkms_suspend,
--    nvkms_resume
-+    .suspend = nvkms_suspend,
-+    .resume = nvkms_resume
- };
- 
- static int nvkms_alloc_rm(void)
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 80e20a7..3d3003a 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:	387.34
+Version:	390.25
 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:	4e356a75541633ac3f9ac0f53bb65823
+# Source0-md5:	024170d6dc8bc83e405c7a73327ec8fb
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	a009bbc502c30e4b483d71be9fa51790
+# Source1-md5:	e41e28d1f380c64ec2eacae344fb5017
 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:		structrand.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 -p0
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -469,6 +467,7 @@ EOF
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_nvidia.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLX_nvidia.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
 %else
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*