From 4e4f084383068ec69bf55044ff40e40a986aa899 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 22 Jan 2016 22:37:10 +0000
Subject: nvidia-304xx & nvidia-304xx-utils: update to 304.131

---
 abs/core/nvidia-304xx-utils/PKGBUILD       | 10 +++++++---
 abs/core/nvidia-304xx/PKGBUILD             | 19 ++++++++-----------
 abs/core/nvidia-304xx/nv-drm.patch         | 27 ---------------------------
 abs/core/nvidia-304xx/nvidia-304xx.install |  2 +-
 4 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 abs/core/nvidia-304xx/nv-drm.patch

diff --git a/abs/core/nvidia-304xx-utils/PKGBUILD b/abs/core/nvidia-304xx-utils/PKGBUILD
index e6196b7..9cd105c 100644
--- a/abs/core/nvidia-304xx-utils/PKGBUILD
+++ b/abs/core/nvidia-304xx-utils/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=nvidia-304xx-utils
 pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
-pkgver=304.128
+pkgver=304.131
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -13,8 +13,8 @@ makedepends=('zlib')
 options=('!strip')
 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")
-sha512sums_i686=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90')
-sha512sums_x86_64=('fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2')
+sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
+sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
 
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
@@ -158,5 +158,9 @@ package_nvidia-304xx-utils() {
   install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-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 nvidia-drm-outputclass.conf "${pkgdir}/usr/share/X11/xorg.conf.d/"
+
   create_links
 }
diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD
index 54f9c3b..d855134 100644
--- a/abs/core/nvidia-304xx/PKGBUILD
+++ b/abs/core/nvidia-304xx/PKGBUILD
@@ -4,21 +4,19 @@
 
 pkgbase=nvidia-304xx
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
-pkgver=304.128
-_extramodules=extramodules-3.18-ARCH
+pkgver=304.131
+_extramodules=extramodules-4.4-ARCH
 pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19')
+makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5')
 conflicts=('nvidia')
 license=('custom')
-options=(!strip)
+options=('!strip')
 source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-        "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        'nv-drm.patch')
-sha512sums=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90'
-            'fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2'
-            'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f')
+        "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+sha512sums=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e'
+            '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -28,7 +26,6 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
-    patch -p0 -i "$srcdir/nv-drm.patch"
 }
 
 build() {
@@ -39,7 +36,7 @@ build() {
 
 package_nvidia-304xx() {
     pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
-    depends=('linux>=3.18' 'linux<3.19' 'libgl' "nvidia-304xx-utils=${pkgver}")
+    depends=('linux>=4.4' 'linux<4.5' 'libgl' "nvidia-304xx-utils=${pkgver}")
 	conflicts+=('nvidia-304xx-dkms')
     install=nvidia-304xx.install
 
diff --git a/abs/core/nvidia-304xx/nv-drm.patch b/abs/core/nvidia-304xx/nv-drm.patch
deleted file mode 100644
index 4c6a393..0000000
--- a/abs/core/nvidia-304xx/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-304xx/nvidia-304xx.install b/abs/core/nvidia-304xx/nvidia-304xx.install
index 6d90420..0979433 100644
--- a/abs/core/nvidia-304xx/nvidia-304xx.install
+++ b/abs/core/nvidia-304xx/nvidia-304xx.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.'
 }
-- 
cgit v0.12

