diff --git a/nvidia_304-304.116-kernel-3.14.patch b/nvidia_304-304.116-kernel-3.14.patch new file mode 100644 index 0000000..0b53e26 --- /dev/null +++ b/nvidia_304-304.116-kernel-3.14.patch @@ -0,0 +1,12 @@ +--- NVIDIA-Linux-x86_64-304.116/kernel/nv-linux.h.orig 2014-09-12 23:20:16.466512069 +0200 ++++ NVIDIA-Linux-x86_64-304.116/kernel/nv-linux.h 2014-09-12 23:20:39.607521667 +0200 +@@ -289,8 +289,7 @@ + #endif + + #if !defined(NV_VMWARE) && defined(CONFIG_ACPI) +-#include +-#include ++#include + #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID) + #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1 + #endif diff --git a/nvidia_304.spec b/nvidia_304.spec index 062c61f..34b7c47 100644 --- a/nvidia_304.spec +++ b/nvidia_304.spec @@ -1,9 +1,9 @@ %define nvidia_current_ver %version %define nvidia_current_libver %version Name: nvidia_304 -Version: 304.116 +Version: 304.123 Epoch: 1 -Release: 3mamba +Release: 1mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -14,6 +14,7 @@ Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{nvidia_current_ Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{nvidia_current_ver}/NVIDIA-Linux-x86_64-%{nvidia_current_ver}.run Patch0: nvidia_304-304.88-kernel-3.10.patch Patch1: nvidia_304-304.116-x86-conftest.patch +Patch2: nvidia_304-304.116-kernel-3.14.patch License: no OSI Approved ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -120,6 +121,7 @@ sed -i "s|__UTILS_PATH__|%{_bindir}|;s|__PIXMAP_PATH__|%{_datadir}/pixmaps|" \ cd current %patch1 -p1 +#%patch2 -p1 cd .. %build @@ -385,6 +387,12 @@ exit 0 %doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html %changelog +* Fri Sep 12 2014 Silvan Calarco 304.123-1mamba +- update to 304.123 + +* Fri Sep 12 2014 Silvan Calarco 304.116-4mamba +- patched for kernel 3.14 + * Sat Jun 14 2014 Automatic Build System 304.116-3mamba - Xorg 1.15 rebuild