From e3cf7f9e0e439353d7de6c00eca18a80de5907cd Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Wed, 2 Dec 2009 10:19:26 -0500
Subject: nvidia-utils: updated to 190.42

---
 abs/core-testing/nvidia-utils/PKGBUILD | 122 ++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 62 deletions(-)

diff --git a/abs/core-testing/nvidia-utils/PKGBUILD b/abs/core-testing/nvidia-utils/PKGBUILD
index b265eea..d37cd13 100644
--- a/abs/core-testing/nvidia-utils/PKGBUILD
+++ b/abs/core-testing/nvidia-utils/PKGBUILD
@@ -1,73 +1,71 @@
+# $Id: PKGBUILD 59301 2009-11-21 21:14:57Z jgc $
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Contributor: James Rayner <iphitus@gmail.com>
+
 pkgname=nvidia-utils
-pkgver=185.18.36
-pkgrel=1
-pkgdesc="NVIDIA beta drivers utilities and libraries."
-provides=('nvidia-utils' 'libgl')
+pkgver=190.42
+pkgrel=2
+pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
-[ "$CARCH" = "i686"   ] && ARCH=x86 && NV=0
-[ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0
+[ "$CARCH" = "i686"   ] && ARCH=x86      
+[ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('xorg-server>=1.5')
+depends=('xorg-server')
+optdepends=('gtk2: nvidia-settings' 'pkgconfig: nvidia-xconfig')
 conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-legacy-utils' \
            'nvidia-71xx-utils' 'nvidia-96xx-utils' )
+provides=('libgl')
 license=('custom')
 install=nvidia.install
-source=(ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run \
-        supported-cards.txt) 
-        
-options=(docs)
+source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run")
+md5sums=('f94806feee87de756d14fe3e9bcaf05a')
+[ "$CARCH" = "x86_64" ] && md5sums=('ae431ff849ec01446e6724f9fcfe3bb4')
 
-build()
-{
-  # override nvida install routine and do it the long way.
-  cd $startdir/src/
-  sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run --extract-only
-  cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/
+build() {
+        cd $srcdir
+        sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only
+        cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/
 
-  mkdir -p $startdir/pkg/usr/{lib,bin,share/applications,share/pixmaps,man/man1}
-  mkdir -p $startdir/pkg/usr/lib/xorg/modules/{extensions,drivers}
-  mkdir -p $startdir/pkg/usr/share/licenses/nvidia/
-  
-  #install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls}.so.${pkgver} \
-  mkdir -p $startdir/pkg/usr/include/{,GL,cuda,vdpau}
-  
-  install -m644 include/cuda/{cudaGL,cuda}.h $startdir/pkg/usr/include/cuda
-  install -m644 include/vdpau/{vdpau_x11,vdpau}.h $startdir/pkg/usr/include/vdpau
-  # Conflicts with MESA; if you want to develop opengl app, enable this line
-  #install -m644 include/GL/{glxext,gl,glx,glext}.h $startdir/pkg/usr/include/GL
-  
-  install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls,libvdpau_nvidia,libvdpau,libvdpau_trace}.so.${pkgver} \
-    $startdir/pkg/usr/lib/ || return 1
-  
-  install -m644 share/man/man1/* $startdir/pkg/usr/man/man1/ || return 1
-  rm $startdir/pkg/usr/man/man1/nvidia-installer.1.gz || return 1
-  install X11R6/lib/libXv* $startdir/pkg/usr/lib/ || return 1
-  install -m644 share/applications/nvidia-settings.desktop $startdir/pkg/usr/share/applications/ || return 1
-  # fix nvidia .desktop file
-  sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $startdir/pkg/usr/share/applications/nvidia-settings.desktop
-  install -m644 share/pixmaps/nvidia-settings.png $startdir/pkg/usr/share/pixmaps/ || return 1
-  install X11R6/lib/modules/libnvidia-wfb.so.$pkgver $startdir/pkg/usr/lib/xorg/modules || return 1
-  install X11R6/lib/modules/drivers/nvidia_drv.so $startdir/pkg/usr/lib/xorg/modules/drivers || return 1
-  install X11R6/lib/modules/extensions/libglx.so.$pkgver $startdir/pkg/usr/lib/xorg/modules/extensions || return 1
-  install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $startdir/pkg/usr/bin/ || return 1
-  cd $startdir/pkg/usr/lib/
-  ln -s libGL.so.$pkgver libGL.so || return 1
-  ln -s libGL.so.$pkgver libGL.so.1 || return 1
-  ln -s libGLcore.so.$pkgver libGLcore.so.1 || return 1
-  ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
-  ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
-  ln -s libcuda.so.$pkgver libcuda.so.1 || return 1
-  ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1
-  ln -s libvdpau.so.$pkgver libvdpau.so.1 || return 1
-  ln -s libvdpau.so.$pkgver libvdpau.so || return 1
-  cd $startdir/pkg/usr/lib/xorg/modules/extensions
-  ln -s libglx.so.$pkgver libglx.so || return 1
+        mkdir -p $pkgdir/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1}
+        mkdir -p $pkgdir/usr/lib/xorg/modules/{extensions,drivers}
+  mkdir -p $pkgdir/usr/lib/vdpau
+        mkdir -p $pkgdir/usr/share/licenses/nvidia
+        mkdir -p $pkgdir/usr/include/cuda
 
-  install -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/LICENSE $startdir/pkg/usr/share/licenses/nvidia/ || return 1
-  ln -s nvidia $startdir/pkg/usr/share/licenses/nvidia-utils || return 1
-  install -D -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/share/doc/README.txt $startdir/pkg/usr/share/doc/nvidia/README || return 1
-  install -D -m644 $startdir/src/supported-cards.txt $startdir/pkg/usr/share/doc/nvidia/supported-cards.txt || return 1
-  
-  find $startdir/pkg/usr -type d -exec chmod 755 {} \;
-}
+        install -m644 include/cuda/cuda*.h $pkgdir/usr/include/cuda/
+
+        install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls}.so.${pkgver} $pkgdir/usr/lib/ || return 1
+  install -m755 lib/libvdpau_nvidia.so.${pkgver} "${pkgdir}/usr/lib/vdpau/" || return 1
+  ln -sf libvdpau_nvidia.so.${pkgver} "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.1"
+
+        install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/ || return 1
+        rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz || return 1
+        install X11R6/lib/libXv* $pkgdir/usr/lib/ || return 1
+        install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/ || return 1
+        # fix nvidia .desktop file
+        sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop
+        install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/ || return 1
+        install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers || return 1
+        install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions || return 1
+        install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/ || return 1
+        cd $pkgdir/usr/lib/
+        ln -s libGL.so.$pkgver libGL.so || return 1
+        ln -s libGL.so.$pkgver libGL.so.1 || return 1
+        ln -s libGLcore.so.$pkgver libGLcore.so.1 || return 1
+        ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
+        ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
+        ln -s libcuda.so.$pkgver libcuda.so.1 || return 1
+        ln -s libcuda.so.$pkgver libcuda.so || return 1
+        ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1
 
+        cd $pkgdir/usr/lib/xorg/modules/extensions
+        ln -s libglx.so.$pkgver libglx.so || return 1
+
+        install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia/ || return 1
+        ln -s nvidia $startdir/pkg/usr/share/licenses/nvidia-utils || return 1
+
+        install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia/README || return 1
+
+        find $pkgdir/usr -type d -exec chmod 755 {} \;
+        chmod 644 $pkgdir/usr/lib/libXvMCNVIDIA.a
+}
-- 
cgit v0.12