rpms/nvidia-304xx-kmod/F-20 nvidia_3.13_kernel.patch, NONE, 1.1 nvidia-304xx-kmod.spec, 1.14, 1.15 sources, 1.4, 1.5
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6999
Modified Files:
nvidia-304xx-kmod.spec sources
Added Files:
nvidia_3.13_kernel.patch
Log Message:
* Fri Jan 24 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.119-1
- Update to 304.119
- patch for 3.13.0 kernel
nvidia_3.13_kernel.patch:
nv-acpi.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE nvidia_3.13_kernel.patch ---
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -299,7 +299,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
nv_acpi_event);
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20/nvidia-304xx-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nvidia-304xx-kmod.spec 17 Jan 2014 20:23:31 -0000 1.14
+++ nvidia-304xx-kmod.spec 25 Jan 2014 13:30:15 -0000 1.15
@@ -3,12 +3,12 @@
# "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-304xx-kmod
-Version: 304.117
+Version: 304.119
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
-
+Patch0: nvidia_3.13_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +46,7 @@
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-echo 'nothing to do'
+%patch0 -p1
popd
done
@@ -80,6 +80,10 @@
%changelog
+* Fri Jan 24 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 304.119-1
+- Update to 304.119
+- patch for 3.13.0 kernel
+
* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-1.4
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Dec 2013 17:44:55 -0000 1.4
+++ sources 25 Jan 2014 13:30:15 -0000 1.5
@@ -1 +1 @@
-0d1be077039e397ac755f17c734506c4 nvidia-kmod-data-304.117.tar.xz
+21605ee053d6524f5df7b80a6aa53c80 nvidia-kmod-data-304.119.tar.xz