nvidia driver: recompile for new kernel, updated to 310.19

3 files changed, 27 insertions, 25 deletions

diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 0b97b2d..c1180c0 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161949 2012-06-16 22:01:05Z ibiru $
+# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=302.17
+pkgver=310.19
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -14,18 +14,18 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-	md5sums=('b7f908ea08218df08db06026215ec419')
+    md5sums=('2adbdd38540b3a8955714760e05f575d')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('7e768412a16853078b04037a7cc9c8ac')
+    md5sums=('0ba08d32852e442ebba5ba22c7abed36')
 fi
 
 create_links() {
     # create soname links
     while read -d '' _lib; do
-        _soname="$(dirname "${_lib}")/$(readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
+        _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
         [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
         [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}"
     done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
@@ -45,16 +45,15 @@ package_opencl-nvidia() {
     # OpenCL
     install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
     install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
-    # CUDA
-    install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
-    install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
+    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
+
     create_links
 }
 
 package_nvidia-utils() {
     pkgdesc="NVIDIA drivers utilities and libraries."
     depends=('xorg-server' 'libxvmc')
-    optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig'
+    optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig'
                 'opencl-nvidia: OpenCL support')
     conflicts=('libgl')
     provides=('libgl')
@@ -69,9 +68,6 @@ package_nvidia-utils() {
     install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
     # OpenGL core library
     install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
-    # XvMC
-    install -D -m644 libXvMCNVIDIA.a "${pkgdir}/usr/lib/libXvMCNVIDIA.a"
-    install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
     # VDPAU
     install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
     # nvidia-tls library
@@ -79,6 +75,9 @@ package_nvidia-utils() {
     install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
 
     install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
+    # CUDA
+    install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
+    install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
 
     # nvidia-xconfig
     install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
@@ -104,4 +103,4 @@ package_nvidia-utils() {
 
     create_links
 }
-md5sums=('7e768412a16853078b04037a7cc9c8ac')
+md5sums=('0ba08d32852e442ebba5ba22c7abed36')
diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD
index d5fef36..a7d4b38 100644
--- a/abs/core/nvidia/PKGBUILD
+++ b/abs/core/nvidia/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 163878 2012-07-21 12:01:30Z tpowa $
+# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $
 # Maintainer : Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia
-pkgver=302.17
-_extramodules=extramodules-3.4-ARCH
-pkgrel=4
+pkgver=310.19
+_extramodules=extramodules-3.6-ARCH
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.4' 'linux<3.5' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.4' 'linux-headers<3.5')
+depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
@@ -19,12 +19,12 @@ if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('b7f908ea08218df08db06026215ec419')
+    md5sums=('2adbdd38540b3a8955714760e05f575d')
 elif [ "$CARCH" = "x86_64" ]; then
     _arch='x86_64'
    _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
     source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('7e768412a16853078b04037a7cc9c8ac')
+    md5sums=('0ba08d32852e442ebba5ba22c7abed36')
 fi
 
 build() {
@@ -43,4 +43,4 @@ package() {
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 }
-md5sums=('7e768412a16853078b04037a7cc9c8ac')
+md5sums=('0ba08d32852e442ebba5ba22c7abed36')
diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install
index 3fe1bd8..c2c292a 100644
--- a/abs/core/nvidia/nvidia.install
+++ b/abs/core/nvidia/nvidia.install
@@ -1,15 +1,18 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.4-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.4-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+        echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+    fi
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.4-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }