This commit was manufactured by cvs2git to create branch 'STABLE'.

Cherrypick from master 2010-06-28 22:15:21 UTC arvenil <arvenil@pld-linux.org> '- up to 256.35 (merged from DEVEL)':
    X11-driver-nvidia-GL.patch -> 1.2
    X11-driver-nvidia-desktop.patch -> 1.6
    gl.pc.in -> 1.1

diff --git a/X11-driver-nvidia-GL.patch b/X11-driver-nvidia-GL.patch
new file mode 100644 (file)
index 0000000..72f036e
--- /dev/null
+++ b/X11-driver-nvidia-GL.patch
@@ -0,0 +1,10 @@
+--- NVIDIA-Linux-x86-1.0-6111-pkg1/gl.h        2004-07-27 17:33:20.000000000 +0200
++++ NVIDIA-Linux-x86-1.0-6111-pkg1/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-desktop.patch b/X11-driver-nvidia-desktop.patch
new file mode 100644 (file)
index 0000000..dcef633
--- /dev/null
+++ b/X11-driver-nvidia-desktop.patch
@@ -0,0 +1,19 @@
+--- NVIDIA-Linux-x86-1.0-8774-pkg1/nvidia-settings.desktop     2006-08-24 23:20:06.166925750 +0200
++++ NVIDIA-Linux-x86-1.0-8774-pkg1/nvidia-settings.desktop     2006-08-24 23:25:53.264618000 +0200
+@@ -1,9 +1,13 @@
+ [Desktop Entry]
+ Type=Application
+ Encoding=UTF-8
+-Name=NVIDIA X Server Settings
+-Comment=Configure NVIDIA X Server Settings
++Name=nVidia X Server Settings
++Name[pl]=Ustawienia X serwera nVidii
++Comment=Configure nVidia X Server Settings
++Comment[pl]=Konfiguracja ustawień X serwera NVndii
+ Exec=__UTILS_PATH__/nvidia-settings
+ Icon=__PIXMAP_PATH__/nvidia-settings.png
+ Categories=Application;Settings;
+-
++Exec=nvidia-settings
++Icon=nvidia-settings
++Categories=Settings;HardwareSettings;

diff --git a/gl.pc.in b/gl.pc.in
new file mode 100644 (file)
index 0000000..c6746ac
--- /dev/null
+++ b/gl.pc.in
@@ -0,0 +1,10 @@
+prefix=@@prefix@@
+exec_prefix=${prefix}
+libdir=@@libdir@@
+includedir=@@includedir@@
+
+Name: gl
+Description: NVIDIA OpenGL library
+Version: @@version@@
+Libs: -L${libdir} -lGL
+Cflags: -I${includedir}