summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog6
-rw-r--r--x11-drivers/ati-drivers/Manifest6
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild24
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild4
4 files changed, 29 insertions, 11 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 105e8f03e28c..03a09bcc3595 100644
--- 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.2 2005/11/12 22:45:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.3 2005/11/13 16:47:16 lu_zero Exp $
+
+ 13 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+ ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.19.10.ebuild:
+ Backport fixes for 2.6.14
*ati-drivers-8.19.10 (12 Nov 2005)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 0cb1ba083a53..74a0414629c7 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,5 +1,5 @@
-MD5 edab2eac855aa18efaf1797b6b3cb4c7 ChangeLog 23303
-MD5 708b3e765580d0d02cbe24049df6c5e1 ati-drivers-8.14.13-r2.ebuild 6687
+MD5 e73215ff6e89c9a17327e2faed3c2259 ChangeLog 23442
+MD5 464b941075788fe615d70df22ea55dfa ati-drivers-8.14.13-r2.ebuild 7005
MD5 83071b24a0bdc92d1b84865fcfe5488b ati-drivers-8.14.13-r3.ebuild 7673
MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
MD5 9b0cd120ff46c57fde8096fe17892be8 ati-drivers-8.14.13-r5.ebuild 7779
@@ -9,7 +9,7 @@ MD5 709b23aa0176849c66ed9b1ed702dc29 ati-drivers-8.18.6-r1.ebuild 7910
MD5 e1a0e8561a29e904bd4f5381da97d219 ati-drivers-8.18.6.ebuild 7086
MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174
MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
-MD5 51b30fd7785c06100caaeae53c49a4d3 ati-drivers-8.19.10.ebuild 8033
+MD5 44bbfbe116e85db8e73487ee567dc688 ati-drivers-8.19.10.ebuild 8031
MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
index 96f71d278fe2..7cf801754314 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.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-r2.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-r2.ebuild,v 1.2 2005/11/13 16:47:16 lu_zero Exp $
IUSE="opengl"
@@ -41,12 +41,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"
@@ -75,11 +84,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
}
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index ed60e715fe2a..aac6fd1aface 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.19.10.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.19.10.ebuild,v 1.1 2005/11/12 22:45:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.2 2005/11/13 16:47:16 lu_zero Exp $
IUSE="opengl"
@@ -116,7 +116,7 @@ src_unpack() {
then
if use amd64
then
- epatch "${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch"
+ epatch ${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch
fi
fi
}