nvidia update, including lts and bumblebee packages

nvidia-bumblebee/PKGBUILD

@@ -4,9 +4,9 @@
 # Contributions from AUR: https://aur.archlinux.org/packages/nvidia-bumblebee/
 
 pkgname=nvidia-bumblebee
-pkgver=313.18
+pkgver=313.26
 pkgrel=1
-_kernver='3.7.6-1-CHAKRA'
+_kernver='3.7.6-2-CHAKRA'
 _extramodules='extramodules-3.7-CHAKRA' 
 pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee"
 arch=('x86_64')
@@ -18,15 +18,13 @@ conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx' 'dkms-nvidia')
 license=('custom')
 install=nvidia.install
 options=(!strip)
-source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        'conftest_new.diff')
-md5sums=('fa17a260793a38b4b8ae367db2e03b39'
-         'fabd5e3a17e2bf4aef4bf2e25a0e17d4')
+source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('2d35124fa5a4b009f170fe893b5d07e3')
 
 build() {
     cd "${srcdir}"
     sh "NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" --extract-only
-    patch -p1 -i "${srcdir}/conftest_new.diff"
+
     cd "NVIDIA-Linux-x86_64-${pkgver}-no-compat32/kernel"
     make SYSSRC=/lib/modules/"${_kernver}/build" module
 }

nvidia-bumblebee/conftest_new.diff

---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:20.669633666 -0500
-+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh	2013-02-04 15:10:34.283334673 -0500
-@@ -1701,7 +1701,7 @@
-                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- 
-                 if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
--                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-+                        -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then
-                     SELECTED_MAKEFILE=Makefile.kbuild
-                     RET=0
-                 fi
\ No newline at end of file

nvidia-lts/PKGBUILD

@@ -8,8 +8,8 @@ _extramodules=extramodules-`pacman -Q linux-lts | cut -c11-13 | sed 's/linux-lts
 _kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=nvidia-lts
-pkgver=313.18
-pkgrel=2
+pkgver=313.26
+pkgrel=1
 pkgdesc="NVIDIA drivers for linux."
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -22,7 +22,7 @@ install=nvidia.install
     _ARCH='x86_64'
     _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32"
     source=("http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run")
-    md5sums=('fa17a260793a38b4b8ae367db2e03b39')
+    md5sums=('2d35124fa5a4b009f170fe893b5d07e3')
 
 build() {
     cd "${srcdir}"

nvidia-utils-bumblebee/PKGBUILD

@@ -5,19 +5,19 @@
 
 pkgname=nvidia-utils-bumblebee
 
-pkgver=313.18
-pkgrel=3
+pkgver=313.26
+pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries. Repacked and installed in different folder to be used simultaneously with libgl."
 arch=('x86_64')
 url="http://www.nvidia.com/"
-depends=('xorg-server' 'pango')
+depends=('xorg-server' 'pango' 'pangox-compat')
 optdepends=('gtk2: nvidia-settings' 'pkgconfig: nvidia-xconfig' 'opencl-nvidia: OpenCL support')
 conflicts=('nvidia-utils' 'nvidia-settings')
 provides=("nvidia-utils=$pkgver" 'nvidia-settings')
 license=('custom')
 install=nvidia.install
 source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('fa17a260793a38b4b8ae367db2e03b39')
+md5sums=('2d35124fa5a4b009f170fe893b5d07e3')
 
 
 create_links() {

nvidia-utils/PKGBUILD

@@ -6,8 +6,8 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings')
 # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx
-pkgver=313.18
-pkgrel=3
+pkgver=313.26
+pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -16,7 +16,7 @@ options=('!strip')
 [ "$CARCH" = "x86_64" ] && {
   ARCH='x86_64'
   _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
-  md5sums=('fa17a260793a38b4b8ae367db2e03b39')
+  md5sums=('2d35124fa5a4b009f170fe893b5d07e3')
 }
 
 source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run"
@@ -40,7 +40,7 @@ build() {
 
 package_libcl() {
   pkgdesc="OpenCL library and ICD loader from NVIDIA"
-  pkgver=1.1.9.7
+  pkgver=1.1.9.8
 
   cd "${srcdir}/${_pkg}"
 
@@ -94,6 +94,10 @@ package_nvidia-utils() {
   # 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 nvidia-cuda-proxy-server "${pkgdir}/usr/bin/nvidia-cuda-proxy-server"
+  install -D -m644 nvidia-cuda-proxy-control.1.gz "${pkgdir}/usr/share/man/man1/nvidia-cuda-proxy-control.1.gz"
+  # DEBUG
+  install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
   # nvidia-xconfig
   install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
   install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz"

nvidia/PKGBUILD

@@ -7,26 +7,24 @@ _extramodules=extramodules-3.7-CHAKRA
 _kver=$(cat /lib/modules/${_extramodules}/version)
 
 pkgname=('nvidia' 'chd-nvidia')
-pkgver=313.18
-pkgrel=3
+pkgver=313.26
+pkgrel=1
 arch=('x86_64')
 url="http://www.nvidia.com/"
 makedepends=('linux-headers' 'linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}")
 license=('custom')
-source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported"
-        'conftest_new.diff')
-md5sums=('62d0cdb856cfae64753c0f3acf729d47'
-         '2627107ebbd930389b00a9a2cd5e6f42')
+source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported")
+md5sums=('62d0cdb856cfae64753c0f3acf729d47')
 
     _ARCH='x86_64'
     _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32"
     source+=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run")
-    md5sums+=('fa17a260793a38b4b8ae367db2e03b39')
+    md5sums+=('2d35124fa5a4b009f170fe893b5d07e3')
 
 build() {
     cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
-    patch -p1 -i "${srcdir}/conftest_new.diff"
+
     cd "${_pkg}/kernel"
     make SYSSRC=/lib/modules/"${_kver}/build" module
 }