diff --git a/packages/graphics/Mesa/patches/Mesa-8.0.2-git_9b3ac17.patch b/packages/graphics/Mesa/patches/Mesa-8.0.2-git_9b3ac17.patch
new file mode 100644
index 0000000000..6caf64c3cf
--- /dev/null
+++ b/packages/graphics/Mesa/patches/Mesa-8.0.2-git_9b3ac17.patch
@@ -0,0 +1,72 @@
+diff -Naur Mesa-8.0.2-old/src/mesa/drivers/dri/i915/intel_screen.c Mesa-8.0.2-new/src/mesa/drivers/dri/i915/intel_screen.c
+--- Mesa-8.0.2-old/src/mesa/drivers/dri/i915/intel_screen.c	2012-03-21 10:55:52.000000000 -0700
++++ Mesa-8.0.2-new/src/mesa/drivers/dri/i915/intel_screen.c	2012-04-17 19:58:45.000000000 -0700
+@@ -118,13 +118,15 @@
+    if (intel == NULL)
+       return;
+ 
+-   if (intel->gen < 4)
+-      INTEL_FIREVERTICES(intel);
++   if (intel != NULL) {
++      if (intel->gen < 4)
++         INTEL_FIREVERTICES(intel);
+ 
+-   intel->need_throttle = true;
++      intel->need_throttle = true;
+ 
+-   if (intel->batch.used)
+-      intel_batchbuffer_flush(intel);
++      if (intel->batch.used)
++         intel_batchbuffer_flush(intel);
++   }
+ }
+ 
+ static const struct __DRI2flushExtensionRec intelFlushExtension = {
+diff -Naur Mesa-8.0.2-old/src/mesa/drivers/dri/i965/intel_screen.c Mesa-8.0.2-new/src/mesa/drivers/dri/i965/intel_screen.c
+--- Mesa-8.0.2-old/src/mesa/drivers/dri/i965/intel_screen.c	2012-03-21 10:55:52.000000000 -0700
++++ Mesa-8.0.2-new/src/mesa/drivers/dri/i965/intel_screen.c	2012-04-17 19:58:45.000000000 -0700
+@@ -118,13 +118,15 @@
+    if (intel == NULL)
+       return;
+ 
+-   if (intel->gen < 4)
+-      INTEL_FIREVERTICES(intel);
++   if (intel != NULL) {
++      if (intel->gen < 4)
++         INTEL_FIREVERTICES(intel);
+ 
+-   intel->need_throttle = true;
++      intel->need_throttle = true;
+ 
+-   if (intel->batch.used)
+-      intel_batchbuffer_flush(intel);
++      if (intel->batch.used)
++         intel_batchbuffer_flush(intel);
++   }
+ }
+ 
+ static const struct __DRI2flushExtensionRec intelFlushExtension = {
+diff -Naur Mesa-8.0.2-old/src/mesa/drivers/dri/intel/intel_screen.c Mesa-8.0.2-new/src/mesa/drivers/dri/intel/intel_screen.c
+--- Mesa-8.0.2-old/src/mesa/drivers/dri/intel/intel_screen.c	2012-03-21 10:55:52.000000000 -0700
++++ Mesa-8.0.2-new/src/mesa/drivers/dri/intel/intel_screen.c	2012-04-17 19:58:45.000000000 -0700
+@@ -118,13 +118,15 @@
+    if (intel == NULL)
+       return;
+ 
+-   if (intel->gen < 4)
+-      INTEL_FIREVERTICES(intel);
++   if (intel != NULL) {
++      if (intel->gen < 4)
++         INTEL_FIREVERTICES(intel);
+ 
+-   intel->need_throttle = true;
++      intel->need_throttle = true;
+ 
+-   if (intel->batch.used)
+-      intel_batchbuffer_flush(intel);
++      if (intel->batch.used)
++         intel_batchbuffer_flush(intel);
++   }
+ }
+ 
+ static const struct __DRI2flushExtensionRec intelFlushExtension = {