nvidia: update to 346.35.

This commit is contained in:
Juan RP 2015-01-20 14:48:58 +01:00
parent 0ce3c7c41a
commit b5a9dd969a
2 changed files with 4 additions and 52 deletions

View File

@ -1,44 +0,0 @@
--- kernel/nv-drm.c~ 2014-11-08 00:57:53.000000000 +0100
+++ kernel/nv-drm.c 2014-11-13 21:03:37.589650873 +0100
@@ -128,6 +128,10 @@ static struct drm_driver nv_drm_driver =
.gem_prime_vmap = nv_gem_prime_vmap,
.gem_prime_vunmap = nv_gem_prime_vunmap,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+ .set_busid = drm_pci_set_busid,
+#endif
+
.name = "nvidia-drm",
.desc = "NVIDIA DRM driver",
.date = "20130102",
--- kernel/nv-frontend.c~
+++ kernel/nv-frontend.c
@@ -327,7 +327,7 @@ long nvidia_frontend_unlocked_ioctl(
unsigned long i_arg
)
{
- return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
}
long nvidia_frontend_compat_ioctl(
@@ -336,7 +336,7 @@ long nvidia_frontend_compat_ioctl(
unsigned long i_arg
)
{
- return nvidia_frontend_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+ return nvidia_frontend_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
}
int nvidia_frontend_mmap(
--- kernel/nv.c~
+++ kernel/nv.c
@@ -1796,7 +1796,7 @@ nvidia_unlocked_ioctl(
unsigned long i_arg
)
{
- return nvidia_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+ return nvidia_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
}
/*

View File

@ -3,8 +3,8 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
version=343.36
revision=3
version=346.35
revision=1
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
@ -22,11 +22,11 @@ replaces="libGL>=0"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
checksum=8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e
checksum=bba63c30c730ad7b8500a77c81cae58562b9f9b57cd576b61f37a2d8bc45df25
else
_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}-no-compat32.run"
checksum=27f18ac4fcf4faceec14594adf81c88a8b2967403fe3e8dfdd2e7f5579825b36
checksum=7dae481224fddc711c2478e92ae0efd032acb0a002c85a44fa99ad9e54322afd
fi
do_extract() {
@ -35,10 +35,6 @@ do_extract() {
./${_pkg}.run --extract-only
rm -f ${_pkg}.run
}
do_configure() {
cd ${_pkg}
patch -sNp0 -i ${FILESDIR}/linux-3.18-drm.patch
}
do_install() {
cd ${_pkg}