summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-09-06 16:35:28 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-06 16:35:28 +0000
commitbb7739a5e8add00fc73c26360f74194852ff1974 (patch)
treeef468a24c240ea1f7267d6dc0187ac7bb0c4ee96 /x11-base
parentUpdating the Manifest. (diff)
downloadgentoo-2-bb7739a5e8add00fc73c26360f74194852ff1974.tar.gz
gentoo-2-bb7739a5e8add00fc73c26360f74194852ff1974.tar.bz2
gentoo-2-bb7739a5e8add00fc73c26360f74194852ff1974.zip
Forgot to cvs add the patch, thanks fmccor.
(Portage version: 2.1.1_rc1-r4)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch54
2 files changed, 59 insertions, 1 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 4248d4c39aed..d86f30225d66 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.163 2006/09/05 23:17:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.164 2006/09/06 16:35:28 dberkholz Exp $
+
+ 06 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+ +files/xorg-x11-server-1.1.1-mesa-6.5.1.patch:
+ Forgot to cvs add the patch, thanks fmccor.
*xorg-server-1.1.1-r1 (05 Sep 2006)
diff --git a/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch b/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch
new file mode 100644
index 000000000000..48f4380c2b89
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-x11-server-1.1.1-mesa-6.5.1.patch
@@ -0,0 +1,54 @@
+diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
+index 867fe57..4d5b0cd 100644
+--- a/GL/mesa/main/Makefile.am
++++ b/GL/mesa/main/Makefile.am
+@@ -29,6 +27,7 @@ nodist_libmain_la_SOURCES = accum.c \
+ api_loopback.c \
+ api_noop.c \
+ api_validate.c \
++ arrayobj.c \
+ attrib.c \
+ blend.c \
+ bufferobj.c \
+@@ -67,6 +66,7 @@ nodist_libmain_la_SOURCES = accum.c \
+ points.c \
+ polygon.c \
+ rastpos.c \
++ rbadaptors.c \
+ renderbuffer.c \
+ state.c \
+ stencil.c \
+diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
+index ccaa2a9..32f839a 100755
+--- a/GL/symlink-mesa.sh
++++ b/GL/symlink-mesa.sh
+@@ -88,8 +88,11 @@ symlink_mesa_main() {
+ action api_noop.h
+ action api_validate.c
+ action api_validate.h
++ action arrayobj.c
++ action arrayobj.h
+ action attrib.c
+ action attrib.h
++ action bitset.h
+ action blend.c
+ action blend.h
+ action bufferobj.c
+@@ -168,6 +171,8 @@ symlink_mesa_main() {
+ action polygon.h
+ action rastpos.c
+ action rastpos.h
++ action rbadaptors.c
++ action rbadaptors.h
+ action renderbuffer.c
+ action renderbuffer.h
+ action simple_list.h
+@@ -468,7 +468,7 @@ symlink_mesa_shader_slang_library() {
+ action slang_core_gc.h
+ action slang_fragment_builtin_gc.h
+ action slang_shader_syn.h
+- action slang_version_syn.h
++ action slang_pp_version_syn.h
+ action slang_vertex_builtin_gc.h
+ }
+