wok rev 10234

Up: mesa to 7.10.2.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat May 21 00:34:13 2011 +0000 (2011-05-21)
parents a3e395efce16
children d005d51309af
files libegl-mesa/receipt libglu-mesa/receipt libglw-mesa/receipt mesa-dev/receipt mesa-dri-ati/receipt mesa-dri-intel/receipt mesa-dri-mach64/receipt mesa-dri-mga/receipt mesa-dri-nouveau/receipt mesa-dri-r128/receipt mesa-dri-savage/receipt mesa-dri-sis/receipt mesa-dri-tdfx/receipt mesa-dri-unichrome/receipt mesa-dri/receipt mesa/receipt mesa/stuff/nouveau-fix-header.patch
line diff
     1.1 --- a/libegl-mesa/receipt	Sat May 21 00:30:15 2011 +0000
     1.2 +++ b/libegl-mesa/receipt	Sat May 21 00:34:13 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="libegl-mesa"
     1.7 -VERSION="7.10.1"
     1.8 +VERSION="7.10.2"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="OpenGL utility library"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/libglu-mesa/receipt	Sat May 21 00:30:15 2011 +0000
     2.2 +++ b/libglu-mesa/receipt	Sat May 21 00:34:13 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libglu-mesa"
     2.7 -VERSION="7.10.1"
     2.8 +VERSION="7.10.2"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="OpenGL utility library"
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
     3.1 --- a/libglw-mesa/receipt	Sat May 21 00:30:15 2011 +0000
     3.2 +++ b/libglw-mesa/receipt	Sat May 21 00:34:13 2011 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libglw-mesa"
     3.7 -VERSION="7.10.1"
     3.8 +VERSION="7.10.2"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="OpenGL widget library"
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
     4.1 --- a/mesa-dev/receipt	Sat May 21 00:30:15 2011 +0000
     4.2 +++ b/mesa-dev/receipt	Sat May 21 00:34:13 2011 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="mesa-dev"
     4.7 -VERSION="7.10.1"
     4.8 +VERSION="7.10.2"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="3D Graphics Library dev files."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"
     5.1 --- a/mesa-dri-ati/receipt	Sat May 21 00:30:15 2011 +0000
     5.2 +++ b/mesa-dri-ati/receipt	Sat May 21 00:34:13 2011 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="mesa-dri-ati"
     5.7 -VERSION="7.10.1"
     5.8 +VERSION="7.10.2"
     5.9  CATEGORY="x-window"
    5.10  SHORT_DESC="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon."
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
     6.1 --- a/mesa-dri-intel/receipt	Sat May 21 00:30:15 2011 +0000
     6.2 +++ b/mesa-dri-intel/receipt	Sat May 21 00:34:13 2011 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="mesa-dri-intel"
     6.7 -VERSION="7.10.1"
     6.8 +VERSION="7.10.2"
     6.9  CATEGORY="x-window"
    6.10  SHORT_DESC="Mesa DRI drivers for Intel."
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
     7.1 --- a/mesa-dri-mach64/receipt	Sat May 21 00:30:15 2011 +0000
     7.2 +++ b/mesa-dri-mach64/receipt	Sat May 21 00:34:13 2011 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="mesa-dri-mach64"
     7.7 -VERSION="7.10.1"
     7.8 +VERSION="7.10.2"
     7.9  CATEGORY="x-window"
    7.10  SHORT_DESC="Mesa DRI drivers for ATI Mach64."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
     8.1 --- a/mesa-dri-mga/receipt	Sat May 21 00:30:15 2011 +0000
     8.2 +++ b/mesa-dri-mga/receipt	Sat May 21 00:34:13 2011 +0000
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="mesa-dri-mga"
     8.7 -VERSION="7.10.1"
     8.8 +VERSION="7.10.2"
     8.9  CATEGORY="x-window"
    8.10  SHORT_DESC="Mesa DRI drivers for Matrox."
    8.11  MAINTAINER="pascal.bellard@slitaz.org"
     9.1 --- a/mesa-dri-nouveau/receipt	Sat May 21 00:30:15 2011 +0000
     9.2 +++ b/mesa-dri-nouveau/receipt	Sat May 21 00:34:13 2011 +0000
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="mesa-dri-nouveau"
     9.7 -VERSION="7.10.1"
     9.8 +VERSION="7.10.2"
     9.9  CATEGORY="x-window"
    9.10  SHORT_DESC="Mesa classic DRI + Gallium3D drivers for Nouveau."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"
    10.1 --- a/mesa-dri-r128/receipt	Sat May 21 00:30:15 2011 +0000
    10.2 +++ b/mesa-dri-r128/receipt	Sat May 21 00:34:13 2011 +0000
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="mesa-dri-r128"
    10.7 -VERSION="7.10.1"
    10.8 +VERSION="7.10.2"
    10.9  CATEGORY="x-window"
   10.10  SHORT_DESC="Mesa DRI drivers for ATI Rage128."
   10.11  MAINTAINER="gokhlayeh@slitaz.org"
    11.1 --- a/mesa-dri-savage/receipt	Sat May 21 00:30:15 2011 +0000
    11.2 +++ b/mesa-dri-savage/receipt	Sat May 21 00:34:13 2011 +0000
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="mesa-dri-savage"
    11.7 -VERSION="7.10.1"
    11.8 +VERSION="7.10.2"
    11.9  CATEGORY="x-window"
   11.10  SHORT_DESC="Mesa DRI drivers for S3 Sraphics/VIA Savage."
   11.11  MAINTAINER="pascal.bellard@slitaz.org"
    12.1 --- a/mesa-dri-sis/receipt	Sat May 21 00:30:15 2011 +0000
    12.2 +++ b/mesa-dri-sis/receipt	Sat May 21 00:34:13 2011 +0000
    12.3 @@ -1,7 +1,7 @@
    12.4  # SliTaz package receipt.
    12.5  
    12.6  PACKAGE="mesa-dri-sis"
    12.7 -VERSION="7.10.1"
    12.8 +VERSION="7.10.2"
    12.9  CATEGORY="x-window"
   12.10  SHORT_DESC="Mesa DRI drivers for SiS."
   12.11  MAINTAINER="pascal.bellard@slitaz.org"
    13.1 --- a/mesa-dri-tdfx/receipt	Sat May 21 00:30:15 2011 +0000
    13.2 +++ b/mesa-dri-tdfx/receipt	Sat May 21 00:34:13 2011 +0000
    13.3 @@ -1,7 +1,7 @@
    13.4  # SliTaz package receipt.
    13.5  
    13.6  PACKAGE="mesa-dri-tdfx"
    13.7 -VERSION="7.10.1"
    13.8 +VERSION="7.10.2"
    13.9  CATEGORY="x-window"
   13.10  SHORT_DESC="Mesa DRI drivers for 3dfx."
   13.11  MAINTAINER="pascal.bellard@slitaz.org"
    14.1 --- a/mesa-dri-unichrome/receipt	Sat May 21 00:30:15 2011 +0000
    14.2 +++ b/mesa-dri-unichrome/receipt	Sat May 21 00:34:13 2011 +0000
    14.3 @@ -1,7 +1,7 @@
    14.4  # SliTaz package receipt.
    14.5  
    14.6  PACKAGE="mesa-dri-unichrome"
    14.7 -VERSION="7.10.1"
    14.8 +VERSION="7.10.2"
    14.9  CATEGORY="x-window"
   14.10  SHORT_DESC="Mesa DRI drivers for S3 Graphics/VIA Unichrome."
   14.11  MAINTAINER="pascal.bellard@slitaz.org"
    15.1 --- a/mesa-dri/receipt	Sat May 21 00:30:15 2011 +0000
    15.2 +++ b/mesa-dri/receipt	Sat May 21 00:34:13 2011 +0000
    15.3 @@ -1,7 +1,7 @@
    15.4  # SliTaz package receipt.
    15.5  
    15.6  PACKAGE="mesa-dri"
    15.7 -VERSION="7.10.1"
    15.8 +VERSION="7.10.2"
    15.9  CATEGORY="x-window"
   15.10  SHORT_DESC="Mesa DRI drivers."
   15.11  MAINTAINER="pascal.bellard@slitaz.org"
    16.1 --- a/mesa/receipt	Sat May 21 00:30:15 2011 +0000
    16.2 +++ b/mesa/receipt	Sat May 21 00:34:13 2011 +0000
    16.3 @@ -1,7 +1,7 @@
    16.4  # SliTaz package receipt.
    16.5  
    16.6  PACKAGE="mesa"
    16.7 -VERSION="7.10.1"
    16.8 +VERSION="7.10.2"
    16.9  CATEGORY="x-window"
   16.10  SHORT_DESC="3D Graphics Library that is an open-source implementaton of OpenGL."
   16.11  MAINTAINER="pascal.bellard@slitaz.org"
   16.12 @@ -18,13 +18,11 @@
   16.13  pkg-config talloc xorg-makedepend lesstif libxml2-python xorg-imake \
   16.14  lesstif-dev"
   16.15  
   16.16 -
   16.17  # Rules to configure and make the package.
   16.18  compile_rules()
   16.19  {
   16.20 -	ln -s $src $PACKAGE-$VERSION 2>/dev/null
   16.21 -
   16.22  	cd $src
   16.23 +	patch -Np1 -i $stuff/nouveau-fix-header.patch
   16.24  	./configure \
   16.25  		--prefix=/usr \
   16.26  		--with-x \
   16.27 @@ -34,7 +32,7 @@
   16.28  		--enable-xcb \
   16.29  		$CONFIGURE_ARGS &&
   16.30  	make -j 4 &&
   16.31 -	make DESTDIR=$PWD/_pkg install
   16.32 +	make install
   16.33  }
   16.34  
   16.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/mesa/stuff/nouveau-fix-header.patch	Sat May 21 00:34:13 2011 +0000
    17.3 @@ -0,0 +1,86 @@
    17.4 +From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
    17.5 +From: Ben Skeggs <bskeggs@redhat.com>
    17.6 +Date: Mon, 20 Dec 2010 03:39:36 +0000
    17.7 +Subject: nouveau: fix includes for latest libdrm
    17.8 +
    17.9 +Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
   17.10 +---
   17.11 +diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
   17.12 +index ab480ca..747b084 100644
   17.13 +--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
   17.14 ++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
   17.15 +@@ -10,7 +10,7 @@
   17.16 + #include "nouveau/nouveau_grobj.h"
   17.17 + #include "nouveau/nouveau_notifier.h"
   17.18 + #include "nouveau/nouveau_resource.h"
   17.19 +-#include "nouveau/nouveau_pushbuf.h"
   17.20 ++#include "nouveau/nv04_pushbuf.h"
   17.21 + 
   17.22 + #ifndef NV04_PFIFO_MAX_PACKET_LEN
   17.23 + #define NV04_PFIFO_MAX_PACKET_LEN 2047
   17.24 +diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
   17.25 +index ce48022..a99df76 100644
   17.26 +--- a/src/gallium/drivers/nv50/nv50_surface.c
   17.27 ++++ b/src/gallium/drivers/nv50/nv50_surface.c
   17.28 +@@ -22,7 +22,7 @@
   17.29 + 
   17.30 + #define __NOUVEAU_PUSH_H__
   17.31 + #include <stdint.h>
   17.32 +-#include "nouveau/nouveau_pushbuf.h"
   17.33 ++#include "nouveau/nv04_pushbuf.h"
   17.34 + #include "nv50_context.h"
   17.35 + #include "nv50_resource.h"
   17.36 + #include "pipe/p_defines.h"
   17.37 +diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
   17.38 +index e0e65e7..e2fadd3 100644
   17.39 +--- a/src/gallium/drivers/nvfx/nv04_2d.c
   17.40 ++++ b/src/gallium/drivers/nvfx/nv04_2d.c
   17.41 +@@ -34,11 +34,11 @@
   17.42 + #include <stdio.h>
   17.43 + #include <stdint.h>
   17.44 + #include <nouveau/nouveau_device.h>
   17.45 +-#include <nouveau/nouveau_pushbuf.h>
   17.46 + #include <nouveau/nouveau_channel.h>
   17.47 + #include <nouveau/nouveau_bo.h>
   17.48 + #include <nouveau/nouveau_notifier.h>
   17.49 + #include <nouveau/nouveau_grobj.h>
   17.50 ++#include <nouveau/nv04_pushbuf.h>
   17.51 + #include "nv04_2d.h"
   17.52 + 
   17.53 + #include "nouveau/nv_object.xml.h"
   17.54 +diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
   17.55 +index 597664e..339b317 100644
   17.56 +--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
   17.57 ++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
   17.58 +@@ -9,8 +9,7 @@
   17.59 + #include "nvfx_resource.h"
   17.60 + 
   17.61 + #include "nouveau/nouveau_channel.h"
   17.62 +-
   17.63 +-#include "nouveau/nouveau_pushbuf.h"
   17.64 ++#include "nouveau/nv04_pushbuf.h"
   17.65 + 
   17.66 + static inline unsigned
   17.67 + util_guess_unique_indices_count(unsigned mode, unsigned indices)
   17.68 +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
   17.69 +index 8036b18..c5ac128 100644
   17.70 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
   17.71 ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
   17.72 +@@ -38,7 +38,6 @@
   17.73 + #include <assert.h>
   17.74 + 
   17.75 + #include "nouveau_device.h"
   17.76 +-#include "nouveau_pushbuf.h"
   17.77 + #include "nouveau_grobj.h"
   17.78 + #include "nouveau_channel.h"
   17.79 + #include "nouveau_bo.h"
   17.80 +@@ -46,6 +45,7 @@
   17.81 + #include "nouveau_screen.h"
   17.82 + #include "nouveau_state.h"
   17.83 + #include "nouveau_surface.h"
   17.84 ++#include "nv04_pushbuf.h"
   17.85 + 
   17.86 + #define DRIVER_DATE	"20091015"
   17.87 + #define DRIVER_AUTHOR	"Nouveau"
   17.88 +--
   17.89 +cgit v0.8.3-6-g21f6