Version bump, bug #351904

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)

3 files changed, 12 insertions, 95 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d876cbc338fd..20dce6d2f53b 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mesa
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.304 2010/12/31 20:20:14 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.305 2011/01/08 13:15:48 chithanh Exp $
+
+*mesa-7.9.1 (08 Jan 2011)
+
+  08 Jan 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -mesa-7.9-r1.ebuild, +mesa-7.9.1.ebuild,
+  -files/mesa-7.9-libdrm-2.4.23-nouveau-api.patch:
+  Version bump, bug #351904
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> mesa-7.9.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/media-libs/mesa/files/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/media-libs/mesa/files/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
deleted file mode 100644
index d0ce04d2682a..000000000000
--- a/media-libs/mesa/files/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
---- a/src/gallium/drivers/nouveau/nouveau_screen.c	2010-10-02 00:51:28.000000000 +0200
-+++ b/src/gallium/drivers/nouveau/nouveau_screen.c	2010-12-11 18:18:20.527000045 +0100
-@@ -236,7 +236,7 @@
- 	int ret;
- 
- 	ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
--				    &screen->channel);
-+				    512*1024, &screen->channel);
- 	if (ret)
- 		return ret;
- 	screen->device = dev;
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-12-11 18:18:20.528000045 +0100
-@@ -129,7 +129,7 @@
- 
- 	/* Allocate a hardware channel. */
- 	ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
--				    &nctx->hw.chan);
-+				    512*1024, &nctx->hw.chan);
- 	if (ret) {
- 		nouveau_error("Error initializing the FIFO.\n");
- 		return GL_FALSE;
-Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-04-27 23:41:21.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-12-11 18:09:19.750000046 +0100
-@@ -34,8 +34,8 @@
- 		      unsigned flags, unsigned format,
- 		      unsigned width, unsigned height)
- {
--	unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
--	int ret;
-+	unsigned tile_mode = 0, tile_flags = 0;
-+	int ret, cpp = _mesa_get_format_bytes(format);
- 
- 	nouveau_bo_ref(NULL, &s->bo);
- 
-@@ -51,13 +51,21 @@
- 	if (layout == TILED) {
- 		s->pitch = align(s->pitch, 256);
- 		tile_mode = s->pitch;
-+
-+		if (cpp == 4)
-+			tile_flags = NOUVEAU_BO_TILE_32BPP;
-+		else if (cpp == 2)
-+			tile_flags = NOUVEAU_BO_TILE_16BPP;
-+
-+		if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
-+			tile_flags |= NOUVEAU_BO_TILE_ZETA;
-+
- 	} else {
- 		s->pitch = align(s->pitch, 64);
--		tile_mode = 0;
- 	}
- 
- 	ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
--				  tile_mode, 0, &s->bo);
-+				  tile_mode, tile_flags, &s->bo);
- 	assert(!ret);
- }
- 
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-12-11 18:18:20.528000045 +0100
-@@ -32,7 +32,7 @@
- 
- /* Arbitrary pushbuf length we can assume we can get with a single
-  * WAIT_RING. */
--#define PUSHBUF_DWORDS 2048
-+#define PUSHBUF_DWORDS 65536
- 
- /* Functions to set up struct nouveau_array_state from something like
-  * a GL array or index buffer. */
-diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-11 18:15:17.756000046 +0100
-@@ -64,8 +64,8 @@
- 
- 	if (!nfb->lma_bo || nfb->lma_bo->size != size) {
- 		nouveau_bo_ref(NULL, &nfb->lma_bo);
--		nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
--			       &nfb->lma_bo);
-+		nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-+				    0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
- 	}
- 
- 	nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/media-libs/mesa/mesa-7.9-r1.ebuild b/media-libs/mesa/mesa-7.9.1.ebuild
index 999f4b7d90a6..34c66bb3be21 100644
--- a/media-libs/mesa/mesa-7.9-r1.ebuild
+++ b/media-libs/mesa/mesa-7.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9-r1.ebuild,v 1.1 2010/12/11 17:46:46 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.1.ebuild,v 1.1 2011/01/08 13:15:48 chithanh Exp $
 
 EAPI=3
 
@@ -25,7 +25,7 @@ FOLDER="${PV/_rc*/}"
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
@@ -134,7 +134,6 @@ src_prepare() {
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
-	epatch "${FILESDIR}/${P}-libdrm-2.4.23-nouveau-api.patch"
 	# FreeBSD 6.* doesn't have posix_memalign().
 	if [[ ${CHOST} == *-freebsd6.* ]]; then
 		sed -i \