main/mesa: upgrade to 7.10.2 and enable nouveau again

1 files changed, 139 insertions, 0 deletions

diff --git a/main/mesa/Mesa-7.10.1-nouveau-compile.patch b/main/mesa/Mesa-7.10.1-nouveau-compile.patch
new file mode 100644
index 000000000..96dafceb0
--- /dev/null
+++ b/main/mesa/Mesa-7.10.1-nouveau-compile.patch
@@ -0,0 +1,139 @@
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c.ark	2011-04-11 10:26:00.717291484 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c	2011-04-11 10:26:05.600624698 +0200
+@@ -24,6 +24,8 @@
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ void
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c.ark	2011-04-11 10:25:55.913958268 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c	2011-04-11 10:26:00.663958154 +0200
+@@ -23,6 +23,8 @@
+ #include "draw/draw_context.h"
+ #include "pipe/p_defines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_screen.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c.ark	2011-04-11 10:25:50.250625073 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c	2011-04-11 10:25:55.873958269 +0200
+@@ -4,6 +4,8 @@
+ #include "util/u_format.h"
+ #include "util/u_split_prim.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ 
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c.ark	2011-04-11 10:25:44.790625206 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c	2011-04-11 10:25:50.183958407 +0200
+@@ -23,6 +23,8 @@
+ #include "pipe/p_context.h"
+ #include "util/u_inlines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ struct nv50_query {
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c.ark	2011-04-11 10:25:32.790625497 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c	2011-04-11 10:25:38.633958688 +0200
+@@ -23,6 +23,8 @@
+ #include "util/u_format_s3tc.h"
+ #include "pipe/p_screen.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_screen.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c.ark	2011-04-11 10:25:38.710625354 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c	2011-04-11 10:25:44.713958540 +0200
+@@ -26,6 +26,8 @@
+ #include "pipe/p_state.h"
+ #include "util/u_inlines.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ 
+ static void
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c.ark	2011-04-11 10:25:27.520625626 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c	2011-04-11 10:25:32.737292166 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "util/u_format.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "nouveau/nouveau_stateobj.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c.ark	2011-04-11 10:25:22.407292417 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c	2011-04-11 10:25:27.450625628 +0200
+@@ -22,6 +22,7 @@
+ 
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau/nouveau_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c.ark	2011-04-11 10:25:14.903959267 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c	2011-04-11 10:25:22.353959086 +0200
+@@ -4,6 +4,8 @@
+ #include "util/u_format.h"
+ #include "util/u_math.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_transfer.h"
+ #include "nv50_resource.h"
+--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c.ark	2011-04-11 10:25:01.717292921 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c	2011-04-11 10:25:14.850625935 +0200
+@@ -26,6 +26,8 @@
+ #include "util/u_format.h"
+ #include "util/u_split_prim.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
++
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ 
+--- Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c.ark	2011-04-11 10:23:22.800628664 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c	2011-04-11 10:25:01.640626257 +0200
+@@ -39,6 +39,7 @@
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+ 
+ #include "nouveau/nv_object.xml.h"
+--- Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c.ark	2011-04-11 10:27:59.380621927 +0200
++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c	2011-04-11 10:28:02.833955176 +0200
+@@ -3,6 +3,7 @@
+ #include "util/u_format_s3tc.h"
+ #include "util/u_simple_screen.h"
+ 
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau/nouveau_screen.h"
+ #include "nouveau/nv_object.xml.h"
+ #include "nvfx_context.h"
+--- Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c.ark	2011-04-11 10:27:27.220622711 +0200
++++ Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c	2011-04-11 11:09:24.147228063 +0200
+@@ -24,6 +24,8 @@
+  *
+  */
+ 
++#include <stdint.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nouveau_driver.h"
+ #include "nouveau_context.h"
+ #include "nouveau_fbo.h"