(#114066) Add 6.4.1-amd64-include-assyntax.patch to fix amd64 build.

Package-Manager: portage-2.0.53

4 files changed, 27 insertions, 4 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 723b0c379078..b14adadd92c9 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.53 2005/11/30 20:24:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.54 2005/12/02 06:25:48 spyderous Exp $
+
+  02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/6.4.1-amd64-include-assyntax.patch, mesa-6.4.1.ebuild:
+  (#114066) Add 6.4.1-amd64-include-assyntax.patch to fix amd64 build.
 
 *mesa-6.4.1 (30 Nov 2005)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f4a4f471d9de..7db23aa1fc59 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,5 +1,6 @@
-MD5 c0f7fe30df095a267fe9e620b03216b4 ChangeLog 10830
+MD5 33aaee78d19ae8c4f01245724d759678 ChangeLog 11021
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
+MD5 8aade46b27d60f0f59f99b00cee1227f files/6.4.1-amd64-include-assyntax.patch 600
 MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
 MD5 e2670f5fb26fcc98a8067bbf937f217a files/digest-mesa-6.4-r1 65
 MD5 063dc3bc1f6634ab506e9c8ca8bb05c0 files/digest-mesa-6.4.1 67
@@ -7,5 +8,5 @@ MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
 MD5 a47cec2afd24d3eaba62bf5e9ea6311a mesa-6.4-r1.ebuild 5832
-MD5 a8087b21cb58264ea1dd4d1c0dc43cf8 mesa-6.4.1.ebuild 5845
+MD5 e2d72e878ef6b9747492495048017162 mesa-6.4.1.ebuild 5900
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch b/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch
new file mode 100644
index 000000000000..7583229ef93c
--- /dev/null
+++ b/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch
@@ -0,0 +1,17 @@
+Index: src/mesa/x86-64/glapi_x86-64.S
+===================================================================
+RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -b -B -r1.5 -r1.6
+--- src/mesa/x86-64/glapi_x86-64.S	2 Nov 2005 20:59:37 -0000	1.5
++++ src/mesa/x86-64/glapi_x86-64.S	2 Dec 2005 00:25:06 -0000	1.6
+@@ -29,7 +29,7 @@
+  * the symbol visibility mode to 'default'.
+  */
+ 
+-#include "assyntax.h"
++#include "../x86/assyntax.h"
+ 
+ #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+ #  pragma GCC visibility push(default)
diff --git a/media-libs/mesa/mesa-6.4.1.ebuild b/media-libs/mesa/mesa-6.4.1.ebuild
index 41d8e1806f7b..974f12ec705f 100644
--- a/media-libs/mesa/mesa-6.4.1.ebuild
+++ b/media-libs/mesa/mesa-6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1.ebuild,v 1.1 2005/11/30 20:24:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1.ebuild,v 1.2 2005/12/02 06:25:48 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -70,6 +70,7 @@ src_unpack() {
 	epatch ${FILESDIR}/makedepend-location.patch
 	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
 	epatch ${FILESDIR}/change-default-dri-driver-dir.patch
+	epatch ${FILESDIR}/${PV}-amd64-include-assyntax.patch
 
 	# Set up linux-dri configs
 	if use sparc; then