update

4 files changed, 97 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9af5527505e0..1802f66fbdb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
 # Generated by mksrcinfo v8
-# Sat Feb 13 08:31:42 UTC 2016
+# Mon Apr 25 16:52:51 UTC 2016
 pkgbase = nvidia-pae
-	pkgdesc = NVIDIA drivers for linux-pae
-	pkgver = 361.28
+	pkgdesc = NVIDIA drivers for linux
+	pkgver = 364.19
 	pkgrel = 1
 	url = http://www.nvidia.com/
-	install = nvidia.install
 	arch = i686
 	license = custom
-	makedepends = linux-pae-headers>=4.4
-	makedepends = linux-pae-headers<4.5
-	depends = linux-pae>=4.4
-	depends = linux-pae<4.5
-	depends = nvidia-libgl
-	depends = nvidia-utils=361.28
-	conflicts = nvidia-96xx
-	conflicts = nvidia-173xx
+	makedepends = nvidia-libgl
+	makedepends = nvidia-utils=364.19
+	makedepends = linux-pae
+	makedepends = linux-pae-headers>=4.5
+	makedepends = linux-pae-headers<4.6
 	options = !strip
-	source = nv-drm.patch
-	source = ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run
-	md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
-	md5sums = d4fc7fcf1204a46f15733d7cc2711ad2
+	source = http://us.download.nvidia.com/XFree86/Linux-x86/364.19/NVIDIA-Linux-x86-364.19.run
+	md5sums = 8a4015213c4a8f1c80e9520d04a32a7b
 
 pkgname = nvidia-pae
+	pkgdesc = NVIDIA drivers for linux
+	install = nvidia.install
+	depends = linux-pae>=4.5
+	depends = linux-pae<4.6
+	depends = nvidia-utils=364.19
+	depends = libgl
+
+pkgname = nvidia-pae-dkms
+	pkgdesc = NVIDIA driver sources for linux
+	depends = dkms
+	depends = nvidia-utils=364.19
+	depends = libgl
+	optdepends = linux-pae-headers: Build the module for Arch PAE kernel
+	optdepends = linux-lts-headers: Build the module for LTS Arch kernel
+	conflicts = 
+	conflicts = nvidia
 
diff --git a/PKGBUILD b/PKGBUILD
index 838db079d258..e2c4986ec3cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,83 @@
-# Contributor: Robert Knauer <robert@privatdemail.net>
+# $Id: PKGBUILD 264861 2016-04-14 05:06:52Z tpowa $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer: Jose Riha <jose1711 gmail com>
 
-pkgname=nvidia-pae
-pkgver=361.28
-_extramodules=extramodules-4.4-pae
+pkgbase=nvidia-pae
+pkgname=(nvidia-pae nvidia-pae-dkms)
+pkgver=364.19
+_extramodules=extramodules-4.5-pae
 pkgrel=1
-pkgdesc="NVIDIA drivers for linux-pae"
+pkgdesc="NVIDIA drivers for linux"
 arch=('i686')
 url="http://www.nvidia.com/"
-depends=('linux-pae>=4.4' 'linux-pae<4.5' 'nvidia-libgl' "nvidia-utils=${pkgver}")
-makedepends=('linux-pae-headers>=4.4' 'linux-pae-headers<4.5')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-pae' 'linux-pae-headers>=4.5' 'linux-pae-headers<4.6')
 license=('custom')
-install=nvidia.install
-options=(!strip)
+options=('!strip')
+# See nvidia-utils
+source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
+md5sums=('8a4015213c4a8f1c80e9520d04a32a7b')
 
-source=("nv-drm.patch" "ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
-md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301'
-         'd4fc7fcf1204a46f15733d7cc2711ad2')
 _pkg="NVIDIA-Linux-x86-${pkgver}"
 
-prepare() {
-  sh "${_pkg}.run" --extract-only
-  cd "${_pkg}"
-  # patches here
-  #patch -Np0 -i "$srcdir/nv-drm.patch"
+prepare() { 
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+    # patches here
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+    sed -i 's/__JOBS/`nproc`/' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+    sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
 }
 
 build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-  cd "${_pkg}/kernel"
-  make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package_nvidia-pae() {
+    pkgdesc="NVIDIA drivers for linux"
+    depends=('linux-pae>=4.5' 'linux-pae<4.6' "nvidia-utils=${pkgver}" 'libgl')
+    install=nvidia.install
+
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" \
+         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
+    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
+         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
+
+    if [[ "$CARCH" = "x86_64" ]]; then
+        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
+            "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    fi
+
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
+    install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+
+    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
 }
 
-package() {
-  install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-  install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-modeset.ko" "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
-  install -d -m755 "${pkgdir}/etc/modprobe.d"
-  echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist-pae.conf"
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-modeset.ko"
+package_nvidia-pae-dkms() {
+    pkgdesc="NVIDIA driver sources for linux"
+    depends=('dkms' "nvidia-utils=$pkgver" 'libgl')
+    optdepends=('linux-pae-headers: Build the module for Arch PAE kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflicts+=('nvidia')
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
+    echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
 }
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.install b/nvidia.install
index 417b94d13a9b..4915282f9cc3 100644
--- a/nvidia.install
+++ b/nvidia.install
@@ -1,16 +1,16 @@
 post_install() {
-  EXTRAMODULES='extramodules-4.4-pae'
+  EXTRAMODULES='extramodules-4.5-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-4.4-pae'
+  EXTRAMODULES='extramodules-4.5-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-4.4-pae'
+  EXTRAMODULES='extramodules-4.5-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }