summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@fedoraproject.org>2009-12-20 23:34:09 +0000
committerDave Airlie <airlied@fedoraproject.org>2009-12-20 23:34:09 +0000
commit2fb06b06850faa1a7e8e7f193baebaaf5aacf821 (patch)
tree2190ee4f88730976d35e743081dd16056c5c1fdd
parent2b04ed97a472e7ee1396f64aeb6212badec08dce (diff)
downloadmesa-2fb06b06850faa1a7e8e7f193baebaaf5aacf821.tar.gz
mesa-2fb06b06850faa1a7e8e7f193baebaaf5aacf821.tar.xz
mesa-2fb06b06850faa1a7e8e7f193baebaaf5aacf821.zip
- another attempt at GLSL build fixmesa-7_8-0_3_fc13
-rw-r--r--glsl-build-fix.patch13
-rw-r--r--mesa.spec5
2 files changed, 17 insertions, 1 deletions
diff --git a/glsl-build-fix.patch b/glsl-build-fix.patch
index 7fd10a5..0b60686 100644
--- a/glsl-build-fix.patch
+++ b/glsl-build-fix.patch
@@ -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
diff --git a/mesa.spec b/mesa.spec
index 1c9a74b..90d3c71 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -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@redhat.com> 7.8-0.3
+- another attempt at GLSL build fix
+
* Mon Dec 21 2009 Dave Airlie <airlied@redhat.com> 7.8-0.2
- add GLSL build fix from upstream + bump libdrm requires