From d045fa558b19580ac32d829f0c416e162f4dd4b0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 14 Jun 2011 05:47:24 +0200 Subject: [PATCH] Mesa: update to Mesa-7.10.3 Signed-off-by: Stephan Raue --- packages/graphics/Mesa/meta | 2 +- .../Mesa/patches/Mesa-7.10.2-__atom.patch | 15 -- .../patches/Mesa-7.10.2-libdrm_nouveau.patch | 208 ------------------ .../Mesa/patches/Mesa-7.10.2-llvm_so.patch | 12 - .../patches/Mesa-7.10.2-llvmpipe_ld.patch | 12 - 5 files changed, 1 insertion(+), 248 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch delete mode 100644 packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch delete mode 100644 packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch delete mode 100644 packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 639e6ee743..d4fb4d2537 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="7.10.2" +PKG_VERSION="7.10.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch b/packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch deleted file mode 100644 index 1787a37369..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-7.10.2-__atom.patch +++ /dev/null @@ -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 ) diff --git a/packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch b/packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch deleted file mode 100644 index 445e9170b3..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-7.10.2-libdrm_nouveau.patch +++ /dev/null @@ -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 - #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 - #include - #include -+#include - #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" - diff --git a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch deleted file mode 100644 index 8a924662ca..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch +++ /dev/null @@ -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" diff --git a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch b/packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch deleted file mode 100644 index 1fa972db2e..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch +++ /dev/null @@ -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 -