Forgot to cvs add the patch, thanks fmccor.

Package-Manager: portage-2.1.1_rc1-r4

3 files changed, 67 insertions, 5 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/Manifest b/x11-base/xorg-server/Manifest
index cbabbc53e3ff..1063fb62a129 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -98,6 +98,10 @@ AUX xorg-server-1.1.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478
 MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
 SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
+AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 SHA1 287d09b104826c0ac852d401457c230fa96f7296 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0
+MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
+RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
+SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
@@ -125,10 +129,10 @@ EBUILD xorg-server-1.1.1.ebuild 15697 RMD160 d9f04723d983a55ff7a0ce90c67f1af7fd8
 MD5 be367a0cc0c71e5b88c181687f8642ca xorg-server-1.1.1.ebuild 15697
 RMD160 d9f04723d983a55ff7a0ce90c67f1af7fd83bc8e xorg-server-1.1.1.ebuild 15697
 SHA256 bf4fa6b3db19aba2936fb3393ecd21940ee97d2e1fd3c1ae6cdb939507cfcbb8 xorg-server-1.1.1.ebuild 15697
-MISC ChangeLog 33930 RMD160 0223bffef474425936fbc5710f3e53482db8201c SHA1 0ea1ece541ee537420889842becf9e15c18dd3b8 SHA256 a25ccc0de7817fca2edb4a8de3f0bf468a4fda17e8df651385cf700bf53d6c2f
-MD5 9b96664df258343622cc7122979da236 ChangeLog 33930
-RMD160 0223bffef474425936fbc5710f3e53482db8201c ChangeLog 33930
-SHA256 a25ccc0de7817fca2edb4a8de3f0bf468a4fda17e8df651385cf700bf53d6c2f ChangeLog 33930
+MISC ChangeLog 34081 RMD160 698ffbbfba84d41b9492ad3240445be7d85a8cba SHA1 60654dce5df8cc021c981064c9269621b6f85686 SHA256 8a515534b7e041ba2bf10189853ad553310409dc517fed1388e81cb1b4984684
+MD5 27e156de78704dec1d7d4fffe6b6e565 ChangeLog 34081
+RMD160 698ffbbfba84d41b9492ad3240445be7d85a8cba ChangeLog 34081
+SHA256 8a515534b7e041ba2bf10189853ad553310409dc517fed1388e81cb1b4984684 ChangeLog 34081
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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
+ }        
+