x11-libs/libdrm: bump to 2.4.9 with patches from master

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

7 files changed, 159 insertions, 2 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 04325bd9a9b3..c29fa3e57080 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.73 2009/04/16 02:03:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.74 2009/04/30 11:53:46 remi Exp $
+
+*libdrm-2.4.9 (30 Apr 2009)
+
+  30 Apr 2009; Rémi Cardona <remi@gentoo.org>
+  +files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patc
+  h,
+  +files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch,
+  +files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch,
+  +files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
+  , +libdrm-2.4.9.ebuild:
+  bump to 2.4.9 with patches from master
 
   16 Apr 2009; Jeroen Roovers <jer@gentoo.org> libdrm-2.4.5.ebuild:
   Stable for HPPA (bug #251832).
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 15506a628228..58dc5fb04d02 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,5 +1,9 @@
 AUX 2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch 1072 RMD160 dcc181854552f2a4e6466fe5ed45bae7240b4ef0 SHA1 b33355561f3951a22eff352d077ea4d4f145bbbc SHA256 48dfaabfaff6e4124673a1d430493eb93660703eb334f7019db0d4845f3b2f53
 AUX 2.4.6-makefile.patch 557 RMD160 9e82191fac3080927748832072c4e6aa2c5859e6 SHA1 74c2c97019b3f36f6eecef017b21ac96d6d73014 SHA256 4a9c7411f7b544e87bbef9f621536b9ab9409306c0862e30bbf411443df30654
+AUX 2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch 711 RMD160 6942f00eb8e45868fdcb1f52f2583cacf3806a0d SHA1 1c889f475e7e1ee6a03dabdf66088b787c0a0ceb SHA256 adb1d9052789290078315e14e7cd3e4a202f649bf8ad37181bc67caf38520849
+AUX 2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch 708 RMD160 795b4dbf84914bbc13c5db086769d0b500385441 SHA1 187780606e0100c8d2de251af4af8cb773955180 SHA256 cfc0325d305c5d534a0c564d90f63f2ff27a45968203453defd531d38d853c3e
+AUX 2.4.9-0003-libdrm-mode-align-subpixel-results.patch 901 RMD160 1a66e30396a1c6a04d8e398dabe7f42c975e8327 SHA1 12eb648b7f41de9e5ce4f2a3dcec32d1d93e07a6 SHA256 567f496c402ee78ad99d4a95e2ee297208ea4593d1be2040eaf368edc6a2d7ba
+AUX 2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch 1048 RMD160 358d8dfdc8b6ea36bffe476151a24467d96fc5eb SHA1 55bd0fb8342e5be26ee4498242670f13535ed2a7 SHA256 12cf1766699dd02c0df7558972ac67026742b0d016c749c3f5b0c5eba85e5dce
 DIST libdrm-2.3.0.tar.gz 391509 RMD160 2ca594cf17fc074b1addd1f370dd3409b5a03dd7 SHA1 fd62459b11c39a58e5b45b8af30a8217d5ce0e1b SHA256 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab
 DIST libdrm-2.3.1.tar.gz 413300 RMD160 15c8f03bb11f58a272eaf89f988e96256a7f43f1 SHA1 007903c738df3bc2a3cdab0289635baa95a2ed7a SHA256 1d1ad058916a412ec56c3a541c6d921dda11e015909105e84bd260d87ae25465
 DIST libdrm-2.4.1.tar.gz 462373 RMD160 4fa1df2853228687c16dbcc47698c66416df61f3 SHA1 583c1c62f70877ec592245ca0316375662eeb693 SHA256 dd84fd09984d700225b6261d87a1deb8b92c6928318e815bf938f2b44deaa529
@@ -7,6 +11,7 @@ DIST libdrm-2.4.3.tar.gz 485841 RMD160 7c6ac50bc854093f2918e5f077eb449bf6c872a3
 DIST libdrm-2.4.4.tar.gz 487110 RMD160 0520f6dc8103998b796f3e1759594a2a4cd0d1b6 SHA1 4b904e4eafc368d9f1b827a7439fc80a41746cb3 SHA256 83d2245a7d4dc6a02c46906f014b81ab3bb9fa0f601dba95123337312a805282
 DIST libdrm-2.4.5.tar.gz 563395 RMD160 11a512368c32fb6ed3fa17d7d728e244d61547db SHA1 9e919c4cda6454118ebd288edc3bc65fc6779a51 SHA256 4ada5afa0ac774b9affce9762e703d0a98bfcb3537a5230ef12955b0068259d1
 DIST libdrm-2.4.6.tar.bz2 417305 RMD160 e49f1d8d068f7e28b612e300b2b3e2b08565b870 SHA1 69dc8ddb2f41f6dc87c3c3d4ff7d09f1a89d3dd6 SHA256 6813f4ff5eb62d638bb452a6fc6ddbc26b7362f2d32b8be950c73a318239b006
+DIST libdrm-2.4.9.tar.gz 523793 RMD160 2d988da67c343dc480a46ea4370dbe0067c47212 SHA1 ca40ef9fe1cfbfd2538631d449a68bf5247bc285 SHA256 c74b2e188398978c6a358d7c0fa2c8db7ac13c548b32c297f14c2cc2550cb2dd
 EBUILD libdrm-2.3.0.ebuild 1144 RMD160 5d6ba23e2d8df6a9fd1b2dd3eddad62013e8788c SHA1 17fd56acbe70e7c9f1ae23b90f809a8cac9419d8 SHA256 1eeb4c79f8937876ba23d1179c07932e21f1732a5ce6fa2e8772687859f08093
 EBUILD libdrm-2.3.1.ebuild 1154 RMD160 1a0fc6e4567af1e6d84b2f0c682e0fa2668ca832 SHA1 c235c9ebff3165272eaa789a359ae53472c1a187 SHA256 782564e274c596a613874a1c86f2110abeeabee2ba5a8506c17b75d88d37531b
 EBUILD libdrm-2.3.1_pre20080528.ebuild 1309 RMD160 b5117772e5a9374d266ff1f00a1ec47e64d5c389 SHA1 8ca8b4596dccb3129783d732f722bc6b7e27e8e2 SHA256 4e3b87c117e3a151c5653a3a42cb2ea9bd758b916b6868c1c38b512d51b7041f
@@ -15,5 +20,6 @@ EBUILD libdrm-2.4.3.ebuild 895 RMD160 cdc12362df42c27e83d5f1028e014296c794d1c5 S
 EBUILD libdrm-2.4.4.ebuild 927 RMD160 00f6805b0dc0855133ac9ccec4dd6b6fb7cb3be1 SHA1 9270f660386377e299f109db850abaf94d9ed192 SHA256 4544456512df5f3feac9b239366ebd71de344a545ae5e35861714300b6ae005c
 EBUILD libdrm-2.4.5.ebuild 918 RMD160 d9b1384a55bb4fcfd7798fb868e5e1d7d6471fdf SHA1 28ed9b21cdce1ae197ee756adf9b3acc6541378f SHA256 53cb643d6de681d003519451f87aeee9a5c767c77e11f50dd1923b6945e0a2a1
 EBUILD libdrm-2.4.6.ebuild 1047 RMD160 535d36cb448f4979db836c794c3d165564eabe54 SHA1 111652a90b8c63716798dd85473259b6cd43896f SHA256 7774059e24c809ade7911d198b2162cc9232ea9d3a6d2d03230e39c5af620f0f
-MISC ChangeLog 9526 RMD160 5ced680d635b851c7b67aec620d8186f630455c4 SHA1 bb2e68a77e47f87d2dbfc74b247edab084b85187 SHA256 398106cffada0d0545fd57f75e5d59dade972086d6e1f243f38b129b6e2419a3
+EBUILD libdrm-2.4.9.ebuild 1256 RMD160 1626eacbb32f6d306453529eccd1c544b45bad4f SHA1 421a5166ef361871a1dd996c28e909cb5775316c SHA256 43fee92ff340d00d74fffe5a903d48a1684ad8b5ade1e83f204ced230afe1759
+MISC ChangeLog 9969 RMD160 cf98ca5aea1348052674a38d93ad6bcc284f4dcf SHA1 31cbc006cc10e6fddd4a6b700e377c19042aa0df SHA256 da9057ec65db31f2dac684373a40e44d20eeae4d0ef2e88d8b525bce44ffa933
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libdrm/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch b/x11-libs/libdrm/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
new file mode 100644
index 000000000000..a667eaed25b8
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
@@ -0,0 +1,26 @@
+From 78e753d03314e3aa92af8ec601e9dbb869a938d5 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed, 15 Apr 2009 12:44:21 +1000
+Subject: [PATCH 1/4] nouveau: store bo handle in public struct in bo_ref_handle
+
+---
+ libdrm/nouveau/nouveau_bo.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 023c6be..66466e3 100644
+--- a/libdrm/nouveau/nouveau_bo.c
++++ b/libdrm/nouveau/nouveau_bo.c
+@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
+ 		nvbo->size = req.size;
+ 		nvbo->handle = req.handle;
+ 	}
+- 
++
++	nvbo->base.handle = nvbo->handle;
+ 	return 0;
+ } 
+ 
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch b/x11-libs/libdrm/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
new file mode 100644
index 000000000000..fc3c7c207b27
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
@@ -0,0 +1,24 @@
+From a1e3ab9e55047c08a4006ec389c1a99b72bc672c Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Fri, 17 Apr 2009 09:29:19 +1000
+Subject: [PATCH 2/4] nouveau: write posting got lost somewhere, bring it back
+
+---
+ libdrm/nouveau/nouveau_dma.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
+index 23da64b..b084f70 100644
+--- a/libdrm/nouveau/nouveau_dma.c
++++ b/libdrm/nouveau/nouveau_dma.c
+@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
+ 	volatile int dum;
+ 
+ 	NOUVEAU_DMA_BARRIER;
++	dum = nvchan->pushbuf[0];
+ 	dum = READ_GET(nvchan);
+ 
+ 	*nvchan->put = put;
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch b/x11-libs/libdrm/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch
new file mode 100644
index 000000000000..0fa468c631c7
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.9-0003-libdrm-mode-align-subpixel-results.patch
@@ -0,0 +1,26 @@
+From 412d370b9ae4b2882691863a1c5e13a507574e92 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Wed, 22 Apr 2009 20:25:40 +1000
+Subject: [PATCH 3/4] libdrm/mode: align subpixel results
+
+---
+ libdrm/xf86drmMode.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
+index 872604f..ea11207 100644
+--- a/libdrm/xf86drmMode.c
++++ b/libdrm/xf86drmMode.c
+@@ -395,7 +395,8 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
+ 	r->connection   = conn.connection;
+ 	r->mmWidth      = conn.mm_width;
+ 	r->mmHeight     = conn.mm_height;
+-	r->subpixel     = conn.subpixel;
++	/* convert subpixel from kernel to userspace */
++	r->subpixel     = conn.subpixel + 1;
+ 	r->count_modes  = conn.count_modes;
+ 	/* TODO we should test if these alloc & cpy fails. */
+ 	r->count_props  = conn.count_props;
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch b/x11-libs/libdrm/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
new file mode 100644
index 000000000000..6a5a9a3147c4
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
@@ -0,0 +1,28 @@
+From 11b60973bca1bc9bbda44be4c695e22d28d8ca4a Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Tue, 21 Apr 2009 17:13:16 -0700
+Subject: [PATCH 4/4] intel: NULL fake bo block when freeing in evict_all
+
+Fixes assertion failures on later use of the object.
+---
+ libdrm/intel/intel_bufmgr_fake.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libdrm/intel/intel_bufmgr_fake.c b/libdrm/intel/intel_bufmgr_fake.c
+index e1f98d6..969c03d 100644
+--- a/libdrm/intel/intel_bufmgr_fake.c
++++ b/libdrm/intel/intel_bufmgr_fake.c
+@@ -1467,8 +1467,10 @@ drm_intel_bufmgr_fake_evict_all(drm_intel_bufmgr *bufmgr)
+    assert(DRMLISTEMPTY(&bufmgr_fake->on_hardware));
+ 
+    DRMLISTFOREACHSAFE(block, tmp, &bufmgr_fake->lru) {
++      drm_intel_bo_fake *bo_fake = (drm_intel_bo_fake *)block->bo;
+       /* Releases the memory, and memcpys dirty contents out if necessary. */
+       free_block(bufmgr_fake, block, 0);
++      bo_fake->block = NULL;
+    }
+ 
+    pthread_mutex_unlock(&bufmgr_fake->lock);
+-- 
+1.6.2.3
+
diff --git a/x11-libs/libdrm/libdrm-2.4.9.ebuild b/x11-libs/libdrm/libdrm-2.4.9.ebuild
new file mode 100644
index 000000000000..cb25753578f8
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.9.ebuild,v 1.1 2009/04/30 11:53:46 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch
+	"${FILESDIR}"/${PV}-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch
+	"${FILESDIR}"/${PV}-0003-libdrm-mode-align-subpixel-results.patch
+	"${FILESDIR}"/${PV}-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch
+)
+
+# FIXME, we should try to see how we can fit the --enable-udev configure flag
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	ewarn "libdrm's ABI may have changed without change in library name"
+	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
+	ewarn "your video drivers in x11-drivers/*."
+}