summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2007-05-13 16:15:24 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2007-05-13 16:15:24 +0000
commit7f278d2953127a5119f03efb20aeca887eae1fa7 (patch)
treeecdefd42796d1a44de64df1e9b4e67d4325e7db0 /media-libs/mesa
parentStable on ppc wrt bug 177753 (diff)
downloadgentoo-2-7f278d2953127a5119f03efb20aeca887eae1fa7.tar.gz
gentoo-2-7f278d2953127a5119f03efb20aeca887eae1fa7.tar.bz2
gentoo-2-7f278d2953127a5119f03efb20aeca887eae1fa7.zip
Include Diego's xcb patch, fixing bug #177329.
(Portage version: 2.1.2.7)
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/files/mesa-6.5.3-pthread.patch14
-rw-r--r--media-libs/mesa/mesa-6.5.3.ebuild5
3 files changed, 23 insertions, 2 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/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}