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

[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-serv2636/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       |    4 +++-
 mesa/main/Makefile.am |    1 +
 symlink-mesa.sh       |    9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.1-mesa-6.5.2.patch	12 Dec 2006 14:54:17 -0000	1.2
+++ xorg-x11-server-1.1.1-mesa-6.5.2.patch	12 Dec 2006 15:25:41 -0000	1.3
@@ -1,5 +1,5 @@
---- 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
+--- xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-12 16:21:11.000000000 +0100
++++ xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-12 16:21:11.000000000 +0100
 @@ -62,6 +62,7 @@
                      light.c \
                      lines.c \
@@ -8,17 +8,9 @@
                      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 @@
+--- xorg-server-1.1.1/GL/symlink-mesa.sh.mesa-652	2006-12-12 16:21:11.000000000 +0100
++++ xorg-server-1.1.1/GL/symlink-mesa.sh	2006-12-12 16:24:51.000000000 +0100
+@@ -158,6 +158,8 @@
      action macros.h
      action matrix.c
      action matrix.h
@@ -27,7 +19,7 @@
      action mm.c
      action mm.h
      action mtypes.h
-@@ -469,6 +472,8 @@
+@@ -469,6 +471,8 @@
      action slang_fragment_builtin_gc.h
      action slang_shader_syn.h
      action slang_pp_version_syn.h
@@ -36,14 +28,28 @@
      action slang_vertex_builtin_gc.h
  }        
  
+@@ -550,6 +554,11 @@
+ 
+     action glapi.c
+     action glthread.c
++    action dispatch.h
++
++    src_dir src/mesa/main
++
++    action dispatch.c
+ }
+ 
+ #########
 --- 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
++++ xorg-server-1.1.1/GL/glx/Makefile.am	2006-12-12 16:21:11.000000000 +0100
+@@ -30,7 +30,9 @@
+ 	-I$(top_srcdir)/mi
+ 
  
- libglx_la_SOURCES = \
-+        dispatch.c \
+-nodist_libglx_la_SOURCES = indirect_size.h
++nodist_libglx_la_SOURCES = indirect_size.h \
 +        dispatch.h \
-         g_disptab.c \
-         g_disptab.h \
-         g_disptab_EXT.c \
++        dispatch.c
+ 
+ libglxdri_la_SOURCES = \
+         glxdri.c