Mesa: update to Mesa-7.11-ac8f59b

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-06-26 19:15:34 +02:00
parent 3bdf8a2556
commit e061f018ae
7 changed files with 55 additions and 312 deletions

View File

@ -77,54 +77,74 @@ fi
get_graphicdrivers() {
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia vmware"
fi
for drv in $GRAPHIC_DRIVERS; do
[ "$drv" = "i915" ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
[ "$drv" = "i965" ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
[ "$drv" = "r200" ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
# [ "$drv" = "r300" ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
# [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
[ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
# [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
[ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
if [ "$drv" = "fglrx" ]; then
DRI_DRIVERS="$DRI_DRIVERS"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
XORG_DRIVERS="$XORG_DRIVERS fglrx"
COMPOSITE_SUPPORT="yes"
XINERAMA_SUPPORT="yes"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
if [ "$drv" = "i915" ]; then
DRI_DRIVERS="$DRI_DRIVERS,i915"
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
XORG_DRIVERS="$XORG_DRIVERS intel"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ]; then
XORG_DRIVERS="$XORG_DRIVERS ati"
if [ "$drv" = "i965" ]; then
DRI_DRIVERS="$DRI_DRIVERS,i965"
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
XORG_DRIVERS="$XORG_DRIVERS intel"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "nouveau" ]; then
# DRI_DRIVERS="$DRI_DRIVERS,nouveau"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
XORG_DRIVERS="$XORG_DRIVERS nouveau"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "nvidia" ]; then
DRI_DRIVERS="$DRI_DRIVERS"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
XORG_DRIVERS="$XORG_DRIVERS nvidia"
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "fglrx" ]; then
XORG_DRIVERS="$XORG_DRIVERS fglrx"
COMPOSITE_SUPPORT="yes"
XINERAMA_SUPPORT="yes"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "omapfb" ]; then
DRI_DRIVERS="$DRI_DRIVERS,swrast"
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
XORG_DRIVERS="$XORG_DRIVERS ompafb"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "r300" ]; then
# DRI_DRIVERS="$DRI_DRIVERS,r300"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
XORG_DRIVERS="$XORG_DRIVERS ati"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "r600" ]; then
# DRI_DRIVERS="$DRI_DRIVERS,r600"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
XORG_DRIVERS="$XORG_DRIVERS ati"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "vmware" ]; then
XINERAMA_SUPPORT="yes"
# LLVM_SUPPORT="yes"
fi
done
}

View File

