diff --git a/packages/graphics/mesa/meta b/packages/graphics/mesa/meta
index 4df579ad82..10321a7005 100644
--- a/packages/graphics/mesa/meta
+++ b/packages/graphics/mesa/meta
@@ -19,7 +19,8 @@
 ################################################################################
 
 PKG_NAME="mesa"
-PKG_VERSION="cf5948380829ff44aafb12c911b0fc064360d352"
+#PKG_VERSION="cf5948380829ff44aafb12c911b0fc064360d352"
+PKG_VERSION="a56a732c6991f47d63f5ccbb27a45467541c43f8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
diff --git a/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch b/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch
new file mode 100644
index 0000000000..a923448d60
--- /dev/null
+++ b/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch
@@ -0,0 +1,12 @@
+diff -Naur mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/configure.ac mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/configure.ac
+--- mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8/configure.ac	2012-01-08 05:01:59.000000000 +0100
++++ mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8.patch/configure.ac	2012-01-08 15:21:49.167895590 +0100
+@@ -1771,7 +1771,7 @@
+     if test "x$LLVM_CONFIG" != xno; then
+ 	LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
+ 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
+-	LLVM_LIBS="`$LLVM_CONFIG --libs`"
++	LLVM_LIBS="-lLLVM-$LLVM_VERSION"
+ 
+ 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+ 	DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
diff --git a/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch b/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch
new file mode 100644
index 0000000000..e8c1e75851
--- /dev/null
+++ b/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch
@@ -0,0 +1,81 @@
+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-cf5948380829ff44aafb12c911b0fc064360d352-llvm_so.patch b/packages/graphics/mesa/patches/mesa-cf5948380829ff44aafb12c911b0fc064360d352-llvm_so.patch
deleted file mode 100644
index a04d1c3f12..0000000000
--- a/packages/graphics/mesa/patches/mesa-cf5948380829ff44aafb12c911b0fc064360d352-llvm_so.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f/configure.ac mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f.patch/configure.ac
---- mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f/configure.ac	2011-11-01 13:28:47.000000000 +0100
-+++ mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f.patch/configure.ac	2011-11-01 15:56:10.046619433 +0100
-@@ -1738,7 +1738,7 @@
-     if test "x$LLVM_CONFIG" != xno; then
- 	LLVM_VERSION=`$LLVM_CONFIG --version`
- 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'`
--	LLVM_LIBS="`$LLVM_CONFIG --libs`"
-+	LLVM_LIBS="-lLLVM-$LLVM_VERSION"
- 
- 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
- 	DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"