[PATCH] Xgl doesn't compile with Mesa HEAD > 0821

[Brian Paul]

Chris Fairles wrote:
> This commit in mesa breaks Xgl as its expecting slang_verions_syn which has been renamed slang_pp_version_syn
> 
> 
> This is the Mesa commit
> 
> CVSROOT:	/cvs/mesa
> Module name:	Mesa
> Repository:	Mesa/src/mesa/shader/slang/library/
> Changes by:	michal at kemper.	06/08/21 09:25:11
> 
> Log message:
>   More GLSL preprocessor code:
>   Rename slang_version.syn to slang_pp_version.syn.
>   The #version directive understands version 120.
>   Cosmetic changes in version preprocessor.
>   Checks if requested version is supported by the compiler.
> 
> Modified files:
>       Mesa/src/mesa/shader/slang/:
>         slang_compile.c slang_preprocess.c slang_preprocess.h 
> Added files:
>       Mesa/src/mesa/shader/slang/library/:
>         slang_pp_version.syn slang_pp_version_syn.h 
> Removed files:
>       Mesa/src/mesa/shader/slang/library/:
>         slang_version.syn slang_version_syn.h 
>   
>   Revision      Changes    Path
>   1.24          +5 -0      Mesa/src/mesa/shader/slang/slang_compile.c
>   http://webcvs.freedesktop.org/mesa/Mesa/src/mesa/shader/slang/slang_compile.c
>   1.7           +37 -46    Mesa/src/mesa/shader/slang/slang_preprocess.c
>   http://webcvs.freedesktop.org/mesa/Mesa/src/mesa/shader/slang/slang_preprocess.c
>   1.4           +2 -1      Mesa/src/mesa/shader/slang/slang_preprocess.h
>   http://webcvs.freedesktop.org/mesa/Mesa/src/mesa/shader/slang/slang_preprocess.h
> 
> 
> patch to fix:
> 
> --- xgl/GL/symlink-mesa.sh      2006-07-14 12:58:12.000000000 -0400
> +++ xgl/GL/symlink-mesa.sh.new  2006-08-26 10:22:30.000000000 -0400
> @@ -468,7 +468,7 @@
>      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
>  }
>  

It would be nice if we could add/remove/rename Mesa sources files 
without always breaking the x.org build (or having to change x.org 
makefiles/scripts, etc.).

All the main Mesa sources are listed in the src/mesa/sources file. 
Excerpts:

MAIN_SOURCES = \
	main/api_arrayelt.c \
	main/api_loopback.c \
	main/api_noop.c \
	main/api_validate.c \
	main/accum.c \
	main/attrib.c \
[...]

SWRAST_SOURCES = \
	swrast/s_aaline.c \
	swrast/s_aatriangle.c \
	swrast/s_accum.c \
[...]

Perhaps a script/automake person could modify symlink-mesa.sh, 
Makefile.am, etc. to use/include this file and solve the problem.

-Brian