This commit was manufactured by cvs2git to create branch 'AC-branch'.

Cherrypick from master 2007-03-28 14:49:19 UTC hawk <hawk@pld-linux.org> '- revived nvidia 96xx drivers as legacy2 for Ac':
    X11-driver-nvidia-legacy2-GL.patch -> 1.1
    X11-driver-nvidia-legacy2-conftest.patch -> 1.1
    X11-driver-nvidia-legacy2-settings.desktop -> 1.1
    X11-driver-nvidia-legacy2-xinitrc.sh -> 1.1

diff --git a/X11-driver-nvidia-legacy2-GL.patch b/X11-driver-nvidia-legacy2-GL.patch
new file mode 100644 (file)
index 0000000..b96ac9c
--- /dev/null
+++ b/X11-driver-nvidia-legacy2-GL.patch
@@ -0,0 +1,10 @@
+--- NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h~        2004-07-27 17:33:20.000000000 +0200
++++ NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h 2004-09-13 13:23:24.188682536 +0200
+@@ -1620,6 +1620,7 @@
+ WINGDIAPI void APIENTRY glVertex4sv (const GLshort *v);
+ WINGDIAPI void APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+ WINGDIAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
++#define GL_COLOR_INDEX8_EXT               0x80E5
+ 
+ #ifdef __DEFINED_GLAPI
+ # undef GLAPI

diff --git a/X11-driver-nvidia-legacy2-conftest.patch b/X11-driver-nvidia-legacy2-conftest.patch
new file mode 100644 (file)
index 0000000..c35fa63
--- /dev/null
+++ b/X11-driver-nvidia-legacy2-conftest.patch
@@ -0,0 +1,12 @@
+diff -ru NVIDIA-Linux-x86-1.0-6629-pkg1.orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86-1.0-6629-pkg1/usr/src/nv/conftest.sh
+--- NVIDIA-Linux-x86-1.0-6629-pkg1.orig/usr/src/nv/conftest.sh 2004-11-18 10:34:39.000000000 +0100
++++ NVIDIA-Linux-x86-1.0-6629-pkg1/usr/src/nv/conftest.sh      2004-11-18 10:49:21.385817576 +0100
+@@ -17,7 +17,7 @@
+ 
+ if [ "$OUTPUT" != "$SOURCES" ]; then
+     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
+--I$HEADERS -I$HEADERS/asm/mach-default"
++-I$HEADERS -I$OUTPUT/include/asm/mach-default"
+ else
+     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default"
+ fi

diff --git a/X11-driver-nvidia-legacy2-settings.desktop b/X11-driver-nvidia-legacy2-settings.desktop
new file mode 100644 (file)
index 0000000..d4e747d
--- /dev/null
+++ b/X11-driver-nvidia-legacy2-settings.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings.png
+Categories=Settings;HardwareSettings;

diff --git a/X11-driver-nvidia-legacy2-xinitrc.sh b/X11-driver-nvidia-legacy2-xinitrc.sh
new file mode 100644 (file)
index 0000000..2e267ed
--- /dev/null
+++ b/X11-driver-nvidia-legacy2-xinitrc.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -r "${HOME}/.nvidia-settings-rc" ]; then
+       /usr/X11R6/bin/nvidia-settings -l > /dev/null 2>&1
+fi