From 879b3c616e6f7ace833f5d8bbc49adaa334ef2a5ccaeddbf2034b4fcc37cbe7a Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Fri, 29 Jul 2011 10:17:32 +0000 Subject: [PATCH] - Update to Mesa 7.11-rc3 - U_Mesa-7.11-llvm3.patch: fix compatibility with llvm 3.0 (and pre-releases) - gallium is now required for r300, r600 - nouveau is now built by default (except on < OS11.3) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=164 --- Mesa.changes | 8 ++ Mesa.spec | 68 ++++------ MesaLib-7.10.3.tar.bz2 | 3 - MesaLib-7.11-rc3.tar.bz2 | 3 + U_Mesa-7.11-llvm3.patch | 246 +++++++++++++++++++++++++++++++++++++ egl-buildfix.diff | 10 -- libdrm-2.4.26-nouveau.diff | 153 ----------------------- 7 files changed, 284 insertions(+), 207 deletions(-) delete mode 100644 MesaLib-7.10.3.tar.bz2 create mode 100644 MesaLib-7.11-rc3.tar.bz2 create mode 100644 U_Mesa-7.11-llvm3.patch delete mode 100644 egl-buildfix.diff delete mode 100644 libdrm-2.4.26-nouveau.diff diff --git a/Mesa.changes b/Mesa.changes index 34d9982..6b6824c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 29 10:10:31 UTC 2011 - mhopf@novell.com + +- Update to Mesa 7.11-rc3 +- U_Mesa-7.11-llvm3.patch: fix compatibility with llvm 3.0 (and pre-releases) +- gallium is now required for r300, r600 +- nouveau is now built by default (except on < OS11.3) + ------------------------------------------------------------------- Thu Jul 28 09:16:23 CEST 2011 - meissner@suse.de diff --git a/Mesa.spec b/Mesa.spec index c7cad99..d9e07cd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -17,20 +17,14 @@ # norootforbuild -%define enable_nouveau_gallium 1 -%define enable_radeon_gallium 1 +%define _version 7.11-rc3 -%define _version 7.10.3 - -Version: 7.10.3 -Release: 14 +Version: 7.11 +Release: 1 Name: Mesa -BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel -BuildRequires: bison flex libtalloc-devel libxml2-python -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif +BuildRequires: fdupes gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel +BuildRequires: bison fdupes flex libtalloc-devel libxml2-python llvm-devel Url: http://www.mesa3d.org License: MIT License (or similar) Group: System/Libraries @@ -50,11 +44,10 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source5: drirc # to be upstreamed -Patch8: egl-buildfix.diff Patch9: u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -Patch12: libdrm-2.4.26-nouveau.diff # already upstream +Patch13: U_Mesa-7.11-llvm3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +106,8 @@ Authors: -------- Brian Paul +%ifarch %ix86 x86_64 ppc %sparc hppa +%if 0%{?suse_version} >= 1130 %package nouveau3d License: MIT License (or similar) Requires: Mesa = %version xorg-x11-driver-video-nouveau @@ -132,6 +127,8 @@ Authors: Pekka Paalanen Ben Skeggs Francisco Jerez +%endif +%endif %prep %setup -n %{name}-%{_version} -b4 -q @@ -141,10 +138,9 @@ rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch8 %patch9 -p1 %patch11 -p1 -%patch12 -p1 +%patch13 -p0 %build @@ -155,38 +151,29 @@ export TALLOC_CFLAGS="-I/usr/include" autoreconf -fi ### libGL (disable savage/mga, bnc #402132/#403071; reenable mga, bnc #466635) %configure --disable-glw \ + --enable-gles1 \ --enable-gles2 \ --with-driver=dri \ --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ %ifarch %ix86 x86_64 + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,radeon,sis,tdfx,unichrome,swrast,mga \ %if 0%{?suse_version} >= 1130 - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast,nouveau,mga \ + --with-gallium-drivers=r300,r600,nouveau \ %else - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \ -%endif -%if %enable_nouveau_gallium - --enable-gallium-nouveau \ -%endif -%if %enable_radeon_gallium - --enable-gallium-radeon \ - --enable-gallium-r600 \ + --with-gallium-drivers=r300,r600 \ %endif %endif %ifarch ppc ppc64 %sparc hppa + --with-dri-drivers=i810,i915,i965,mach64,r128,r200,radeon,tdfx,unichrome,swrast \ %if 0%{?suse_version} >= 1130 - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast,nouveau \ + --with-gallium-drivers=r300,r600,nouveau \ %else - --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \ -%endif -%if %enable_nouveau_gallium - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600 \ %endif %endif -%ifarch s390 s390x - --with-dri-drivers=swrast \ -%endif -%ifarch %arm +%ifarch s390 s390x %arm --with-dri-drivers=swrast \ + --with-gallium-drivers="" \ %endif --disable-glut \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -198,7 +185,7 @@ make realclean --disable-glu \ --disable-glw \ --disable-glut \ - --disable-gallium \ + --with-gallium-drivers="" \ CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf make %{?jobs:-j%jobs} @@ -218,9 +205,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \ # global drirc file mkdir -p $RPM_BUILD_ROOT/etc install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc -%if 0%{?suse_version} > 1020 %fdupes -s $RPM_BUILD_ROOT/%_mandir -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -235,10 +220,9 @@ rm -rf $RPM_BUILD_ROOT %config /etc/drirc %{_libdir}/lib*.so.* %{_libdir}/dri/ -%{_libdir}/egl/ -%exclude %{_libdir}/dri/nouveau_dri.so +#%{_libdir}/egl/ %if 0%{?suse_version} >= 1130 -%exclude %{_libdir}/dri/nouveau_vieux_dri.so +%exclude %{_libdir}/dri/nouveau_dri.so %endif %files devel @@ -255,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libEGL.so %{_libdir}/libGLESv1_CM.so %{_libdir}/libGLESv2.so +%{_libdir}/libglapi.so %{_libdir}/pkgconfig/dri.pc %{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/gl.pc @@ -263,11 +248,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/glesv2.pc %{_mandir}/man3/* +%ifarch %ix86 x86_64 ppc %sparc hppa +%if 0%{?suse_version} >= 1130 %files nouveau3d %defattr(-,root,root) %{_libdir}/dri/nouveau_dri.so -%if 0%{?suse_version} >= 1130 -%{_libdir}/dri/nouveau_vieux_dri.so +%endif %endif %changelog diff --git a/MesaLib-7.10.3.tar.bz2 b/MesaLib-7.10.3.tar.bz2 deleted file mode 100644 index e6d61e0..0000000 --- a/MesaLib-7.10.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39b307fcf910e4f4f43e515097dc4fd40d19323163c8e8e9af757dc686eb5751 -size 6686992 diff --git a/MesaLib-7.11-rc3.tar.bz2 b/MesaLib-7.11-rc3.tar.bz2 new file mode 100644 index 0000000..8d74957 --- /dev/null +++ b/MesaLib-7.11-rc3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f5649668b4810f4be23412f9b5bfeb98c127d411cf999adb1a827f95d539ce9 +size 6633330 diff --git a/U_Mesa-7.11-llvm3.patch b/U_Mesa-7.11-llvm3.patch new file mode 100644 index 0000000..9def229 --- /dev/null +++ b/U_Mesa-7.11-llvm3.patch @@ -0,0 +1,246 @@ +Makes Mesa work with LLVM3 (also pre-releases). + +Included in Mesa in post-11.7 +Index: src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +=================================================================== +--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.orig ++++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -193,7 +193,11 @@ lp_disassemble(const void* func) + + InitializeAllDisassemblers(); + ++#if HAVE_LLVM >= 0x0300 ++ OwningPtr AsmInfo(T->createMCAsmInfo(Triple)); ++#else + OwningPtr AsmInfo(T->createAsmInfo(Triple)); ++#endif + + if (!AsmInfo) { + debug_printf("error: no assembly info for target %s\n", Triple.c_str()); +@@ -289,7 +293,11 @@ lp_disassemble(const void* func) + + pc += Size; + ++#if HAVE_LLVM >= 0x0300 ++ const MCInstrDesc &TID = TII->get(Inst.getOpcode()); ++#else + const TargetInstrDesc &TID = TII->get(Inst.getOpcode()); ++#endif + + /* + * Keep track of forward jumps to a nearby address. +Index: src/gallium/auxiliary/gallivm/lp_bld_type.c +=================================================================== +--- src/gallium/auxiliary/gallivm/lp_bld_type.c.orig ++++ src/gallium/auxiliary/gallivm/lp_bld_type.c +@@ -325,8 +325,10 @@ lp_typekind_name(LLVMTypeKind t) + return "LLVMArrayTypeKind"; + case LLVMPointerTypeKind: + return "LLVMPointerTypeKind"; ++#if HAVE_LLVM < 0x0300 + case LLVMOpaqueTypeKind: + return "LLVMOpaqueTypeKind"; ++#endif + case LLVMVectorTypeKind: + return "LLVMVectorTypeKind"; + case LLVMMetadataTypeKind: +Index: src/gallium/auxiliary/draw/draw_llvm.c +=================================================================== +--- src/gallium/auxiliary/draw/draw_llvm.c.orig ++++ src/gallium/auxiliary/draw/draw_llvm.c +@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm + * Create LLVM type for struct draw_jit_texture + */ + static LLVMTypeRef +-create_jit_texture_type(struct gallivm_state *gallivm) ++create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) + { + LLVMTargetDataRef target = gallivm->target; + LLVMTypeRef texture_type; +@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_s + elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = + LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); + ++#if HAVE_LLVM >= 0x0300 ++ texture_type = LLVMStructCreateNamed(gallivm->context, struct_name); ++ LLVMStructSetBody(texture_type, elem_types, ++ Elements(elem_types), 0); ++#else + texture_type = LLVMStructTypeInContext(gallivm->context, elem_types, + Elements(elem_types), 0); + ++ LLVMAddTypeName(gallivm->module, struct_name, texture_type); ++ + /* Make sure the target's struct layout cache doesn't return + * stale/invalid data. + */ + LLVMInvalidateStructLayout(gallivm->target, texture_type); ++#endif + + LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width, + target, texture_type, +@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_s + */ + static LLVMTypeRef + create_jit_context_type(struct gallivm_state *gallivm, +- LLVMTypeRef texture_type) ++ LLVMTypeRef texture_type, const char *struct_name) + { + LLVMTargetDataRef target = gallivm->target; + LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context); +@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_s + elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */ + elem_types[4] = LLVMArrayType(texture_type, + PIPE_MAX_VERTEX_SAMPLERS); /* textures */ +- ++#if HAVE_LLVM >= 0x0300 ++ context_type = LLVMStructCreateNamed(gallivm->context, struct_name); ++ LLVMStructSetBody(context_type, elem_types, ++ Elements(elem_types), 0); ++#else + context_type = LLVMStructTypeInContext(gallivm->context, elem_types, + Elements(elem_types), 0); ++ LLVMAddTypeName(gallivm->module, struct_name, context_type); + + LLVMInvalidateStructLayout(gallivm->target, context_type); ++#endif + + LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants, + target, context_type, 0); +@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_s + * Create LLVM type for struct pipe_vertex_buffer + */ + static LLVMTypeRef +-create_jit_vertex_buffer_type(struct gallivm_state *gallivm) ++create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name) + { + LLVMTargetDataRef target = gallivm->target; + LLVMTypeRef elem_types[3]; +@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gal + elem_types[1] = LLVMInt32TypeInContext(gallivm->context); + elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */ + ++#if HAVE_LLVM >= 0x0300 ++ vb_type = LLVMStructCreateNamed(gallivm->context, struct_name); ++ LLVMStructSetBody(vb_type, elem_types, ++ Elements(elem_types), 0); ++#else + vb_type = LLVMStructTypeInContext(gallivm->context, elem_types, + Elements(elem_types), 0); ++ LLVMAddTypeName(gallivm->module, struct_name, vb_type); + + LLVMInvalidateStructLayout(gallivm->target, vb_type); ++#endif + + LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride, + target, vb_type, 0); +@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_ + elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); + elem_types[2] = LLVMArrayType(elem_types[1], data_elems); + ++#if HAVE_LLVM >= 0x0300 ++ vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name); ++ LLVMStructSetBody(vertex_header, elem_types, ++ Elements(elem_types), 0); ++#else + vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types, + Elements(elem_types), 0); ++ LLVMAddTypeName(gallivm->module, struct_name, vertex_header); + + LLVMInvalidateStructLayout(gallivm->target, vertex_header); ++#endif + + /* these are bit-fields and we can't take address of them + LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask, +@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_ + target, vertex_header, + DRAW_JIT_VERTEX_DATA); + +- LLVMAddTypeName(gallivm->module, struct_name, vertex_header); +- + return vertex_header; + } + +@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm) + struct gallivm_state *gallivm = llvm->gallivm; + LLVMTypeRef texture_type, context_type, buffer_type, vb_type; + +- texture_type = create_jit_texture_type(gallivm); +- LLVMAddTypeName(gallivm->module, "texture", texture_type); ++ texture_type = create_jit_texture_type(gallivm, "texture"); + +- context_type = create_jit_context_type(gallivm, texture_type); +- LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type); ++ context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context"); + llvm->context_ptr_type = LLVMPointerType(context_type, 0); + + buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0); +- LLVMAddTypeName(gallivm->module, "buffer", buffer_type); + llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0); + +- vb_type = create_jit_vertex_buffer_type(gallivm); +- LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type); ++ vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer"); + llvm->vb_ptr_type = LLVMPointerType(vb_type, 0); + } + +Index: src/gallium/drivers/llvmpipe/lp_jit.c +=================================================================== +--- src/gallium/drivers/llvmpipe/lp_jit.c.orig ++++ src/gallium/drivers/llvmpipe/lp_jit.c +@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_cont + elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = + LLVMArrayType(LLVMFloatTypeInContext(lc), 4); + ++#if HAVE_LLVM >= 0x0300 ++ texture_type = LLVMStructCreateNamed(gallivm->context, "texture"); ++ LLVMStructSetBody(texture_type, elem_types, ++ Elements(elem_types), 0); ++#else + texture_type = LLVMStructTypeInContext(lc, elem_types, + Elements(elem_types), 0); ++ LLVMAddTypeName(gallivm->module, "texture", texture_type); + + LLVMInvalidateStructLayout(gallivm->target, texture_type); ++#endif + + LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width, + gallivm->target, texture_type, +@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_cont + + LP_CHECK_STRUCT_SIZE(struct lp_jit_texture, + gallivm->target, texture_type); +- +- LLVMAddTypeName(gallivm->module, "texture", texture_type); + } + + /* struct lp_jit_context */ +@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_cont + elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type, + PIPE_MAX_SAMPLERS); + ++#if HAVE_LLVM >= 0x0300 ++ context_type = LLVMStructCreateNamed(gallivm->context, "context"); ++ LLVMStructSetBody(context_type, elem_types, ++ Elements(elem_types), 0); ++#else + context_type = LLVMStructTypeInContext(lc, elem_types, + Elements(elem_types), 0); + + LLVMInvalidateStructLayout(gallivm->target, context_type); + ++ LLVMAddTypeName(gallivm->module, "context", context_type); ++#endif ++ + LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants, + gallivm->target, context_type, + LP_JIT_CTX_CONSTANTS); +@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_cont + LP_CHECK_STRUCT_SIZE(struct lp_jit_context, + gallivm->target, context_type); + +- LLVMAddTypeName(gallivm->module, "context", context_type); +- + lp->jit_context_ptr_type = LLVMPointerType(context_type, 0); + } + diff --git a/egl-buildfix.diff b/egl-buildfix.diff deleted file mode 100644 index 7520666..0000000 --- a/egl-buildfix.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/egl/drivers/glx/Makefile -+++ src/egl/drivers/glx/Makefile -@@ -11,6 +11,6 @@ - -I$(TOP)/src/egl/main - - EGL_CFLAGS = $(X11_CFLAGS) --EGL_LIBS = $(X11_LIBS) -lGL -+EGL_LIBS = $(X11_LIBS) -l$(GL_LIB) - - include ../Makefile.template diff --git a/libdrm-2.4.26-nouveau.diff b/libdrm-2.4.26-nouveau.diff deleted file mode 100644 index 24586e2..0000000 --- a/libdrm-2.4.26-nouveau.diff +++ /dev/null @@ -1,153 +0,0 @@ -Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ... - - --> https://bugs.freedesktop.org/show_bug.cgi?id=35562 - ---- 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 -+ - #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 -+ - #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 -+ - #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 -+ - #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 -+ - #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 -+ - #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 - #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 -+#include - #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 -+ - #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 -+ - #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 - #include - #include -+#include - #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 - #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 -+#include - #include "nouveau_driver.h" - #include "nouveau_context.h" - #include "nouveau_fbo.h" ---- Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h.orig 2011-06-20 16:48:59.000000000 +0200 -+++ Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h 2011-06-20 16:49:16.000000000 +0200 -@@ -37,6 +37,7 @@ - #undef NDEBUG - #include - -+#include - #include "nouveau_device.h" - #include "nouveau_pushbuf.h" - #include "nouveau_grobj.h"