# HG changeset patch # User Christopher Rogers # Date 1305938053 0 # Node ID 3b75bb1bb79f384ac6a2c89004dcfcc79c81cd63 # Parent a3e395efce16c0f4f9c62483fba0e7bac3a02f09 Up: mesa to 7.10.2. diff -r a3e395efce16 -r 3b75bb1bb79f libegl-mesa/receipt --- a/libegl-mesa/receipt Sat May 21 00:30:15 2011 +0000 +++ b/libegl-mesa/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libegl-mesa" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="development" SHORT_DESC="OpenGL utility library" MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f libglu-mesa/receipt --- a/libglu-mesa/receipt Sat May 21 00:30:15 2011 +0000 +++ b/libglu-mesa/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libglu-mesa" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="development" SHORT_DESC="OpenGL utility library" MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f libglw-mesa/receipt --- a/libglw-mesa/receipt Sat May 21 00:30:15 2011 +0000 +++ b/libglw-mesa/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libglw-mesa" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="development" SHORT_DESC="OpenGL widget library" MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dev/receipt --- a/mesa-dev/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dev/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dev" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="development" SHORT_DESC="3D Graphics Library dev files." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-ati/receipt --- a/mesa-dri-ati/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-ati/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-ati" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-intel/receipt --- a/mesa-dri-intel/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-intel/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-intel" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for Intel." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-mach64/receipt --- a/mesa-dri-mach64/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-mach64/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-mach64" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for ATI Mach64." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-mga/receipt --- a/mesa-dri-mga/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-mga/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-mga" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for Matrox." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-nouveau/receipt --- a/mesa-dri-nouveau/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-nouveau/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-nouveau" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa classic DRI + Gallium3D drivers for Nouveau." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-r128/receipt --- a/mesa-dri-r128/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-r128/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-r128" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for ATI Rage128." MAINTAINER="gokhlayeh@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-savage/receipt --- a/mesa-dri-savage/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-savage/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-savage" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for S3 Sraphics/VIA Savage." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-sis/receipt --- a/mesa-dri-sis/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-sis/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-sis" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for SiS." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-tdfx/receipt --- a/mesa-dri-tdfx/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-tdfx/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-tdfx" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for 3dfx." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri-unichrome/receipt --- a/mesa-dri-unichrome/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri-unichrome/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri-unichrome" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers for S3 Graphics/VIA Unichrome." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa-dri/receipt --- a/mesa-dri/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa-dri/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa-dri" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="Mesa DRI drivers." MAINTAINER="pascal.bellard@slitaz.org" diff -r a3e395efce16 -r 3b75bb1bb79f mesa/receipt --- a/mesa/receipt Sat May 21 00:30:15 2011 +0000 +++ b/mesa/receipt Sat May 21 00:34:13 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="mesa" -VERSION="7.10.1" +VERSION="7.10.2" CATEGORY="x-window" SHORT_DESC="3D Graphics Library that is an open-source implementaton of OpenGL." MAINTAINER="pascal.bellard@slitaz.org" @@ -18,13 +18,11 @@ pkg-config talloc xorg-makedepend lesstif libxml2-python xorg-imake \ lesstif-dev" - # Rules to configure and make the package. compile_rules() { - ln -s $src $PACKAGE-$VERSION 2>/dev/null - cd $src + patch -Np1 -i $stuff/nouveau-fix-header.patch ./configure \ --prefix=/usr \ --with-x \ @@ -34,7 +32,7 @@ --enable-xcb \ $CONFIGURE_ARGS && make -j 4 && - make DESTDIR=$PWD/_pkg install + make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r a3e395efce16 -r 3b75bb1bb79f mesa/stuff/nouveau-fix-header.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mesa/stuff/nouveau-fix-header.patch Sat May 21 00:34:13 2011 +0000 @@ -0,0 +1,86 @@ +From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs +Date: Mon, 20 Dec 2010 03:39:36 +0000 +Subject: nouveau: fix includes for latest libdrm + +Signed-off-by: Ben Skeggs +--- +diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h +index ab480ca..747b084 100644 +--- a/src/gallium/drivers/nouveau/nouveau_winsys.h ++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h +@@ -10,7 +10,7 @@ + #include "nouveau/nouveau_grobj.h" + #include "nouveau/nouveau_notifier.h" + #include "nouveau/nouveau_resource.h" +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + #ifndef NV04_PFIFO_MAX_PACKET_LEN + #define NV04_PFIFO_MAX_PACKET_LEN 2047 +diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c +index ce48022..a99df76 100644 +--- a/src/gallium/drivers/nv50/nv50_surface.c ++++ b/src/gallium/drivers/nv50/nv50_surface.c +@@ -22,7 +22,7 @@ + + #define __NOUVEAU_PUSH_H__ + #include +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + #include "nv50_context.h" + #include "nv50_resource.h" + #include "pipe/p_defines.h" +diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c +index e0e65e7..e2fadd3 100644 +--- a/src/gallium/drivers/nvfx/nv04_2d.c ++++ b/src/gallium/drivers/nvfx/nv04_2d.c +@@ -34,11 +34,11 @@ + #include + #include + #include +-#include + #include + #include + #include + #include ++#include + #include "nv04_2d.h" + + #include "nouveau/nv_object.xml.h" +diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c +index 597664e..339b317 100644 +--- a/src/gallium/drivers/nvfx/nvfx_vbo.c ++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c +@@ -9,8 +9,7 @@ + #include "nvfx_resource.h" + + #include "nouveau/nouveau_channel.h" +- +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + static inline unsigned + util_guess_unique_indices_count(unsigned mode, unsigned indices) +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +index 8036b18..c5ac128 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +@@ -38,7 +38,6 @@ + #include + + #include "nouveau_device.h" +-#include "nouveau_pushbuf.h" + #include "nouveau_grobj.h" + #include "nouveau_channel.h" + #include "nouveau_bo.h" +@@ -46,6 +45,7 @@ + #include "nouveau_screen.h" + #include "nouveau_state.h" + #include "nouveau_surface.h" ++#include "nv04_pushbuf.h" + + #define DRIVER_DATE "20091015" + #define DRIVER_AUTHOR "Nouveau" +-- +cgit v0.8.3-6-g21f6