diff options
author | graysky | 2016-02-01 15:23:00 -0500 |
---|---|---|
committer | graysky | 2016-02-01 15:23:00 -0500 |
commit | 7e8f0c527144efefa443cb227e450afb6be67067 (patch) | |
tree | da958959b9ecce7e2f8652eb79440207f002b3e3 | |
parent | e7598b82245d054039861851de4b3bb8c605c073 (diff) | |
download | aur-7e8f0c527144efefa443cb227e450afb6be67067.tar.gz |
Update to 304.131-2
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | nv-drm.patch | 27 | ||||
-rw-r--r-- | nvidia-4.3-build.patch | 20 |
4 files changed, 17 insertions, 70 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Mon Feb 1 20:23:00 UTC 2016 pkgbase = nvidia-304xx-ck pkgdesc = NVIDIA drivers for linux-ck, 304xx legacy branch. - pkgver = 304.128 - pkgrel = 5 + pkgver = 304.131 + pkgrel = 2 url = http://www.nvidia.com/ install = nvidia-304xx-ck.install arch = i686 @@ -9,10 +11,11 @@ pkgbase = nvidia-304xx-ck license = custom makedepends = linux-ck-headers>=4.3 makedepends = linux-ck-headers<4.4 + makedepends = nvidia-304xx-libgl depends = linux-ck>=4.3 depends = linux-ck<4.4 - depends = nvidia-304xx-libgl - depends = nvidia-304xx-utils=304.128 + depends = libgl + depends = nvidia-304xx-utils=304.131 conflicts = nvidia-340xx-ck conflicts = nvidia-ck conflicts = nvidia-275xx-ck @@ -62,14 +65,10 @@ pkgbase = nvidia-304xx-ck conflicts = nvidia-340xx-ck-silvermont conflicts = nvidia-ck-silvermont options = !strip - source = nv-drm.patch - source = nvidia-4.3-build.patch - md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301 - md5sums = e400a8c538afd490726941d8c69b2c2d - source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.128/NVIDIA-Linux-x86-304.128.run - md5sums_i686 = be2b40a4dc3339b050a4f76ddd27e96c - source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/304.128/NVIDIA-Linux-x86_64-304.128-no-compat32.run - md5sums_x86_64 = 6478e40ed87d9177cbfc3d0b6e39a051 + source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run + sha256sums_i686 = d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 + source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131-no-compat32.run + sha256sums_x86_64 = 2f6e82c79ed4d1ac3d42b2c0f71d4fbdd9293db801de396e7e2cc3fdcafaf83e pkgname = nvidia-304xx-ck @@ -3,36 +3,31 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-304xx-ck -pkgver=304.128 +pkgver=304.131 _extramodules=extramodules-4.3-ck -pkgrel=5 +pkgrel=2 _pkgdesc="NVIDIA drivers for linux-ck, 304xx legacy branch." pkgdesc="$_pkgdesc" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux-ck>=4.3' 'linux-ck<4.4' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-ck-headers>=4.3' 'linux-ck-headers<4.4') +depends=('linux-ck>=4.3' 'linux-ck<4.4' 'libgl' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-ck-headers>=4.3' 'linux-ck-headers<4.4' 'nvidia-304xx-libgl') conflicts=('nvidia-340xx-ck' 'nvidia-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge' 'nvidia-340xx-ck-silvermont' 'nvidia-ck-silvermont') #groups=('ck-generic') #replaces=() license=('custom') install=nvidia-304xx-ck.install options=(!strip) -source=('nv-drm.patch' 'nvidia-4.3-build.patch') source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301' - 'e400a8c538afd490726941d8c69b2c2d') -md5sums_i686=('be2b40a4dc3339b050a4f76ddd27e96c') -md5sums_x86_64=('6478e40ed87d9177cbfc3d0b6e39a051') +sha256sums_i686=('d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8') +sha256sums_x86_64=('2f6e82c79ed4d1ac3d42b2c0f71d4fbdd9293db801de396e7e2cc3fdcafaf83e') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" - patch -Np0 -i "$srcdir/nv-drm.patch" - patch -Np1 -i ../nvidia-4.3-build.patch } build() { diff --git a/nv-drm.patch b/nv-drm.patch deleted file mode 100644 index 820463d378c2..000000000000 --- a/nv-drm.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
-+++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
-@@ -18,6 +18,11 @@
-
- #include <drm/drmP.h>
-
-+/* 3.18-rc0+ */
-+#ifndef drm_gem_object
-+#include <drm/drm_gem.h>
-+#endif
-+
- extern nv_linux_state_t *nv_linux_devices;
-
- struct nv_gem_object {
-diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
-index ecc982a..60d7aae 100644
---- kernel/nv-drm.c~
-+++ kernel/nv-drm.c
-@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
- .gem_prime_vmap = nv_gem_prime_vmap,
- .gem_prime_vunmap = nv_gem_prime_vunmap,
-
-+ .set_busid = drm_pci_set_busid,
-+
- .name = "nvidia-drm",
- .desc = "NVIDIA DRM driver",
- .date = "20130102",
diff --git a/nvidia-4.3-build.patch b/nvidia-4.3-build.patch deleted file mode 100644 index 0bc539497ebd..000000000000 --- a/nvidia-4.3-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/kernel/nv-procfs.c -+++ b/kernel/nv-procfs.c -@@ -360,7 +360,8 @@ nv_procfs_read_registry( - registry_keys = ((nvl != NULL) ? - nvl->registry_keys : nv_registry_keys); - -- return seq_printf(s, "Binary: \"%s\"\n", registry_keys); -+ seq_printf(s, "Binary: \"%s\"\n", registry_keys); -+ return 0; - } - - static ssize_t -@@ -560,7 +561,8 @@ nv_procfs_read_text_file( - void *v - ) - { -- return seq_puts(s, s->private); -+ seq_puts(s, s->private); -+ return 0; - } |