Version bump, bug #351904

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 16 insertions, 98 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/Manifest b/media-libs/mesa/Manifest
index a52f8a54d789..6e4ae031cf42 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,11 +1,12 @@
 AUX eselect-mesa.conf.7.9 1652 RMD160 922a0cc81e31548eacc7bc079448a93912124180 SHA1 2fb5a1fad37cc907871541ba8daca927dca968bb SHA256 bee4d061f1fb63c4c70d3f643fee7b53726c8826782f57b988f545e12eccd8c1
-AUX mesa-7.9-libdrm-2.4.23-nouveau-api.patch 3472 RMD160 d6d9c022c6166dc7527e64a885e32545412ab613 SHA1 abbf0680a0cb8b6c1b89c0eff6513ef07dd31993 SHA256 4629fc61b4b32aaad2e5c70c2f1226ddd51155a0a364ffba0839c1afbdb6afdd
 DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab7880 SHA1 31500d7e3e3bbf9288b3bee4fbddd26a5e0b7782 SHA256 dc44f73e50d2ccdb96e7b72cc71e56024c198a228112c69c5e86dbc610fd4e84
 DIST MesaLib-7.8.2.tar.bz2 5138463 RMD160 d06c95bc36304b8ef72211b5defd3ac338fe7956 SHA1 21de672a1cbe307135d7f172dc6952041a38e1c7 SHA256 505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d
+DIST MesaLib-7.9.1.tar.bz2 5640520 RMD160 5d83557160dc13f98647889bab351712c7b67316 SHA1 a442f77072c690ccd8c2659664929684f74d82fd SHA256 403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721
 DIST MesaLib-7.9.tar.bz2 5678494 RMD160 4aad7da22324556dcd3e833d149d8ae8de1fce7d SHA1 5afc7f6f4ee02a1ca39f29ef261cc14e8787d892 SHA256 e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
+DIST mesa-7.9.1-gentoo-patches-01.tar.bz2 2139 RMD160 9db0129c3aca3ed63c0b6665ac2f061997364c05 SHA1 b41022dfcf554d8460c96804d3d97224d05e7607 SHA256 b2b593a3cc529913a34a59c017dad4a51ae82e8b2dd4bf333a52260c3cab0aa1
 EBUILD mesa-7.7.1.ebuild 5919 RMD160 97633f16c396dea545630420c1b0e9c7a4cf1ead SHA1 7301512aed33c77a580580eadf7d8f8242d4a748 SHA256 c75b73aa1b31aeec6279aa8afc9eef8e0e154748bbdd5e8662bdb6b0a9b6af09
 EBUILD mesa-7.8.2.ebuild 6589 RMD160 fbcbf95df7b7876727bae39104609063fa7a75d3 SHA1 444761f93664438095caaa398b4a6cb68cc136ea SHA256 aa6b629f9b0bf603c7e5c1bec7e0d3f196df70b048bbf43e0e822e1f1cd52049
-EBUILD mesa-7.9-r1.ebuild 8891 RMD160 eafb3d156834300a9517380eba690be590379f7d SHA1 7ced2cdba7e0291f240e76a1d4f22beaf8a67763 SHA256 771b3a067ac60d564f96eddad5e306f480a090dbd845094e23b242cdfd2c0a56
+EBUILD mesa-7.9.1.ebuild 8830 RMD160 73ea9156498e503068f5ae3a653b50b0026c9ee1 SHA1 11639ab09fcdf9d528c62845b156eb72847faf85 SHA256 bf4e4dbeafba6dbbf080386e12f8997021f74d08fa35189c2425a46c4ffe17ff
 EBUILD mesa-7.9.ebuild 8869 RMD160 59d6db323f0d44242d37edc6e0848ad6bcc5b5d5 SHA1 61a8806d4818f7e394b7ca5f5b47b959cc769150 SHA256 d63a341c6fde5fd3638fd9ff6dfb85baaa70e7859c6d93fe3759a859f7026561
-MISC ChangeLog 51857 RMD160 997831c202290f5d54b1c4a41a8bee0b2290e1b1 SHA1 3dcd9e4c2632dbcaa84430e5de1936a55b00e1b0 SHA256 e9b1dbc18ab53d8d8d5c86023408da4a97582bbf29c7760c671dbf56a374d765
+MISC ChangeLog 52081 RMD160 40dd557e09491a2eed6a65034acd7a1e1fafe70b SHA1 dee64c6a97b6aa5dc59942b3c3ad2479041cd098 SHA256 b2e54454d9474847df24a89894a4ab34b278ae614befa9bc0ff0dadd06a9d40e
 MISC metadata.xml 560 RMD160 7c8109dd5de8c3a809ae27690d50f9d85e201ac9 SHA1 6d640e373282205f6755c647bb907e9b66ab390a SHA256 67727cfae939284efe0ce0a48b1c5d54193bf5bf1c63f9b41b621dbc937f9f37
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 \