[packages/xorg-driver-video-nvidia-legacy3] - fix building with linux 3.14 - rel 4

[baggins]

commit 35b33cc88123be58fb783c28ae631ff1c8d00587
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 27 09:38:33 2014 +0200

    - fix building with linux 3.14
    - rel 4

 linux-3.14.patch                      | 15 +++++++++++++++
 xorg-driver-video-nvidia-legacy3.spec |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nvidia-legacy3.spec b/xorg-driver-video-nvidia-legacy3.spec
index 44401ba..eed66f7 100644
--- a/xorg-driver-video-nvidia-legacy3.spec
+++ b/xorg-driver-video-nvidia-legacy3.spec
@@ -45,7 +45,7 @@ exit 1
 %define		kpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define		bkpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define		rel		3
+%define		rel		4
 %define		pname		xorg-driver-video-nvidia-legacy3
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips (173.14.xx series)
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -65,6 +65,7 @@ Source4:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-legacy-desktop.patch
 Patch2:		nvidia-blacklist-vga-pmu-registers-195.patch
+Patch3:		linux-3.14.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:%{expand:%kbrs}}
@@ -277,6 +278,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{?with_kernel:%{expand:%bkpkg}}
diff --git a/linux-3.14.patch b/linux-3.14.patch
new file mode 100644
index 0000000..fbfc62f
--- /dev/null
+++ b/linux-3.14.patch
@@ -0,0 +1,15 @@
+--- a/usr/src/nv/nv-linux.h
++++ b/usr/src/nv/nv-linux.h
+@@ -273,8 +273,12 @@
+ #endif
+ 
+ #if defined(CONFIG_ACPI) 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
+ #include <acpi/acpi.h>
+ #include <acpi/acpi_drivers.h>
++#else
++#include <linux/acpi.h>
++#endif
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
================================================================

---- gitweb:

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