rpms/mesa/devel glsl-build-fix.patch,1.1,1.2 mesa.spec,1.258,1.259

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20848

Modified Files:
	glsl-build-fix.patch mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.3
- another attempt at GLSL build fix


glsl-build-fix.patch:
 glsl/pp/sl_pp_macro.h              |    2 +-
 mesa/shader/slang/library/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: glsl-build-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/glsl-build-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glsl-build-fix.patch	20 Dec 2009 23:22:48 -0000	1.1
+++ glsl-build-fix.patch	20 Dec 2009 23:34:09 -0000	1.2
@@ -26,3 +26,16 @@ index 2967baf..1d21068 100644
 -- 
 1.6.5.2
 
+diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/shader/slang/library/Makefile
+index c696451..8ac7fd6 100644
+--- a/src/mesa/shader/slang/library/Makefile
++++ b/src/mesa/shader/slang/library/Makefile
+@@ -12,7 +12,7 @@ GLSL_CL = $(TOP)/src/glsl/apps/compile
+ 
+ .PHONY: default clean
+ 
+-default: builtin
++default: $(GLSL_CL) builtin
+ 
+ clean:
+ 	-rm -f *_gc.h


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -p -r1.258 -r1.259
--- mesa.spec	20 Dec 2009 23:22:48 -0000	1.258
+++ mesa.spec	20 Dec 2009 23:34:09 -0000	1.259
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.3
+- another attempt at GLSL build fix
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.2
 - add GLSL build fix from upstream + bump libdrm requires