@ -32,48 +32,10 @@ get_graphicdrivers
# TODO:
LDFLAGS=""
MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
if [ "$LLVM_SUPPORT" = "yes" ]; then
export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
MESA_CONFIG="$MESA_CONFIG --enable-gallium --enable-gallium-llvm"
fi
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = i915 ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
# MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
if [ "$drv" = i965 ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
# MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
if [ "$drv" = r300 -o "$drv" = radeon ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'`
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'`
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
if [ "$drv" = r600 ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
if [ "$drv" = nouveau ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'`
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
if [ "$drv" = vmware ]; then
MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'`
MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
fi
done
cd $PKG_BUILD
HOST_CC="$HOST_CC" \
@ -99,11 +61,23 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
--disable-glut \
--disable-glw \
--disable-motif \
$MESA_CONFIG \
--with-gallium-drivers="$GALLIUM_DRIVERS" \
--with-driver="dri" \
--with-dri-drivers="$MESA_DRIVERS" \
--with-dri-drivers="$DRI_DRIVERS" \
--with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
make CC="$HOST_CC" \
CXX="$HOST_CXX" \
CFLAGS="$HOST_CFLAGS" \
CXXFLAGS="$HOST_CXXFLAGS" \
LDFLAGS="$HOST_LDFLAGS" \
-C src/glsl builtin_compiler
cp src/glsl/builtin_compiler $ROOT/$TOOLCHAIN/bin
make -C src/glsl clean
sed -e "s#\.\/builtin_compiler#$ROOT/$TOOLCHAIN/bin/builtin_compiler#g" -i src/glsl/Makefile
make
$MAKEINSTALL -C src/mesa

View File

@ -19,12 +19,13 @@
################################################################################
PKG_NAME="Mesa"
PKG_VERSION="7.10.3"
PKG_VERSION="7.11-ac8f59b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
#PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
PKG_PRIORITY="optional"
@ -41,8 +42,3 @@ if [ "$LLVM_SUPPORT" = "yes" ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
PKG_DEPENDS="$PKG_DEPENDS llvm"
fi
if [ "$MESA_MASTER" = "yes" ]; then
PKG_VERSION="7.11-git2812b60"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
fi

View File

@ -1,15 +0,0 @@
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:30:39.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/r200/r200_cmdbuf.c 2011-03-02 17:31:59.000000000 -0800
@@ -47,9 +47,8 @@
*/
#define insert_at_tail_if(atom_list, atom) \
do { \
- struct radeon_state_atom* __atom = (atom); \
- if (__atom->check) \
- insert_at_tail((atom_list), __atom); \
+ if ((atom)->check) \
+ insert_at_tail((atom_list), (atom)); \
} while(0)
void r200SetUpAtomList( r200ContextPtr rmesa )

View File

@ -1,208 +0,0 @@
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h
--- Mesa-7.10.1-old/src/gallium/drivers/nv50/nv50_context.h 2010-12-15 15:02:44.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nv50/nv50_context.h 2011-03-02 17:31:09.000000000 -0800
@@ -15,6 +15,8 @@
#include "nouveau/nouveau_winsys.h"
#include "nouveau/nouveau_gldefs.h"
+/* Hack to silence warnings caused by nouveau/nouveau_stateobj.h using BEGIN_BIND marcro */
+#include <nouveau/nv04_pushbuf.h>
#include "nouveau/nouveau_stateobj.h"
#include "nv50_reg.h"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nv04_2d.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nv04_2d.c 2011-03-02 17:31:09.000000000 -0800
@@ -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"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_buffer.c 2010-12-15 15:02:44.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_buffer.c 2011-03-02 17:31:09.000000000 -0800
@@ -1,4 +1,3 @@
-
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_math.h"
diff -Naur Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c
--- Mesa-7.10.1-old/src/gallium/drivers/nvfx/nvfx_screen.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/gallium/drivers/nvfx/nvfx_screen.c 2011-03-02 17:31:09.000000000 -0800
@@ -10,6 +10,8 @@
#include "nvfx_resource.h"
#include "nvfx_tex.h"
+#include "nouveau/nv04_pushbuf.h"
+
#define NV30_3D_CHIPSET_3X_MASK 0x00000003
#define NV34_3D_CHIPSET_3X_MASK 0x00000010
#define NV35_3D_CHIPSET_3X_MASK 0x000001e0
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv04_driver.h 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv04_driver.h 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#define __NV04_DRIVER_H__
#include "nv04_context.h"
+#include "nv04_pushbuf.h"
enum {
NOUVEAU_STATE_BLEND = NUM_NOUVEAU_STATE,
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_render.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_render.c 2011-03-02 17:31:09.000000000 -0800
@@ -27,6 +27,7 @@
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
#define NUM_VERTEX_ATTRS 8
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_util.h"
#include "nv_object.xml.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
static inline unsigned
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_frag.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nv10_3d.xml.h"
#include "nouveau_util.h"
#include "nv10_driver.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
#define RC_IN_SHIFT_A 24
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-01-25 15:52:45.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_raster.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tex.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_texture.h"
#include "nv10_3d.xml.h"
#include "nouveau_util.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv10_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_render.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_render.c 2011-03-02 17:31:09.000000000 -0800
@@ -27,6 +27,7 @@
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
#define NUM_VERTEX_ATTRS 16
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_fb.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
static inline unsigned
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_frag.c 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#include "nouveau_context.h"
#include "nv20_3d.xml.h"
#include "nv10_driver.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_polygon.c 2011-03-02 17:31:09.000000000 -0800
@@ -28,6 +28,7 @@
#include "nouveau_context.h"
#include "nouveau_gldefs.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_raster.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tex.c 2011-03-02 17:31:09.000000000 -0800
@@ -30,6 +30,7 @@
#include "nouveau_texture.h"
#include "nv20_3d.xml.h"
#include "nouveau_util.h"
+#include "nv04_driver.h"
#include "nv20_driver.h"
void
diff -Naur Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c
--- Mesa-7.10.1-old/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2010-12-14 13:43:15.000000000 -0800
+++ Mesa-7.10.1-new/src/mesa/drivers/dri/nouveau/nv20_state_tnl.c 2011-03-02 17:31:09.000000000 -0800
@@ -29,6 +29,7 @@
#include "nouveau_gldefs.h"
#include "nouveau_util.h"
#include "nv20_3d.xml.h"
+#include "nv04_driver.h"
#include "nv10_driver.h"
#include "nv20_driver.h"

View File

@ -1,12 +0,0 @@
diff -Naur Mesa-7.10.2-old/configure.ac Mesa-7.10.2-new/configure.ac
--- Mesa-7.10.2-old/configure.ac 2011-02-11 14:49:47.000000000 -0800
+++ Mesa-7.10.2-new/configure.ac 2011-05-05 16:31:18.000000000 -0700
@@ -1551,7 +1551,7 @@
if test "x$LLVM_CONFIG" != xno; then
LLVM_VERSION=`$LLVM_CONFIG --version`
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
- LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
+ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++"
if test "x$HAS_UDIS86" != xno; then
LLVM_LIBS="$LLVM_LIBS -ludis86"

View File

@ -1,12 +0,0 @@
diff -Naur Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile
--- Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile 2011-01-04 09:44:17.000000000 -0800
+++ Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile 2011-05-05 15:48:06.000000000 -0700
@@ -71,7 +71,7 @@
LDFLAGS += $(LLVM_LDFLAGS)
LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
-LD=g++
+LD = $(CXX)
$(PROGS): lp_test_main.o libllvmpipe.a