Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21193 Modified Files: nvidia-kmod.spec Added Files: nvidia_3.14_kernel.patch Log Message: * Tue Apr 01 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.49-2 - Patch for 3.14 kernel nvidia_3.14_kernel.patch: nv-linux.h | 3 +++ uvm/nvidia_uvm_common.c | 4 ++++ 2 files changed, 7 insertions(+) --- NEW FILE nvidia_3.14_kernel.patch --- --- a/kernel/nv-linux.h +++ b/kernel/nv-linux.h @@ -269,6 +269,9 @@ extern int nv_pat_mode; #if !defined(NV_VMWARE) && defined(CONFIG_ACPI) #include <acpi/acpi.h> #include <acpi/acpi_drivers.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#include <acpi/acpi_bus.h> +#endif #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID) #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1 #endif --- a/kernel/uvm/nvidia_uvm_common.c +++ b/kernel/uvm/nvidia_uvm_common.c @@ -272,5 +272,9 @@ static void __exit uvm_exit(void) module_init(uvm_init); module_exit(uvm_exit); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +MODULE_LICENSE("GPL"); +#else MODULE_LICENSE("MIT"); +#endif MODULE_INFO(supported, "external"); Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- nvidia-kmod.spec 25 Mar 2014 19:18:58 -0000 1.167 +++ nvidia-kmod.spec 1 Apr 2014 05:46:40 -0000 1.168 @@ -3,13 +3,13 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +%global buildforkernels current Name: nvidia-kmod Epoch: 1 Version: 331.49 # Taken over by kmodtool -Release: 1%{?dist}.6 +Release: 2%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -25,6 +25,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz Patch0: nv-linux-arm.patch +Patch1: nvidia_3.14_kernel.patch Source11: nvidia-kmodtool-excludekernel-filterfile @@ -54,6 +55,7 @@ do pushd nvidiapkg-${arch} %patch0 -p1 +%patch1 -p1 popd done @@ -97,6 +99,9 @@ %changelog +* Tue Apr 01 2014 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:331.49-2 +- Patch for 3.14 kernel + * Tue Mar 25 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:331.49-1.6 - Rebuilt for kernel