added patch for 2.6.15 support; small change for libfglrxdrm.so

Package-Manager: portage-2.1_pre3-r1

4 files changed, 25 insertions, 5 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 2375e6e0ed9d..23c09a1c1059 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.18 2006/01/21 19:56:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.19 2006/01/21 21:15:52 anarchy Exp $
+
+  21 Jan 2006; <anarchy@gentoo.org>
+  +files/ati-drivers-8.21.7-linux-2.6.15.patch, ati-drivers-8.21.7.ebuild:
+  2.6.15 patch added, small fix for libfglrxdrm.so
 
 *ati-drivers-8.21.7 (21 Jan 2006)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 186125a31087..ac980d2ed673 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,4 +1,4 @@
-MD5 b3dba3c3b9bedb93cfe75dffe193daa6 ChangeLog 25116
+MD5 414eaaa8333f0ec6aa7e7a64b91ae23c ChangeLog 25279
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
 MD5 fff3d657c788a8d71b363ae449d9a845 ati-drivers-8.14.13-r3.ebuild 7914
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
@@ -12,11 +12,12 @@ MD5 224722f6f6fe46600354602a1a858d7b ati-drivers-8.18.8-r2.ebuild 8167
 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
 MD5 d870b6a0318da9f732c271d923aea32e ati-drivers-8.19.10.ebuild 8221
 MD5 fbf3f393a9d60dcb7f425e2fc9ed448e ati-drivers-8.20.8.ebuild 8365
-MD5 a113def382523740866e78c0fd79d0a9 ati-drivers-8.21.7.ebuild 8397
+MD5 31d233b15ed4264cc19dc59af867e2f7 ati-drivers-8.21.7.ebuild 8518
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
 MD5 193e384c325f1483353da6ea4ca87da3 files/ati-drivers-8.20.8-linux-2.6.15.patch 522
+MD5 12b0f155a9a1089d55b85d9c89c2ef86 files/ati-drivers-8.21.7-linux-2.6.15.patch 447
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
index 65b2b56fe274..578ede3bca0e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.21.7.ebuild,v 1.1 2006/01/21 19:56:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7.ebuild,v 1.2 2006/01/21 21:15:52 anarchy Exp $
 
 IUSE="opengl"
 
@@ -58,7 +58,6 @@ choose_driver_paths() {
 	else
 		ARCH_DIR="${ARCH_DIR}/x86"
 	fi
-	
 }
 
 pkg_setup(){
@@ -283,6 +282,11 @@ src_install-libs() {
 	else
 		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
 	fi
+
+	if has_version "x11-base/xorg-server"; then
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+
 	cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
 			${D}/usr/$(get_libdir)
 	#Not the best place
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.21.7-linux-2.6.15.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.21.7-linux-2.6.15.patch
new file mode 100644
index 000000000000..98123f4f6ef3
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-8.21.7-linux-2.6.15.patch
@@ -0,0 +1,11 @@
+--- firegl_public.c-orig	2006-01-21 10:54:12.007580904 -0600
++++ firegl_public.c	2006-01-21 10:56:28.515828496 -0600
+@@ -2638,7 +2638,7 @@
+ 
+     pMmPage = virt_to_page(kaddr);
+ 
+-#if 0
++#if LINUX_VERSION_CODE >= 0x02060f
+     // WARNING WARNINIG WARNNING WARNNING WARNNING WARNNING WARNNING WARNNING
+     // Don't increment page usage count, cause ctx pages are allocated
+     // with drm_alloc_pages, which marks all pages as reserved. Reserved