update to 304.123 [release 304.123-1mamba;Fri Sep 12 2014]

This commit is contained in:
Silvan Calarco 2024-01-06 07:46:38 +01:00
parent 11a0ebf975
commit 3b009a3ab9
2 changed files with 22 additions and 2 deletions

View File

@ -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 <acpi/acpi.h>
-#include <acpi/acpi_drivers.h>
+#include <linux/acpi.h>
#if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
#define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
#endif

View File

@ -1,9 +1,9 @@
%define nvidia_current_ver %version %define nvidia_current_ver %version
%define nvidia_current_libver %version %define nvidia_current_libver %version
Name: nvidia_304 Name: nvidia_304
Version: 304.116 Version: 304.123
Epoch: 1 Epoch: 1
Release: 3mamba Release: 1mamba
Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel
Group: System/Kernel and Hardware Group: System/Kernel and Hardware
Vendor: openmamba 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 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 Patch0: nvidia_304-304.88-kernel-3.10.patch
Patch1: nvidia_304-304.116-x86-conftest.patch Patch1: nvidia_304-304.116-x86-conftest.patch
Patch2: nvidia_304-304.116-kernel-3.14.patch
License: no OSI Approved License: no OSI Approved
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
@ -120,6 +121,7 @@ sed -i "s|__UTILS_PATH__|%{_bindir}|;s|__PIXMAP_PATH__|%{_datadir}/pixmaps|" \
cd current cd current
%patch1 -p1 %patch1 -p1
#%patch2 -p1
cd .. cd ..
%build %build
@ -385,6 +387,12 @@ exit 0
%doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html %doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html
%changelog %changelog
* Fri Sep 12 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 304.123-1mamba
- update to 304.123
* Fri Sep 12 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 304.116-4mamba
- patched for kernel 3.14
* Sat Jun 14 2014 Automatic Build System <autodist@mambasoft.it> 304.116-3mamba * Sat Jun 14 2014 Automatic Build System <autodist@mambasoft.it> 304.116-3mamba
- Xorg 1.15 rebuild - Xorg 1.15 rebuild