Fix build with libdrm 2.3.1.

Package-Manager: portage-2.1.5.6

4 files changed, 57 insertions, 11 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 52049eab00f1..a8acd532c3fa 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.176 2008/06/27 21:46:01 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.177 2008/07/01 08:35:09 dberkholz Exp $
+
+  01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch,
+  mesa-7.1_rc1.ebuild:
+  Fix build with libdrm 2.3.1.
 
   27 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; +files/version.mk:
   Add missed file.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 95f589db3b83..abe7721dcb1f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch 1725 RMD160 2d4959c708e0b2c2d9baf90abbd85e0a5555e780 SHA1 752876f27385ceb155b6a417efa6d3b7186fa3a0 SHA256 a58c7a7198f1e41a5570de651d0cd606ff911206cb7d924e1e4caf9aa879b322
 AUX 0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch 8184 RMD160 736e576ed70bc71bfb2f54239c3c924bb99b8c55 SHA1 0f445f6e6f73ec26921afd2b162b9c95d70a8997 SHA256 c64b67202407ff762b43b563050f215b5ba5d9d0ed17455c9fd8798bef22d1ac
 AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
 AUX 7.0.2-glw.pc.in 235 RMD160 12923cc447a04eab42c98fac48e17b8828cfbcf8 SHA1 dc0bc9ff1b2f2aa5efc101b62e2cf1870195ecfe SHA256 1b484764cb1274dc6a29998b63d3a9aa6282fb1fb31d53ac7928724a2f288dfc
@@ -14,13 +15,13 @@ DIST MesaLib-7.1-rc1.tar.gz 4495101 RMD160 2468daa0fe177462fdf3f5e222012377aadfc
 EBUILD mesa-6.5.2-r1.ebuild 9092 RMD160 bd563c07923b51075c0f954d91c6ab25cc359d92 SHA1 6b8c6d996a7d10e61db90ae5296e3f8c7122938c SHA256 69f5fe44667201b6b57bb5f46b377857f96fadf31880a72d797cd90ba6086d22
 EBUILD mesa-7.0.2.ebuild 9948 RMD160 90dd90f1c7078730af0d6d2f26397d16fd021297 SHA1 2e037d9ec5e988f55355330ccf65b69e135b1921 SHA256 786b2b690af732def65625a3af2854bb6601c89b7ec895f4a67c11a1dba21cac
 EBUILD mesa-7.0.3.ebuild 10137 RMD160 953e56dcfe83d94981c634926793626635ed1456 SHA1 8d2681358679a25c73ef6648aa322b83ce165707 SHA256 82ace13c9a192008b87ded31fa78110a36266dee4565f0d4f39eed97d3e81ac8
