summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD14
-rw-r--r--nv-drm.patch27
-rw-r--r--nvidia-4.3-build.patch20
4 files changed, 11 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db958562bce6..a467ed8d4ce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvidia-340xx-lqx
pkgdesc = NVIDIA drivers for linux-lqx, 340xx legacy branch
- pkgver = 340.93
- pkgrel = 6
+ pkgver = 340.96
+ pkgrel = 1
url = http://www.nvidia.com/
install = nvidia-340xx-lqx.install
arch = i686
@@ -12,18 +12,14 @@ pkgbase = nvidia-340xx-lqx
depends = linux-lqx>=4.3
depends = linux-lqx<4.4
depends = nvidia-340xx-libgl
- depends = nvidia-340xx-utils=340.93
+ depends = nvidia-340xx-utils=340.96
conflicts = nvidia-lqx
conflicts = nvidia-304xx-lqx
options = !strip
- source = nv-drm.patch
- source = nvidia-4.3-build.patch
- md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
- md5sums = e400a8c538afd490726941d8c69b2c2d
- source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.93/NVIDIA-Linux-x86-340.93.run
- md5sums_i686 = 4a7edf6838a80c77a57fb6f6ec7f0437
- source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.93/NVIDIA-Linux-x86_64-340.93-no-compat32.run
- md5sums_x86_64 = cb80e3f1cb6f2fb6e6eab35fad0884e4
+ source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run
+ md5sums_i686 = cb64b165b638671bcdc75bcf297b8d90
+ source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96-no-compat32.run
+ md5sums_x86_64 = 7bdbcee13bade63227933d9217571882
pkgname = nvidia-340xx-lqx
diff --git a/PKGBUILD b/PKGBUILD
index 1ac93fe91a4e..0d7906021a9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
# Contributor : Thomas Baechler <thomas@archlinux.org>
pkgname=nvidia-340xx-lqx
-pkgver=340.93
+pkgver=340.96
_extramodules=extramodules-4.3-lqx
-pkgrel=6
+pkgrel=1
pkgdesc="NVIDIA drivers for linux-lqx, 340xx legacy branch"
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
@@ -15,14 +15,10 @@ conflicts=('nvidia-lqx' 'nvidia-304xx-lqx')
license=('custom')
install=${pkgname}.install
options=(!strip)
-source=("nv-drm.patch"
- 'nvidia-4.3-build.patch')
source_i686=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
source_x86_64=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301'
- 'e400a8c538afd490726941d8c69b2c2d')
-md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
-md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
+md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
+md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -30,8 +26,6 @@ md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
prepare() {
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
- patch -Np0 -i "$srcdir/nv-drm.patch"
- patch -Np1 -i "$srcdir/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;
- }