Clean up multilib fixes.

Package-Manager: portage-2.0.53

5 files changed, 71 insertions, 12 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 5ab51ddf3f6d..2beb45e43da3 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2005/12/12 06:25:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.58 2005/12/16 02:10:04 herbs Exp $
+
+  16 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/6.4-multilib-fix.patch, +files/configurable-dri-dir.patch,
+  mesa-6.4.1-r1.ebuild:
+  Cleaned up multilib fixes, made default dri drivers directory configurable
+  so we can set it to lib64 on multilib systems.
 
 *mesa-6.4.1-r1 (12 Dec 2005)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d099374f8a4d..e8b062813f53 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,22 @@
-MD5 aa71399364c5f18f8f2da31c47b73548 ChangeLog 11409
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c83493259049c266f52c6a328a7bb053 ChangeLog 11673
 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 492cd47ec237851d07193207f0415b03 mesa-6.4.1-r1.ebuild 5903
+MD5 d5a0051931ba6eb2df8147ac0cee83c7 mesa-6.4.1-r1.ebuild 6008
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDoiIL2G5bA0cA/ScRAlm2AKC6qliI8ucsP8v+i8BlvUgPD+aylACfRevE
+0w3Vcv+0bGgFPytUeW7DRsE=
+=4Z6R
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/6.4-multilib-fix.patch b/media-libs/mesa/files/6.4-multilib-fix.patch
new file mode 100644
index 000000000000..8e16a9551e34
--- /dev/null
+++ b/media-libs/mesa/files/6.4-multilib-fix.patch
@@ -0,0 +1,27 @@
+--- bin/installmesa.multilib-fix	2005-12-16 01:46:30.000000000 +0000
++++ bin/installmesa	2005-12-16 01:47:22.000000000 +0000
+@@ -9,8 +9,9 @@
+ 
+ TOP=.
+ 
+-INCLUDE_DIR="/usr/local/include"
+-LIB_DIR="/usr/local/lib"
++# Default to /usr/local if these aren't already set.
++INCLUDE_DIR="${INCLUDE_DIR:-/usr/local/include}"
++LIB_DIR="${LIB_DIR:-/usr/local/lib}"
+ 
+ if [ "x$#" = "x0" ] ; then
+ echo
+@@ -40,9 +41,9 @@
+ 
+ read INPUT
+ 
+-else
+-INCLUDE_DIR=$1/include
+-LIB_DIR=$1/lib
++#else
++#INCLUDE_DIR=$1/include
++#LIB_DIR=$1/lib
+ fi
+ 
+ # flags:
diff --git a/media-libs/mesa/files/configurable-dri-dir.patch b/media-libs/mesa/files/configurable-dri-dir.patch
new file mode 100644
index 000000000000..3b0f65aed39e
--- /dev/null
+++ b/media-libs/mesa/files/configurable-dri-dir.patch
@@ -0,0 +1,10 @@
+--- 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 925868451235..f29fdd7e4d0c 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
 # 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.1 2005/12/12 06:25:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1-r1.ebuild,v 1.2 2005/12/16 02:10:04 herbs Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -50,8 +50,6 @@ pkg_setup() {
 		CONFIG="freebsd"
 	elif use x86; then
 		CONFIG="linux-dri-x86"
-	# amd64 people need to look at this file to deal with lib64 issues, unless
-	# they're fine with hardcoded lib64.
 	elif use amd64; then
 		CONFIG="linux-dri-x86-64"
 	elif use ppc; then
@@ -69,9 +67,15 @@ src_unpack() {
 
 	epatch ${FILESDIR}/makedepend-location.patch
 	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
-	epatch ${FILESDIR}/change-default-dri-driver-dir.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}/6.4-multilib-fix.patch
 	epatch ${FILESDIR}/${PV}-amd64-include-assyntax.patch
 
+	# Set default dri drivers directory
+	echo "DRI_DRIVER_DIR = /usr/$(get_libdir)/xorg/modules/dri" >> ${HOSTCONF}
+
 	# Set up linux-dri configs
 	if use sparc; then
 		einfo "Define the sparc DRI drivers."
@@ -112,10 +116,6 @@ src_unpack() {
 		# Add GLwMDrawA.c
 		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
 	fi
-
-	# Fix install libdir
-	sed -i -e "s:LIB_DIR=\$1/lib:LIB_DIR=\$1/$(get_libdir):" \
-			${S}/bin/installmesa || die "sed failed"
 }
 
 src_compile() {
@@ -124,7 +124,11 @@ src_compile() {
 
 src_install() {
 	dodir /usr
-	make DESTDIR=${D}/usr install || die "Installation failed"
+	make \
+		DESTDIR=${D}/usr \
+		INCLUDE_DIR=${D}/usr/include \
+		LIB_DIR=${D}/usr/$(get_libdir) \
+		install || die "Installation failed"
 
 	##
 	# Install the actual drivers --- 'make install' doesn't install them