Include Diego's xcb patch, fixing bug #177329.

Package-Manager: portage-2.1.2.7

4 files changed, 35 insertions, 10 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 60c9e80c8187..c1a4fc774a54 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.147 2007/05/12 19:29:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.148 2007/05/13 16:15:24 joshuabaergen Exp $
+
+  13 May 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/mesa-6.5.3-pthread.patch, mesa-6.5.3.ebuild:
+  Include Diego's xcb patch, fixing bug #177329.
 
   12 May 2007; nixnut <nixnut@gentoo.org> mesa-6.5.2-r1.ebuild:
   Stable on ppc wrt bug 175465
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f429896d925c..ad60f308968b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -46,6 +46,10 @@ AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752
+AUX mesa-6.5.3-pthread.patch 298 RMD160 e80de07c587d2a840206ac3fda3bc8235e532b86 SHA1 3f7248f37f195c8076a98f66af72ea4b8d6b2704 SHA256 2241d14a65b3568538716ae7198a5bc8c2894690e73bc0b1b124245d9a81e045
+MD5 b002eea58de7670391a006e5d9908e80 files/mesa-6.5.3-pthread.patch 298
+RMD160 e80de07c587d2a840206ac3fda3bc8235e532b86 files/mesa-6.5.3-pthread.patch 298
+SHA256 2241d14a65b3568538716ae7198a5bc8c2894690e73bc0b1b124245d9a81e045 files/mesa-6.5.3-pthread.patch 298
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST MesaLib-6.5.3.tar.bz2 3351899 RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e SHA1 8ab86e54976752028fbffcc21a9e0d2ebefeeff4 SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
@@ -70,14 +74,14 @@ EBUILD mesa-6.5.2.ebuild 8985 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 SH
 MD5 430f13380cc4d0fbb3b2bda923fd0a4d mesa-6.5.2.ebuild 8985
 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 mesa-6.5.2.ebuild 8985
 SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6 mesa-6.5.2.ebuild 8985
-EBUILD mesa-6.5.3.ebuild 9311 RMD160 fbe5c5381fbd87513b9352e56ed7f21ec7f6ec41 SHA1 8da0920f889e2ee1e9c20a114fd5e67c3e3e9008 SHA256 2fc5cea35da116406b467742d3df9e355e96211d6f822b778152e3b121c1493d
-MD5 41244925ff14603c6a1ef3371674456a mesa-6.5.3.ebuild 9311
-RMD160 fbe5c5381fbd87513b9352e56ed7f21ec7f6ec41 mesa-6.5.3.ebuild 9311
-SHA256 2fc5cea35da116406b467742d3df9e355e96211d6f822b778152e3b121c1493d mesa-6.5.3.ebuild 9311
-MISC ChangeLog 26402 RMD160 3338306ac78ca81cb4406a0b4af9379ad56a99be SHA1 b87b1a891ce5b04d1ff47c61f17a53881b21211c SHA256 0872a25fc2c0b907ed2c27662a89d54379288144a0c3d0e29399bed3d79b3efc
-MD5 2be1a8c7151de8719a64246b087a0581 ChangeLog 26402
-RMD160 3338306ac78ca81cb4406a0b4af9379ad56a99be ChangeLog 26402
-SHA256 0872a25fc2c0b907ed2c27662a89d54379288144a0c3d0e29399bed3d79b3efc ChangeLog 26402
+EBUILD mesa-6.5.3.ebuild 9372 RMD160 cc6f4c61756f81b78f99da1ab1cafa9839a4348a SHA1 5740dbef04066dc82e2fbdd7cfbb6215d4dc5adb SHA256 908a2823f8c0bf04247eabff73bad2eb031b0939395cab737c96617e9a45b948
+MD5 13759a466857a79b1b56a54f8d602f88 mesa-6.5.3.ebuild 9372
+RMD160 cc6f4c61756f81b78f99da1ab1cafa9839a4348a mesa-6.5.3.ebuild 9372
+SHA256 908a2823f8c0bf04247eabff73bad2eb031b0939395cab737c96617e9a45b948 mesa-6.5.3.ebuild 9372
+MISC ChangeLog 26570 RMD160 4d16e33bc849c59acb2f8d837ee26d0aa1123e58 SHA1 e08270af9e65918d9396c0197255679233771051 SHA256 21c5baa3f13b338bb884e261c5ce9cc5ef028dc1b6e35fd9865f373a88dc59b5
+MD5 9a0d9309bd51ca91aa51ad0da46e2356 ChangeLog 26570
+RMD160 4d16e33bc849c59acb2f8d837ee26d0aa1123e58 ChangeLog 26570
+SHA256 21c5baa3f13b338bb884e261c5ce9cc5ef028dc1b6e35fd9865f373a88dc59b5 ChangeLog 26570
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/media-libs/mesa/files/mesa-6.5.3-pthread.patch b/media-libs/mesa/files/mesa-6.5.3-pthread.patch
new file mode 100644
index 000000000000..e1aab3333029
--- /dev/null
+++ b/media-libs/mesa/files/mesa-6.5.3-pthread.patch
@@ -0,0 +1,14 @@
+Index: Mesa-6.5.3/bin/mklib
+===================================================================
+--- Mesa-6.5.3.orig/bin/mklib
++++ Mesa-6.5.3/bin/mklib
+@@ -100,6 +100,9 @@ do
+ 	-L*)
+ 	    DEPS="$DEPS $1"
+ 	    ;;
++	-pthread)
++	    DEPS="$DEPS $1"
++	    ;;
+ 	'-cplusplus')
+ 	    CPLUSPLUS=1
+ 	    ;;
diff --git a/media-libs/mesa/mesa-6.5.3.ebuild b/media-libs/mesa/mesa-6.5.3.ebuild
index 965383c8a853..7f83279a394a 100644
--- a/media-libs/mesa/mesa-6.5.3.ebuild
+++ b/media-libs/mesa/mesa-6.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.1 2007/04/29 19:08:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.2 2007/05/13 16:15:24 joshuabaergen Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -115,6 +115,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Bug #177329
+	epatch "${FILESDIR}/${P}-pthread.patch"
+
 	# FreeBSD 6.* doesn't have posix_memalign().
 	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}