nvidia-340xx & nvidia-340xx-utils: update to 340.96

5 files changed, 24 insertions, 42 deletions

diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD
index d9213a3..1645256 100644
--- a/abs/core/nvidia-340xx-utils/PKGBUILD
+++ b/abs/core/nvidia-340xx-utils/PKGBUILD
@@ -5,16 +5,18 @@
 
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx')
-pkgver=340.93
+pkgver=340.96
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
 options=('!strip')
-source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-        "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha1sums=('650564caa2937c8306cfdcfb6c97b1e206fdffb3'
-          '05ef4b8b01aa532d89cef309f268ae1c7beffdc0')
+source=(nvidia-drm-outputclass.conf)
+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")
+sha1sums=('4ca2fbb2389d0bcb7a2c6f614860522d9ddf58ab')
+sha1sums_i686=('082e5218059b565f652236a69e61d8426696098c')
+sha1sums_x86_64=('49a1038f8f709a0a8855c7071db5923749d071e2')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -180,5 +182,9 @@ package_nvidia-340xx-utils() {
     cp -r html "${pkgdir}/usr/share/doc/nvidia/"
     ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
 
+    # distro specific files must be installed in /usr/share/X11/xorg.conf.d
+    install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
+    install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/"
+
     create_links
 }
diff --git a/abs/core/nvidia-340xx-utils/nvidia-drm-outputclass.conf b/abs/core/nvidia-340xx-utils/nvidia-drm-outputclass.conf
new file mode 100644
index 0000000..40c1e08
--- /dev/null
+++ b/abs/core/nvidia-340xx-utils/nvidia-drm-outputclass.conf
@@ -0,0 +1,6 @@
+Section "OutputClass"
+	Identifier "nvidia"
+	MatchDriver "nvidia-drm"
+	Driver "nvidia"
+EndSection
+
diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD
index 06f2e16..31839a6 100644
--- a/abs/core/nvidia-340xx/PKGBUILD
+++ b/abs/core/nvidia-340xx/PKGBUILD
@@ -4,21 +4,19 @@
 
 pkgbase=nvidia-340xx
 pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.93
-_extramodules=extramodules-3.18-ARCH
+pkgver=340.96
+_extramodules=extramodules-4.4-ARCH
 pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19')
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5')
 conflicts=('nvidia')
 license=('custom')
 options=(!strip)
-source=(nv-drm.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=('79671a27131da619a33eb02ed0c2c031')
-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"
@@ -27,7 +25,6 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p0 -i ../nv-drm.patch
 }
 
 build() {
@@ -41,7 +38,7 @@ build() {
 
 package_nvidia-340xx() {
     pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-    depends=('linux>=3.18' 'linux<3.19' 'libgl' "nvidia-340xx-utils=${pkgver}")
+    depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-340xx-utils=${pkgver}")
     conflict+=('nvidia-340xx-dkms')
     install=nvidia-340xx.install
 
diff --git a/abs/core/nvidia-340xx/nv-drm.patch b/abs/core/nvidia-340xx/nv-drm.patch
deleted file mode 100644
index 4c6a393..0000000
--- a/abs/core/nvidia-340xx/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/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install
index 6d90420..0979433 100644
--- a/abs/core/nvidia-340xx/nvidia-340xx.install
+++ b/abs/core/nvidia-340xx/nvidia-340xx.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.18-ARCH'
+    EXTRAMODULES='extramodules-4.4-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }