From 2427eb4c308109c4a06bb6ecfb119656dbe908c6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 6 Nov 2010 18:45:51 +0000
Subject: nvidia-utils: update to 260.19.12 ref #574 ref #647

---
 abs/core/nvidia-utils/20-nvidia.conf      |   2 +-
 abs/core/nvidia-utils/PKGBUILD            |  23 +--
 abs/core/nvidia-utils/supported-cards.txt | 292 ------------------------------
 3 files changed, 9 insertions(+), 308 deletions(-)
 delete mode 100644 abs/core/nvidia-utils/supported-cards.txt

diff --git a/abs/core/nvidia-utils/20-nvidia.conf b/abs/core/nvidia-utils/20-nvidia.conf
index 227ac7d..1d7c42f 100644
--- a/abs/core/nvidia-utils/20-nvidia.conf
+++ b/abs/core/nvidia-utils/20-nvidia.conf
@@ -1,5 +1,5 @@
 Section "Device"
         Identifier "Default nvidia Device"
         Driver "nvidia"
-        Option "NoLogo" "True" 
+        Option "NoLogo" "True"
 EndSection
diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD
index 369253c..dc72aa3 100644
--- a/abs/core/nvidia-utils/PKGBUILD
+++ b/abs/core/nvidia-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83977 2010-06-25 06:51:43Z pierre $
+# $Id: PKGBUILD 95296 2010-10-18 14:38:35Z ibiru $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 
 pkgname=nvidia-utils
-pkgver=256.35
-pkgrel=4
+pkgver=260.19.12
+pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -21,16 +21,16 @@ if [ "$CARCH" = "i686" ]; then
 	_arch='x86'
 	_pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 	source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-	md5sums=('f6af8917a500de28396a438f3f548c88')
+        md5sums=('8bcefb2423908160d3676200650ad5c9')
 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=('7b5924f14a4d2326b4d916efdb7852ff')
+        md5sums=('111da94be1ea21c0531b6e1c45d01b9b')
 fi
 
 source[1]='20-nvidia.conf'
