[arch-commits] Commit in nvidia/trunk (PKGBUILD)

[Felix Yan]

    Date: Thursday, September 10, 2015 @ 12:07:29
  Author: fyan
Revision: 245717

upgpkg: nvidia 355.11-2

update dkms.conf and use arch-specific source (FS#46223)

Modified:
  nvidia/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-10 09:59:13 UTC (rev 245716)
+++ PKGBUILD	2015-09-10 10:07:29 UTC (rev 245717)
@@ -1,22 +1,23 @@
 # $Id$
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
 pkgver=355.11
 _extramodules=extramodules-4.2-ARCH
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=('libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
 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")
-md5sums=('16d143ccafe99328a2ca8e5a396fd4bc'
-         '30133d89690f4683c4e289ec6c0247dc')
+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_i686='16d143ccafe99328a2ca8e5a396fd4bc'
+md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc'
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -28,14 +29,13 @@
 
     cp -a kernel kernel-dkms
     cd kernel-dkms
-    eval "sed -i 's/__VERSION_STRING/${pkgver}/' dkms.conf"
-    sed -i 's/__JOBS/${&}/' dkms.conf
-    sed -i '4iBUILT_MODULE_NAME[0]="nvidia"\
+    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"\
-__JOBS=`nproc`' dkms.conf
-    sed -i 's/__DKMS_MODULES//' dkms.conf
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf
 }
 
 build() {