summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-12-02 06:25:48 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-12-02 06:25:48 +0000
commit11edf910d7621c4663d7d1dc2966f04137c3042a (patch)
treef2288210fe444e37763b10f2e7e285cb0c69d30f /media-libs/mesa
parentRemove should not be here ebuild. (diff)
downloadgentoo-2-11edf910d7621c4663d7d1dc2966f04137c3042a.tar.gz
gentoo-2-11edf910d7621c4663d7d1dc2966f04137c3042a.tar.bz2
gentoo-2-11edf910d7621c4663d7d1dc2966f04137c3042a.zip
(#114066) Add 6.4.1-amd64-include-assyntax.patch to fix amd64 build.
(Portage version: 2.0.53)
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch17
-rw-r--r--media-libs/mesa/mesa-6.4.1.ebuild3
3 files changed, 24 insertions, 2 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/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