rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-mesa-6.5.2.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22492/xorg-x11-server/devel

Modified Files:
	xorg-x11-server-1.1.1-mesa-6.5.2.patch 
Log Message:
fixed building against mesa-6.5.2


xorg-x11-server-1.1.1-mesa-6.5.2.patch:
 glx/Makefile.am       |    2 ++
 mesa/main/Makefile.am |    1 +
 symlink-mesa.sh       |    5 +++++
 3 files changed, 8 insertions(+)

Index: xorg-x11-server-1.1.1-mesa-6.5.2.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-mesa-6.5.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-mesa-6.5.2.patch	11 Dec 2006 13:49:21 -0000	1.1
+++ xorg-x11-server-1.1.1-mesa-6.5.2.patch	12 Dec 2006 14:54:17 -0000	1.2
@@ -1,30 +1,49 @@
---- xorg-server-1.1.1/GL/mesa/swrast/Makefile.am.mesa-652	2006-07-05 20:31:36.000000000 +0200
-+++ xorg-server-1.1.1/GL/mesa/swrast/Makefile.am	2006-12-11 13:57:00.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@GLX_DEFINES@
+--- xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-12 15:20:29.000000000 +0100
++++ xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-12 15:20:30.000000000 +0100
+@@ -62,6 +62,7 @@
+                     light.c \
+                     lines.c \
+                     matrix.c \
++                    mipmap.c \
+                     mm.c \
+                     occlude.c \
+                     pixel.c \
+--- xorg-server-1.1.1/GL/symlink-mesa.sh.mesa-652	2006-12-12 15:20:29.000000000 +0100
++++ xorg-server-1.1.1/GL/symlink-mesa.sh	2006-12-12 15:50:11.000000000 +0100
+@@ -116,6 +116,7 @@
+     action depth.h
+     action depthstencil.c
+     action depthstencil.h
++    action dispatch.c
+     action dlist.c
+     action dlist.h
+     action drawpix.c
+@@ -158,6 +159,8 @@
+     action macros.h
+     action matrix.c
+     action matrix.h
++    action mipmap.c
++    action mipmap.h
+     action mm.c
+     action mm.h
+     action mtypes.h
+@@ -469,6 +472,8 @@
+     action slang_fragment_builtin_gc.h
+     action slang_shader_syn.h
+     action slang_pp_version_syn.h
++    action slang_pp_directives_syn.h
++    action slang_pp_expression_syn.h
+     action slang_vertex_builtin_gc.h
+ }        
  
- INCLUDES = -I at MESA_SOURCE@/include \
-+           -I at MESA_SOURCE@/src/mesa/main \
-            -I../X \
-            -I../array_cache \
-            -I../glapi \
---- xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-11 13:57:00.000000000 +0100
-+++ xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-11 13:57:00.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@GLX_DEFINES@
+--- xorg-server-1.1.1/GL/glx/Makefile.am.mesa-652	2006-07-05 20:31:36.000000000 +0200
++++ xorg-server-1.1.1/GL/glx/Makefile.am	2006-12-12 15:52:11.000000000 +0100
+@@ -36,6 +36,8 @@
+         glxdri.c
  
- INCLUDES = -I at MESA_SOURCE@/include \
-+           -I at MESA_SOURCE@/src/mesa/main \
-            -I../X \
-            -I../array_cache \
-            -I../glapi \
---- xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am.mesa-652	2006-12-11 14:10:36.000000000 +0100
-+++ xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am	2006-12-11 14:11:11.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@GLX_DEFINES@
- 
- INCLUDES = -I at MESA_SOURCE@/include \
-+           -I at MESA_SOURCE@/src/mesa/shader/slang \
-            -I../grammar \
-            -I../../X \
-            -I../../array_cache \
+ libglx_la_SOURCES = \
++        dispatch.c \
++        dispatch.h \
+         g_disptab.c \
+         g_disptab.h \
+         g_disptab_EXT.c \