backport

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 74afc6654ab0808c0e07a30682e17a8a3a9d5322..5d9f35cee1c272f50772a605fb992acb97730770 100644 (file)
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/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/x11-drivers/ati-drivers/ChangeLog,v 1.4 2005/11/13 18:53:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.5 2005/11/14 01:29:09 lu_zero Exp $
+
+  14 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild:
+  Yet another backport port
 
   13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.19.10.ebuild:
   Wrong fowardport fixed.

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 3e86d9c85cb464d48f84beb3c6dcb6530015837d..32dc4875a1731922905ecbe1ab1ae83cd06ae9af 100644 (file)
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,6 @@
-MD5 b682ea4a7256c8567b2afdb74e3f7c70 ChangeLog 23546
+MD5 2a1191c93f71204b0b0ec48887b18e27 ChangeLog 23657
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
-MD5 83071b24a0bdc92d1b84865fcfe5488b ati-drivers-8.14.13-r3.ebuild 7673
+MD5 7c2441367f6cd51c0749a5b7216618e6 ati-drivers-8.14.13-r3.ebuild 7990
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
 MD5 9b0cd120ff46c57fde8096fe17892be8 ati-drivers-8.14.13-r5.ebuild 7779
 MD5 2e36e30cc577eec302628a9ea8ac1689 ati-drivers-8.16.20-r1.ebuild 6515

diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
index f9e94e0eb65d876e6d74e7553dc867e704f0a810..3b8f51f42996e5e535f3eb6322bc2ca54045213e 100644 (file)
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.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/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.2 2005/11/14 01:29:10 lu_zero Exp $
 
 IUSE="opengl dlloader"
 
@@ -43,12 +43,21 @@ pkg_setup(){
        ebegin "Checking for AGP support enabled"
        linux_chkconfig_present AGP
        eend $?
-       if [[ $? -ne 0 ]] ; then
-       ewarn "You don't have AGP support enabled, the direct rendering"
-       ewarn "will not work."
+
+               if [[ $? -ne 0 ]] ; then
+
+               ebegin "Checking for PCI Express support enabled"
+               linux_chkconfig_present PCIEPORTBUS
+               eend $?
+
+               if [[ $? -ne 0 ]] ; then
+                       ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+                       ewarn "could work only using the internal support."
+               fi
+
        fi
        ebegin "Checking for DRM support disabled"
-       ! linux_chkconfig_present DRM
+       ! linux_chkconfig_builtin DRM
        eend $?
        if [[ $? -ne 0 ]] ; then
        ewarn "You have DRM support enabled, the direct rendering"
@@ -77,11 +86,16 @@ src_unpack() {
                epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
                epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
                epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+               epatch ${FILESDIR}/fglrx-2.6.14-access_ok.patch
        fi
        epatch ${FILESDIR}/8.8.25-via-amd64.patch
        epatch ${FILESDIR}/8.8.25-smp.patch
        epatch ${FILESDIR}/ioctl32.patch
        epatch ${FILESDIR}/p1.patch
+       if use amd64
+       then
+       epatch ${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch
+       fi
 
        rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
 }