rpms/vnc/devel vnc-mesa-6.5.2.patch,1.5,1.6

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12801/vnc/devel

Modified Files:
	vnc-mesa-6.5.2.patch 
Log Message:
Fixed building against mesa-6.5.2


vnc-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: vnc-mesa-6.5.2.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-mesa-6.5.2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vnc-mesa-6.5.2.patch	11 Dec 2006 13:36:04 -0000	1.5
+++ vnc-mesa-6.5.2.patch	13 Dec 2006 08:44:50 -0000	1.6
@@ -1,30 +1,55 @@
---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/swrast/Makefile.am.mesa-652	2006-12-11 13:58:23.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/swrast/Makefile.am	2006-12-11 13:58:50.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@GLX_DEFINES@
- 
- INCLUDES = -I at MESA_SOURCE@/include \
-+           -I at MESA_SOURCE@/src/mesa/main \
-            -I../X \
-            -I../array_cache \
-            -I../glapi \
---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-11 13:57:58.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-11 13:57:58.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@GLX_DEFINES@
- 
- INCLUDES = -I at MESA_SOURCE@/include \
-+           -I at MESA_SOURCE@/src/mesa/main \
-            -I../X \
-            -I../array_cache \
-            -I../glapi \
---- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am.mesa-652	2006-12-11 14:22:25.000000000 +0100
-+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/shader/slang/Makefile.am	2006-12-11 14:22:50.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 \
+--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-12 16:21:11.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/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 \
+                     matrix.c \
++                    mipmap.c \
+                     mm.c \
+                     occlude.c \
+                     pixel.c \
+--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/symlink-mesa.sh.mesa-652	2006-12-12 16:21:11.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/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
++    action mipmap.c
++    action mipmap.h
+     action mm.c
+     action mm.h
+     action mtypes.h
+@@ -469,6 +471,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
+ }        
+ 
+@@ -550,6 +554,11 @@
+ 
+     action glapi.c
+     action glthread.c
++    action dispatch.h
++
++    src_dir src/mesa/main
++
++    action dispatch.c
+ }
+ 
+ #########
+--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/glx/Makefile.am.mesa-652	2006-07-05 20:31:36.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/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
+ 
+ 
+-nodist_libglx_la_SOURCES = indirect_size.h
++nodist_libglx_la_SOURCES = indirect_size.h \
++        dispatch.h \
++        dispatch.c
+ 
+ libglxdri_la_SOURCES = \
+         glxdri.c