Fix 32bit dri support on amd64, bug 101539.

Package-Manager: portage-2.0.52-r1

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 16770562682b8ae48dbf44da46f15c87f90d2d95..0e0246b639f0ae95dd64ffec44a0818670beddc2 100644 (file)
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.109 2005/09/10 13:13:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.110 2005/09/13 22:20:37 herbs Exp $
+
+  13 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
+  ati-drivers-8.14.13-r4.ebuild, ati-drivers-8.16.20.ebuild:
+  Fix 32bit dri support on amd64, bug 101539.
 
   10 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index dec4d7e4e1d0d1675a27bb10677af2702685254f..b9a4a57fabfd823d7cb01cb5a6539a535d72882e 100644 (file)
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,18 +1,28 @@
-MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
-MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
-MD5 761518fef24bed0f2ab9bada6219b83d ati-drivers-8.14.13-r4.ebuild 7497
-MD5 d1e11b038da8c123e0a54c7758f2f0da ati-drivers-8.16.20.ebuild 6229
-MD5 f03757e945d6bcf35be289305f88839d ChangeLog 19693
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 105e48927920d0a38ce78b201f10b5ba ati-drivers-8.14.13-r3.ebuild 7659
-MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
+MD5 68dd160d7cfb5b89a52b0f266ac70552 ati-drivers-8.16.20.ebuild 6495
+MD5 dac14a37469832f92c8ebc01b6041d2d ati-drivers-8.14.13-r4.ebuild 7763
+MD5 3e17bddce39f88c2f8ac054ed4b2c66d ChangeLog 19848
+MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
+MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
 MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
-MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
-MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
+MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
+MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
-MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
-MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJ1DD2G5bA0cA/ScRAvSsAJ9tHkZfFQksY+s+gnjC7X4rGAPrcwCfQyS+
+sOv3l5TcbP/sa9+wA74McBk=
+=2eQ7
+-----END PGP SIGNATURE-----

diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild
index 0ead6b7405605813161f1e63447cebe7de58de1a..39d6c5930654ff721681efe050deca2f17e1dfbf 100644 (file)
--- a/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-r4.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-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.2 2005/09/10 13:13:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.3 2005/09/13 22:20:37 herbs Exp $
 
 IUSE="opengl dlloader"
 
@@ -156,14 +156,25 @@ src_install() {
        fi &> /dev/null
 
        #apps
-       insinto /etc/env.d
-       doins ${FILESDIR}/09ati
        exeinto /opt/ati/bin
        doexe usr/X11R6/bin/*
 
        #ati custom stuff
        insinto /usr
        doins -r ${WORKDIR}/usr/include
+
+       #env.d entry
+       cp ${FILESDIR}/09ati ${T}/
+
+       #Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+       if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+               cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+       fi
+
+       doenvd ${T}/09ati
 }
 
 src_install-libs() {

diff --git a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild b/media-video/ati-drivers/ati-drivers-8.16.20.ebuild
index 331690654c3c23ad070a5cc4b15ec99774576c14..eb1f2efdd05c40531f878a79b7386e6010a3e0f3 100644 (file)
--- a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.16.20.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-video/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.7 2005/09/10 13:13:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.8 2005/09/13 22:20:37 herbs Exp $
 
 IUSE="opengl"
 
@@ -150,14 +150,25 @@ src_install() {
        fi &> /dev/null
 
        #apps
-       insinto /etc/env.d
-       doins ${FILESDIR}/09ati
        exeinto /opt/ati/bin
        doexe usr/X11R6/bin/*
 
        #ati custom stuff
        insinto /usr
        doins -r ${WORKDIR}/usr/include
+
+       #env.d entry
+       cp ${FILESDIR}/09ati ${T}/
+
+       #Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+       if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+               cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+       fi
+
+       doenvd ${T}/09ati
 }
 
 src_install-libs() {