diff --git a/Mesa.changes b/Mesa.changes index 4f8dc8a..9960345 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 5 06:57:26 UTC 2010 - sndirsch@novell.com + +- MesaLib 7.9 +- obsoletes commit-73dab75.diff + ------------------------------------------------------------------- Thu Sep 30 09:49:13 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index ef8ad3d..9099d8b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-rc2.tar.bz2 +Source: MesaLib-%{_version}.tar.bz2 Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -55,7 +55,6 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-73dab75.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +134,7 @@ Authors: Francisco Jerez %prep -%setup -n %{name}-%{_version}-rc2 -a1 -b4 -q +%setup -n %{name}-%{_version} -a1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut @@ -147,7 +146,6 @@ sed -i 's/REPLACE/%_lib/g' src/glx/Makefile sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 -%patch10 -p1 %build diff --git a/MesaLib-7.9-rc2.tar.bz2 b/MesaLib-7.9-rc2.tar.bz2 deleted file mode 100644 index eb9d799..0000000 --- a/MesaLib-7.9-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21dd2333571e0843cc3f306d3e1448e6ef147ae03faa8b7245192720d5b7843f -size 5676582 diff --git a/MesaLib-7.9.tar.bz2 b/MesaLib-7.9.tar.bz2 new file mode 100644 index 0000000..b3ef4c7 --- /dev/null +++ b/MesaLib-7.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3 +size 5678494 diff --git a/commit-73dab75.diff b/commit-73dab75.diff deleted file mode 100644 index aef9aab..0000000 --- a/commit-73dab75.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac -Author: Zhenyu Wang -Date: Sun Sep 26 13:15:39 2010 +0800 - - i965: fallback lineloop on sandybridge for now - - Until we fixed GS hang issue. - -diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c -index 16331cc..6a4dda2 100644 ---- a/src/mesa/drivers/dri/i965/brw_draw.c -+++ b/src/mesa/drivers/dri/i965/brw_draw.c -@@ -204,6 +204,13 @@ static GLboolean check_fallbacks( struct brw_context *brw, - GLcontext *ctx = &brw->intel.ctx; - GLuint i; - -+ /* XXX FIXME */ -+ if (brw->intel.gen >= 6) { -+ for (i = 0; i < nr_prims; i++) -+ if (prim[i].mode == GL_LINE_LOOP) -+ return GL_TRUE; -+ } -+ - /* If we don't require strict OpenGL conformance, never - * use fallbacks. If we're forcing fallbacks, always - * use fallfacks.