-md5sums[1]='37e417b2c69e46de1346a653e07027fa'
+md5sums[1]='541cb36684b6764ccba73d7afe268bf5'
 
 build() {
 	cd $srcdir
@@ -56,19 +56,12 @@ package() {
 	install -D -m755 libvdpau_nvidia.so.$pkgver $pkgdir/usr/lib/vdpau/libvdpau_nvidia.so.$pkgver
 	# CUDA
 	install -D -m755 libcuda.so.$pkgver $pkgdir/usr/lib/libcuda.so.$pkgver
-	install -D -m644 cuda.h $pkgdir/usr/include/cuda/cuda.h
-	install -D -m644 cudaGL.h $pkgdir/usr/include/cuda/cudaGL.h
-	install -D -m644 cudaVDPAU.h $pkgdir/usr/include/cuda/cudaVDPAU.h
-	# nvidia-tls libraries
-	install -D -m755 libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
-	install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/tls/libnvidia-tls.so.$pkgver
+	# nvidia-tls library
+	install -D -m755 tls/libnvidia-tls.so.$pkgver $pkgdir/usr/lib/libnvidia-tls.so.$pkgver
 	# OpenCL
 	install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib/libnvidia-compiler.so.$pkgver
 	install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
-	install -D -m644 cl.h $pkgdir/usr/include/CL/cl.h
-	install -D -m644 cl_gl.h $pkgdir/usr/include/CL/cl_gl.h
 	install -D -m644 nvidia.icd $pkgdir/etc/OpenCL/vendors/nvidia.icd
-	install -D -m644 cl_platform.h $pkgdir/usr/include/CL/cl_platform.h
 
 	install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib/libnvidia-cfg.so.$pkgver
 
diff --git a/abs/core/nvidia-utils/supported-cards.txt b/abs/core/nvidia-utils/supported-cards.txt
deleted file mode 100644
index ce4c3d4..0000000
--- a/abs/core/nvidia-utils/supported-cards.txt
+++ /dev/null
@@ -1,292 +0,0 @@
-Archlinux currently manages three branches of the NVIDIA binary driver:
-
-nvidia (latest nvidia release)
-nvidia-96xx (96xx legacy branch)
-nvidia-71xx (71xx legacy branch)
-
-This excerpt from the NVIDIA 100.14.09 README lists the supported devices
-for each of those:
-
-______________________________________________________________________________
-
-Appendix A. Supported NVIDIA GPU Products
-______________________________________________________________________________
-
-For the most complete and accurate listing of supported GPUs, please see the
-Supported Products List, available from the NVIDIA Linux x86 Graphics Driver
-download page. Please go to http://www.nvidia.com/object/unix.html, follow the
-Archive link under the Linux x86 heading, follow the link for the 100.14.09
-driver, and then go to the Supported Products List.
-
-
-A1. NVIDIA GEFORCE GPUS
-
-
-    NVIDIA GPU product                    Device PCI ID
-    ----------------------------------    ----------------------------------
-    GeForce 6800 Ultra                    0x0040
-    GeForce 6800                          0x0041
-    GeForce 6800 LE                       0x0042
-    GeForce 6800 XE                       0x0043
-    GeForce 6800 XT                       0x0044
-    GeForce 6800 GT                       0x0045
-    GeForce 6800 GT                       0x0046
-    GeForce 6800 GS                       0x0047
-    GeForce 6800 XT                       0x0048
-    GeForce 7800 GTX                      0x0090
-    GeForce 7800 GTX                      0x0091
-    GeForce 7800 GTX                      0x0092
-    GeForce 7800 GS                       0x0093
-    GeForce 7800 SLI                      0x0095
-    GeForce Go 7800                       0x0098
-    GeForce Go 7800 GTX                   0x0099
-    GeForce 6800 GS                       0x00C0
-    GeForce 6800                          0x00C1
-    GeForce 6800 LE                       0x00C2
-    GeForce 6800 XT                       0x00C3
-    GeForce Go 6800                       0x00C8
-    GeForce Go 6800 Ultra                 0x00C9
-    GeForce 6800 Ultra/GeForce 6800       0x00F0
-    GeForce 6600 GT                       0x00F1
-    GeForce 6600                          0x00F2
-    GeForce 6200                          0x00F3
-    GeForce 6600 LE                       0x00F4
-    GeForce 7800 GS                       0x00F5
-    GeForce 6800 GS/XT                    0x00F6
-    GeForce 6800 Ultra                    0x00F9
-    GeForce PCX 5750                      0x00FA
-    GeForce PCX 5900                      0x00FB
-    GeForce PCX 5300                      0x00FC
-    GeForce PCX 4300                      0x00FF
-    GeForce 6600 GT                       0x0140
-    GeForce 6600                          0x0141
-    GeForce 6600 LE                       0x0142
-    GeForce 6600 VE                       0x0143
-    GeForce Go 6600                       0x0144
-    GeForce 6610 XL                       0x0145
-    GeForce Go 6600 TE/6200 TE            0x0146
-    GeForce 6700 XL                       0x0147
-    GeForce Go 6600                       0x0148
-    GeForce Go 6600 GT                    0x0149
-    GeForce 6200                          0x014F
-    GeForce 6500                          0x0160
-    GeForce 6200 TurboCache(TM)           0x0161
-    GeForce 6200SE TurboCache(TM)         0x0162
-    GeForce 6200 LE                       0x0163
-    GeForce Go 6200                       0x0164
-    GeForce Go 6400                       0x0166
-    GeForce Go 6200                       0x0167
-    GeForce Go 6400                       0x0168
-    GeForce 6250                          0x0169
-    GeForce 7100 GS                       0x016A
-    GeForce 8800 GTX                      0x0191
-    GeForce 8800 GTS                      0x0193
-    GeForce 8800 Ultra                    0x0194
-    GeForce 7350 LE                       0x01D0
-    GeForce 7300 LE                       0x01D1
-    GeForce 7300 SE/7200 GS               0x01D3
-    GeForce Go 7200                       0x01D6
-    GeForce Go 7300                       0x01D7
-    GeForce Go 7400                       0x01D8
-    GeForce 7500 LE                       0x01DD
-    GeForce 7300 GS                       0x01DF
-    GeForce 6800                          0x0211
-    GeForce 6800 LE                       0x0212
-    GeForce 6800 GT                       0x0215
-    GeForce 6800 XT                       0x0218
-    GeForce 6200                          0x0221
-    GeForce 6200 A-LE                     0x0222
-    GeForce 6150                          0x0240
-    GeForce 6150 LE                       0x0241
-    GeForce 6100                          0x0242
-    GeForce Go 6150                       0x0244
-    GeForce Go 6100                       0x0247
-    GeForce 7900 GTX                      0x0290
-    GeForce 7900 GT/GTO                   0x0291
-    GeForce 7900 GS                       0x0292
-    GeForce 7950 GX2                      0x0293
-    GeForce 7950 GX2                      0x0294
-    GeForce 7950 GT                       0x0295
-    GeForce Go 7950 GTX                   0x0297
-    GeForce Go 7900 GS                    0x0298
-    GeForce Go 7900 GTX                   0x0299
-    GeForce 7600 GT/Unknown GPU           0x02E0
-    GeForce 7600 GS                       0x02E1
-    GeForce FX 5800 Ultra                 0x0301
-    GeForce FX 5800                       0x0302
-    GeForce FX 5600 Ultra                 0x0311
-    GeForce FX 5600                       0x0312
-    GeForce FX 5600XT                     0x0314
-    GeForce FX Go5600                     0x031A
-    GeForce FX Go5650                     0x031B
-    GeForce FX 5200                       0x0320
-    GeForce FX 5200 Ultra                 0x0321
-    GeForce FX 5200                       0x0322
-    GeForce FX 5200LE                     0x0323
-    GeForce FX Go5200                     0x0324
-    GeForce FX Go5250                     0x0325
-    GeForce FX 5500                       0x0326
-    GeForce FX 5100                       0x0327
-    GeForce FX Go5200 32M/64M             0x0328
-    GeForce FX Go53xx                     0x032C
-    GeForce FX Go5100                     0x032D
-    GeForce FX 5900 Ultra                 0x0330
-    GeForce FX 5900                       0x0331
-    GeForce FX 5900XT                     0x0332
-    GeForce FX 5950 Ultra                 0x0333
-    GeForce FX 5900ZT                     0x0334
-    GeForce FX 5700 Ultra                 0x0341
-    GeForce FX 5700                       0x0342
-    GeForce FX 5700LE                     0x0343
-    GeForce FX 5700VE                     0x0344
-    GeForce FX Go5700                     0x0347
-    GeForce FX Go5700                     0x0348
-    GeForce 7650 GS                       0x0390
-    GeForce 7600 GT                       0x0391
-    GeForce 7600 GS                       0x0392
-    GeForce 7300 GT                       0x0393
-    GeForce 7600 LE                       0x0394
-    GeForce 7300 GT                       0x0395
-    GeForce Go 7600                       0x0398
-    GeForce 6150SE nForce 430             0x03D0
-    GeForce 6100 nForce 405               0x03D1
-    GeForce 6100 nForce 400               0x03D2
-    GeForce 6100 nForce 420               0x03D5
-    GeForce 8600 GTS                      0x0400
-    GeForce 8600 GT                       0x0402
-    GeForce 8600M GT                      0x0407
-    GeForce 8500 GT                       0x0421
-    GeForce 8400 GS                       0x0422
-    GeForce 8300 GS                       0x0423
-    GeForce 8600M GS                      0x0425
-    GeForce 8400M GT                      0x0426
-    GeForce 8400M GS                      0x0427
-    GeForce 8400M G                       0x0428
-
-
-
-A2. NVIDIA QUADRO GPUS
-
-
-    NVIDIA GPU product                                        Device PCI ID
-    ------------------------------------------------------    ---------------
-    Quadro FX 4000                                            0x004E
-    Quadro FX 4500                                            0x009D
-    Quadro FX Go1400                                          0x00CC
-    Quadro FX 3450/4000 SDI                                   0x00CD
-    Quadro FX 1400                                            0x00CE
-    Quadro FX 4400/Quadro FX 3400                             0x00F8
-    Quadro FX 330                                             0x00FC
-    Quadro NVS 280 PCI-E/Quadro FX 330                        0x00FD
-    Quadro FX 1300                                            0x00FE
-    Quadro NVS 440                                            0x014A
-    Quadro FX 540M/Quadro FX 540M                             0x014C
-    Quadro FX 550                                             0x014D
-    Quadro FX 540                                             0x014E
-    Quadro NVS 285                                            0x0165
-    Quadro FX 5600                                            0x019D
-    Quadro FX 4600                                            0x019E
-    Quadro NVS 110M                                           0x01D7
-    Quadro NVS 110M                                           0x01DA
-    Quadro NVS 120M                                           0x01DB
-    Quadro FX 350M                                            0x01DC
-    Quadro FX 350                                             0x01DE
-    Quadro NVS 210S / NVIDIA GeForce 6150LE                   0x0245
-    Quadro FX 2500M                                           0x029A
-    Quadro FX 1500M                                           0x029B
-    Quadro FX 5500                                            0x029C
-    Quadro FX 3500                                            0x029D
-    Quadro FX 1500                                            0x029E
-    Quadro FX 4500 X2                                         0x029F
-    Quadro FX 2000                                            0x0308
-    Quadro FX 1000                                            0x0309
-    Quadro FX Go700                                           0x031C
-    Quadro NVS 55/280 PCI                                     0x032A
-    Quadro FX 500/FX 600                                      0x032B
-    Quadro FX 3000                                            0x0338
-    Quadro FX 700                                             0x033F
-    Quadro FX Go1000                                          0x034C
-    Quadro FX 1100                                            0x034E
-    Quadro FX 560                                             0x039E
-    Quadro NVS 320M                                           0x040B
-    Quadro FX 570M                                            0x040C
-    Quadro FX 1600M                                           0x040D
-    Quadro NVS 140M                                           0x0429
-    Quadro NVS 130M                                           0x042A
-    Quadro NVS 135M                                           0x042B
-    Quadro FX 360M                                            0x042D
-
-
-Below are the legacy GPUs that are no longer supported in the unified driver.
-These GPUs will continue to be maintained through the special legacy NVIDIA
-GPU driver releases.
-
-The 1.0-96xx driver supports the following set of GPUs:
-
-
-    NVIDIA GPU product                    Device PCI ID
-    ----------------------------------    ----------------------------------
-    GeForce2 MX/MX 400                    0x0110
-    GeForce2 MX 100/200                   0x0111
-    GeForce2 Go                           0x0112
-    Quadro2 MXR/EX/Go                     0x0113
-    GeForce4 MX 460                       0x0170
-    GeForce4 MX 440                       0x0171
-    GeForce4 MX 420                       0x0172
-    GeForce4 MX 440-SE                    0x0173
-    GeForce4 440 Go                       0x0174
-    GeForce4 420 Go                       0x0175
-    GeForce4 420 Go 32M                   0x0176
-    GeForce4 460 Go                       0x0177
-    Quadro4 550 XGL                       0x0178
-    GeForce4 440 Go 64M                   0x0179
-    Quadro NVS 400                        0x017A
-    Quadro4 500 GoGL                      0x017C
-    GeForce4 410 Go 16M                   0x017D
-    GeForce4 MX 440 with AGP8X            0x0181
-    GeForce4 MX 440SE with AGP8X          0x0182
-    GeForce4 MX 420 with AGP8X            0x0183
-    GeForce4 MX 4000                      0x0185
-    Quadro4 580 XGL                       0x0188
-    Quadro NVS 280 SD                     0x018A
-    Quadro4 380 XGL                       0x018B
-    Quadro NVS 50 PCI                     0x018C
-    GeForce2 Integrated GPU               0x01A0
-    GeForce4 MX Integrated GPU            0x01F0
-    GeForce3                              0x0200
-    GeForce3 Ti 200                       0x0201
-    GeForce3 Ti 500                       0x0202
-    Quadro DCC                            0x0203
-    GeForce4 Ti 4600                      0x0250
-    GeForce4 Ti 4400                      0x0251
-    GeForce4 Ti 4200                      0x0253
-    Quadro4 900 XGL                       0x0258
-    Quadro4 750 XGL                       0x0259
-    Quadro4 700 XGL                       0x025B
-    GeForce4 Ti 4800                      0x0280
-    GeForce4 Ti 4200 with AGP8X           0x0281
-    GeForce4 Ti 4800 SE                   0x0282
-    GeForce4 4200 Go                      0x0286
-    Quadro4 980 XGL                       0x0288
-    Quadro4 780 XGL                       0x0289
-    Quadro4 700 GoGL                      0x028C
-
-
-The 1.0-71xx driver supports the following set of GPUs:
-
-
-    NVIDIA GPU product                    Device PCI ID
-    ----------------------------------    ----------------------------------
-    RIVA TNT                              0x0020
-    RIVA TNT2/TNT2 Pro                    0x0028
-    RIVA TNT2 Ultra                       0x0029
-    Vanta/Vanta LT                        0x002C
-    RIVA TNT2 Model 64/Model 64 Pro       0x002D
-    Aladdin TNT2                          0x00A0
-    GeForce 256                           0x0100
-    GeForce DDR                           0x0101
-    Quadro                                0x0103
-    GeForce2 GTS/GeForce2 Pro             0x0150
-    GeForce2 Ti                           0x0151
-    GeForce2 Ultra                        0x0152
-    Quadro2 Pro                           0x0153
-- 
cgit v0.12

