diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index eee0d623f4..77b1e1c2d6 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="8.0" +PKG_VERSION="8.0.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://freedesktop.org/pub/mesa/8.0/MesaLib-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2" PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11" PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" PKG_PRIORITY="optional" diff --git a/packages/graphics/Mesa/patches/Mesa-8.0-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch b/packages/graphics/Mesa/patches/Mesa-8.0-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch deleted file mode 100644 index e8c1e75851..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-8.0-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/src/mesa/drivers/dri/i965/brw_fs.h mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/src/mesa/drivers/dri/i965/brw_fs.h ---- mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/src/mesa/drivers/dri/i965/brw_fs.h 2012-01-08 05:01:59.000000000 +0100 -+++ mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/src/mesa/drivers/dri/i965/brw_fs.h 2012-01-08 15:56:45.452078012 +0100 -@@ -534,11 +534,6 @@ - - void emit_color_write(int target, int index, int first_color_mrf); - void emit_fb_writes(); -- bool try_rewrite_rhs_to_dst(ir_assignment *ir, -- fs_reg dst, -- fs_reg src, -- fs_inst *pre_rhs_inst, -- fs_inst *last_rhs_inst); - void emit_assignment_writes(fs_reg &l, fs_reg &r, - const glsl_type *type, bool predicated); - void resolve_ud_negate(fs_reg *reg); -diff -Naur mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp ---- mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp 2012-01-08 05:01:59.000000000 +0100 -+++ mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp 2012-01-08 15:56:45.453078031 +0100 -@@ -528,42 +528,6 @@ - } - } - --/* If the RHS processing resulted in an instruction generating a -- * temporary value, and it would be easy to rewrite the instruction to -- * generate its result right into the LHS instead, do so. This ends -- * up reliably removing instructions where it can be tricky to do so -- * later without real UD chain information. -- */ --bool --fs_visitor::try_rewrite_rhs_to_dst(ir_assignment *ir, -- fs_reg dst, -- fs_reg src, -- fs_inst *pre_rhs_inst, -- fs_inst *last_rhs_inst) --{ -- if (pre_rhs_inst == last_rhs_inst) -- return false; /* No instructions generated to work with. */ -- -- /* Only attempt if we're doing a direct assignment. */ -- if (ir->condition || -- !(ir->lhs->type->is_scalar() || -- (ir->lhs->type->is_vector() && -- ir->write_mask == (1 << ir->lhs->type->vector_elements) - 1))) -- return false; -- -- /* Make sure the last instruction generated our source reg. */ -- if (last_rhs_inst->predicated || -- last_rhs_inst->force_uncompressed || -- last_rhs_inst->force_sechalf || -- !src.equals(&last_rhs_inst->dst)) -- return false; -- -- /* Success! Rewrite the instruction. */ -- last_rhs_inst->dst = dst; -- -- return true; --} -- - void - fs_visitor::visit(ir_assignment *ir) - { -@@ -574,19 +538,12 @@ - ir->lhs->accept(this); - l = this->result; - -- fs_inst *pre_rhs_inst = (fs_inst *) this->instructions.get_tail(); -- - ir->rhs->accept(this); - r = this->result; - -- fs_inst *last_rhs_inst = (fs_inst *) this->instructions.get_tail(); -- - assert(l.file != BAD_FILE); - assert(r.file != BAD_FILE); - -- if (try_rewrite_rhs_to_dst(ir, l, r, pre_rhs_inst, last_rhs_inst)) -- return; -- - if (ir->condition) { - emit_bool_to_cond_code(ir->condition); - } diff --git a/packages/graphics/Mesa/patches/Mesa-8.0-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-8.0.1-llvm_so.patch similarity index 100% rename from packages/graphics/Mesa/patches/Mesa-8.0-llvm_so.patch rename to packages/graphics/Mesa/patches/Mesa-8.0.1-llvm_so.patch