amd64 fix

Package-Manager: portage-2.0.51.22-r1

5 files changed, 26 insertions, 6 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 5bd1dbfd451d..b547d99db923 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.97 2005/06/19 20:58:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.98 2005/06/25 08:53:34 lu_zero Exp $
+
+  25 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.14.13-amd64.patch,
+  ati-drivers-8.14.13.ebuild, ati-drivers-8.14.13-r1.ebuild:
+  fix for bug #96740, thanks to Marcin Deranekl <gringo@slonko.net> for
+  reporting and providing the patch
 
   19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/fglrx-2.6.12-inter_module_get.patch,
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 4252336674a6..9411bd12f038 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,10 +1,10 @@
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 MD5 3be35345fbc4005a932468eb839a64ff ati-drivers-8.10.19.ebuild 5968
 MD5 47d0a60400a6785be278b336b21b5209 ati-drivers-8.13.3.ebuild 6800
-MD5 c2b29e5fb9b59ac67ee4e45377acbcd2 ati-drivers-8.14.13.ebuild 6760
-MD5 03dc56ef29501454a35d1484fa0dfc73 ati-drivers-8.14.13-r1.ebuild 6489
+MD5 c5dff4c727e2af27370a644010deacb9 ati-drivers-8.14.13.ebuild 6800
+MD5 68687aca2c12a22ee54a41c3e44474fa ati-drivers-8.14.13-r1.ebuild 6529
 MD5 093c6498a344252964268bae7f88487e ati-drivers-8.12.10.ebuild 6746
-MD5 271282fdd65da234b225e3b6104e1e50 ChangeLog 16775
+MD5 e21a79f3d278ce1a6352ce5492305a6f ChangeLog 17022
 MD5 594314a4a5243fae95ca414ac615e93e ati-drivers-8.8.25-r3.ebuild 5753
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
 MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
@@ -16,6 +16,7 @@ MD5 0bb196d0a6bd03e2f5c197e145718095 files/digest-ati-drivers-8.14.13 79
 MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
 MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 22ee278fbe72170afff5bc34947a35b4 files/8.14.13-amd64.patch 365
 MD5 c60a324510581e10db73034d6ffc89e7 files/digest-ati-drivers-8.13.3 154
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild
index efd7ef7ef338..f8206bc55af6 100644
--- a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-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-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.5 2005/06/19 20:58:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild,v 1.6 2005/06/25 08:53:34 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -76,6 +76,7 @@ src_unpack() {
 	fi
 	epatch ${FILESDIR}/8.8.25-via-amd64.patch
 	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/8.14.13-amd64.patch
 	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
 }
 
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild
index ac7b54d411ff..4b5b51c03059 100644
--- a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13.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.ebuild,v 1.7 2005/06/19 20:58:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13.ebuild,v 1.8 2005/06/25 08:53:34 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -90,6 +90,7 @@ src_unpack() {
 	fi
 	epatch ${FILESDIR}/8.8.25-via-amd64.patch
 	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/8.14.13-amd64.patch
 	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
 }
 
diff --git a/media-video/ati-drivers/files/8.14.13-amd64.patch b/media-video/ati-drivers/files/8.14.13-amd64.patch
new file mode 100644
index 000000000000..c581a5c02661
--- /dev/null
+++ b/media-video/ati-drivers/files/8.14.13-amd64.patch
@@ -0,0 +1,12 @@
+--- build_mod.orig/firegl_public.c        2005-06-21 18:30:50.000000000 +0200
++++ build_mod/firegl_public.c     2005-06-21 18:31:31.000000000 +0200
+@@ -119,7 +119,9 @@
+ #endif
+
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+ #include "asm/ioctl32.h"
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
+ #include "linux/syscalls.h"
+ #endif