-EBUILD mesa-7.1_rc1.ebuild 7745 RMD160 81d4a60e3241c6e172d34f2f75c68b5d4a1626ef SHA1 c274cd89eb8c074b75a5170feb3fc08af9256aef SHA256 6c7eb22351e4e19d7d7e7b39f64ac91ef8d1420c0a05dac807782de9933d2877
-MISC ChangeLog 33015 RMD160 fe5ea65ae6fe0114bc1835c079740af4e443bc30 SHA1 7643d1b2583465019d992e9dff6bdaf3760f7704 SHA256 f081cebab6c1d44a83bce0054fc43493126f793b5f5ae4aeab163fa6d4a21295
+EBUILD mesa-7.1_rc1.ebuild 7718 RMD160 8ec8a3d04770b0199a0585ac1665abf852eac6b3 SHA1 12918ef895dd1c92ab232c07937aa2c5d650d2b1 SHA256 999bd838d41c7934861b77b768aac6e3ee283519fa2c7d911ff8aa02c3742e37
+MISC ChangeLog 33198 RMD160 f7012bf8da062b27fe66a5823970e8341bfa244d SHA1 13ef4e7829928f360e22e18348290b25061c0e0b SHA256 6c0c5f8ef50552daf175f12e8df605c53d66026246720cfc0b3a1a820b5af22d
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhlX58ACgkQXVaO67S1rtuS3gCg0cR67PamvtCvrU+fLZ7Q8szk
-C1UAoJmMd7FLpAC7qv9xPZCTI2uo48N4
-=s2M/
+iEYEARECAAYFAkhp7EIACgkQXVaO67S1rtsc/wCdGyIKS4yBiGLrZ4aiVjPq9Gsf
+wicAoPvEhG/hyIou967RambHQub09K/D
+=9v2h
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch b/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch
new file mode 100644
index 000000000000..4e1ea8f33fab
--- /dev/null
+++ b/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch
@@ -0,0 +1,42 @@
+From d3f7b463c3975c070503053e4ad70af99016a756 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Tue, 1 Jul 2008 18:22:12 +1000
+Subject: [PATCH] dri: drop asserts to make build against stable libdrm
+
+These asserts are of questionable use at the moment with things in flux.
+---
+ src/mesa/drivers/dri/common/dri_bufmgr.c |   11 -----------
+ 1 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c
+index 4df006f..8b5cb76 100644
+--- a/src/mesa/drivers/dri/common/dri_bufmgr.c
++++ b/src/mesa/drivers/dri/common/dri_bufmgr.c
+@@ -40,11 +40,6 @@ dri_bo *
+ dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
+ 	     unsigned int alignment, uint64_t location_mask)
+ {
+-   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
+-			     DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
+-			     DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
+-			     DRM_BO_FLAG_MEM_PRIV3 | DRM_BO_FLAG_MEM_PRIV4 |
+-			     DRM_BO_FLAG_CACHED | DRM_BO_FLAG_CACHED_MAPPED)) == 0);
+    return bufmgr->bo_alloc(bufmgr, name, size, alignment, location_mask);
+ }
+ 
+@@ -53,12 +48,6 @@ dri_bo_alloc_static(dri_bufmgr *bufmgr, const char *name, unsigned long offset,
+ 		    unsigned long size, void *virtual,
+ 		    uint64_t location_mask)
+ {
+-   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
+-			     DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
+-			     DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
+-			     DRM_BO_FLAG_MEM_PRIV3 |
+-			     DRM_BO_FLAG_MEM_PRIV4)) == 0);
+-
+    return bufmgr->bo_alloc_static(bufmgr, name, offset, size, virtual,
+ 				  location_mask);
+ }
+-- 
+1.5.5.4
+
diff --git a/media-libs/mesa/mesa-7.1_rc1.ebuild b/media-libs/mesa/mesa-7.1_rc1.ebuild
index 98ff347d0c80..baf88e9fe5b4 100644
--- a/media-libs/mesa/mesa-7.1_rc1.ebuild
+++ b/media-libs/mesa/mesa-7.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v 1.4 2008/06/27 21:42:38 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v 1.5 2008/07/01 08:35:09 dberkholz Exp $
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
@@ -54,7 +54,7 @@ RDEPEND="app-admin/eselect-opengl
 	x11-libs/libXi
 	x11-libs/libXmu
 	x11-libs/libXdamage
-	>=x11-libs/libdrm-2.3.1_pre1
+	>=x11-libs/libdrm-2.3.1
 	x11-libs/libICE
 	motif? ( x11-libs/openmotif )
 	doc? ( app-doc/opengl-manpages )
@@ -103,6 +103,7 @@ src_unpack() {
 
 	# Disable TTM
 	epatch "${FILESDIR}/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch"
+	epatch "${FILESDIR}/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch"
 
 	cp "${FILESDIR}/version.mk" bin/ || die
 
@@ -165,10 +166,7 @@ src_compile() {
 
 	myconf="${myconf} $(use_enable motif glw)"
 
-	emake realclean || die
 	econf ${myconf} || die
-	# So makedepend runs for header changes
-	find src/mesa/drivers/dri/ | xargs touch
 	emake || die
 }