summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-01-23 04:10:27 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-01-23 04:10:27 +0000
commit97a2b2dc1397fcb07895c6ecdf016f8fc2978ee9 (patch)
treeeedbe6c6f428862db12402c71ddc242ea7585e18 /media-libs
parentStable on amd64. (diff)
downloadhistorical-97a2b2dc1397fcb07895c6ecdf016f8fc2978ee9.tar.gz
historical-97a2b2dc1397fcb07895c6ecdf016f8fc2978ee9.tar.bz2
historical-97a2b2dc1397fcb07895c6ecdf016f8fc2978ee9.zip
Some people don't understand what #ifndef means.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/ChangeLog8
-rw-r--r--media-libs/mesa/Manifest5
-rw-r--r--media-libs/mesa/files/configurable-dri-dir.patch10
-rw-r--r--media-libs/mesa/mesa-6.4.1-r1.ebuild8
4 files changed, 11 insertions, 20 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/Manifest b/media-libs/mesa/Manifest
index 90508112e847..5cdcdb853568 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,11 @@
-MD5 914a36772e108d65c5a9d9c9fb57643b ChangeLog 11767
+MD5 58e3a487febb40853afc65ad087168ae ChangeLog 11935
MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535
MD5 0551e02c2a091750ec95a2efed8220bb files/6.4.1-amd64-include-assyntax.patch 1289
MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
-MD5 445388fef1aaba316654749716f66086 files/configurable-dri-dir.patch 361
MD5 063dc3bc1f6634ab506e9c8ca8bb05c0 files/digest-mesa-6.4.1-r1 67
MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
-MD5 71d5e4493c134590df7772d978e6cf81 mesa-6.4.1-r1.ebuild 6017
+MD5 8f35bf1e8ace3857caa6b97c343322ef mesa-6.4.1-r1.ebuild 5902
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
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