- rebase again to fix r300

mesa.spec

@@ -37,6 +37,7 @@ Source3: make-git-snapshot.sh
 
 Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
 
+Patch0: nouveau-build-fix.patch
 Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
@@ -177,6 +178,7 @@ Group: User Interface/X Hardware Support
 %prep
 #setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
 %setup -q -n mesa-%{gitdate} -b2 -b5
+%patch0 -p1 -b .nouveau-build
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64

nouveau-build-fix.patch

@@ -0,0 +1,121 @@
+From adf4c1ae10c172222690bf8ec2496cec8ce151dd Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 4 Feb 2010 10:00:13 +1000
+Subject: [PATCH] nouveau: include stdio.h and u_inlines.h in all context files since embedded changes
+
+fixes nouveau build for me.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+ src/gallium/drivers/nv04/nv04_context.h |    2 ++
+ src/gallium/drivers/nv10/nv10_context.h |    2 ++
+ src/gallium/drivers/nv20/nv20_context.h |    2 ++
+ src/gallium/drivers/nv30/nv30_context.h |    3 +++
+ src/gallium/drivers/nv40/nv40_context.h |    3 +++
+ src/gallium/drivers/nv50/nv50_context.h |    2 ++
+ 6 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/src/gallium/drivers/nv04/nv04_context.h b/src/gallium/drivers/nv04/nv04_context.h
+index fe3b527..1810dde 100644
+--- a/src/gallium/drivers/nv04/nv04_context.h
++++ b/src/gallium/drivers/nv04/nv04_context.h
+@@ -1,6 +1,8 @@
+ #ifndef __NV04_CONTEXT_H__
+ #define __NV04_CONTEXT_H__
+ 
++#include <stdio.h>
++
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
+index ab4b825..f0dcbe3 100644
+--- a/src/gallium/drivers/nv10/nv10_context.h
++++ b/src/gallium/drivers/nv10/nv10_context.h
+@@ -1,6 +1,8 @@
+ #ifndef __NV10_CONTEXT_H__
+ #define __NV10_CONTEXT_H__
+ 
++#include <stdio.h>
++
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+diff --git a/src/gallium/drivers/nv20/nv20_context.h b/src/gallium/drivers/nv20/nv20_context.h
+index c7dfada..270f648 100644
+--- a/src/gallium/drivers/nv20/nv20_context.h
++++ b/src/gallium/drivers/nv20/nv20_context.h
+@@ -1,6 +1,8 @@
+ #ifndef __NV20_CONTEXT_H__
+ #define __NV20_CONTEXT_H__
+ 
++#include <stdio.h>
++
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
+index e594492..7d05338 100644
+--- a/src/gallium/drivers/nv30/nv30_context.h
++++ b/src/gallium/drivers/nv30/nv30_context.h
+@@ -1,6 +1,8 @@
+ #ifndef __NV30_CONTEXT_H__
+ #define __NV30_CONTEXT_H__
+ 
++#include <stdio.h>
++
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+@@ -8,6 +10,7 @@
+ 
+ #include "util/u_memory.h"
+ #include "util/u_math.h"
++#include "util/u_inlines.h"
+ 
+ #include "draw/draw_vertex.h"
+ 
+diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
+index e219bb5..3998cf2 100644
+--- a/src/gallium/drivers/nv40/nv40_context.h
++++ b/src/gallium/drivers/nv40/nv40_context.h
+@@ -1,6 +1,8 @@
+ #ifndef __NV40_CONTEXT_H__
+ #define __NV40_CONTEXT_H__
+ 
++#include <stdio.h>
++
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+@@ -8,6 +10,7 @@
+ 
+ #include "util/u_memory.h"
+ #include "util/u_math.h"
++#include "util/u_inlines.h"
+ 
+ #include "draw/draw_vertex.h"
+ 
+diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
+index bebcd95..44d8f61 100644
+--- a/src/gallium/drivers/nv50/nv50_context.h
++++ b/src/gallium/drivers/nv50/nv50_context.h
+@@ -1,6 +1,7 @@
+ #ifndef __NV50_CONTEXT_H__
+ #define __NV50_CONTEXT_H__
+ 
++#include <stdio.h>
+ #include "pipe/p_context.h"
+ #include "pipe/p_defines.h"
+ #include "pipe/p_state.h"
+@@ -8,6 +9,7 @@
+ 
+ #include "util/u_memory.h"
+ #include "util/u_math.h"
++#include "util/u_inlines.h"
+ 
+ #include "draw/draw_vertex.h"
+ 
+-- 
+1.6.5.2
+