diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-01-23 04:10:27 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-01-23 04:10:27 +0000 |
| commit | 7f6977aa62e442f774fc1f8eeba680dfe57752b6 (patch) | |
| tree | faf3edda061f02020fcb40b4fcb0f29eb9547e83 /media-libs/mesa | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-7f6977aa62e442f774fc1f8eeba680dfe57752b6.tar.gz gentoo-2-7f6977aa62e442f774fc1f8eeba680dfe57752b6.tar.bz2 gentoo-2-7f6977aa62e442f774fc1f8eeba680dfe57752b6.zip | |
Some people don't understand what #ifndef means.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'media-libs/mesa')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/mesa/files/configurable-dri-dir.patch | 10 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.4.1-r1.ebuild | 8 |
3 files changed, 9 insertions, 17 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index fad91af16d3a..636d02bef590 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.59 2005/12/26 13:49:10 stefaan Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.60 2006/01/23 04:10:27 spyderous Exp $ + + 23 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; + -files/configurable-dri-dir.patch, mesa-6.4.1-r1.ebuild: + Some people don't understand what #ifndef means. 26 Dec 2005; Stefaan De Roeck <stefaan@gentoo.org> mesa-6.4.1-r1.ebuild: Marked ~alpha diff --git a/media-libs/mesa/files/configurable-dri-dir.patch b/media-libs/mesa/files/configurable-dri-dir.patch deleted file mode 100644 index 3b0f65aed39e..000000000000 --- a/media-libs/mesa/files/configurable-dri-dir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Mesa-6.4/src/glx/x11/Makefile.modular 2005-08-19 16:20:03.000000000 -0400 -+++ Mesa-6.4/src/glx/x11/Makefile 2005-11-20 15:32:47.000000000 -0500 -@@ -2,6 +2,7 @@ - include $(TOP)/configs/current - - DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER -+DEFINES += -DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_DIR)"' - - C_SOURCES = \ - $(TOP)/src/mesa/glapi/glapi.c \ diff --git a/media-libs/mesa/mesa-6.4.1-r1.ebuild b/media-libs/mesa/mesa-6.4.1-r1.ebuild index 7d28f9d8cca2..ba68e3572587 100644 --- a/media-libs/mesa/mesa-6.4.1-r1.ebuild +++ b/media-libs/mesa/mesa-6.4.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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-r1.ebuild,v 1.3 2005/12/26 13:49:10 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1-r1.ebuild,v 1.4 2006/01/23 04:10:27 spyderous Exp $ inherit eutils toolchain-funcs multilib @@ -67,9 +67,7 @@ src_unpack() { epatch ${FILESDIR}/makedepend-location.patch epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch - # Don't change it but make it configurable and set it below - Herbs - #epatch ${FILESDIR}/change-default-dri-driver-dir.patch - epatch ${FILESDIR}/configurable-dri-dir.patch + epatch ${FILESDIR}/change-default-dri-driver-dir.patch epatch ${FILESDIR}/6.4-multilib-fix.patch epatch ${FILESDIR}/${PV}-amd64-include-assyntax.patch |