fix bug #27912

5 files changed, 47 insertions, 11 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 36430d8276b5..c243d992d1e0 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.14 2003/08/12 00:04:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.15 2003/09/04 23:05:06 lu_zero Exp $
+
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.4.ebuild,
+  files/fglrx-2.6-vmalloc-vmaddr.patch:
+  Added a workaround for mm-sources, cleaned a bit the ebuild.
+  thanks to wedge_ for the patch, solves bug #27912
 
 *ati-drivers-3.2.4 (12 Aug 2003)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 8d35011299e0..35ef01ac4922 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,13 +1,15 @@
+MD5 bca4dd1758b390509e46f966d475006d metadata.xml 221
 MD5 6c813f947d953a426286ca6f11ad45de ati-drivers-2.9.13.ebuild 3655
 MD5 39690003535cbb1298f6213bdd147bb7 ati-drivers-3.2.0.ebuild 4540
 MD5 c68623abd4fbf8a5ddaa56b2bbfcd4c6 ati-drivers-2.9.12.ebuild 3654
 MD5 1fa64133858500b621104b46d8e94b80 ati-drivers-2.9.13-r1.ebuild 4292
 MD5 f5d5c52bb63599ec70ff6d5bdbc4ab27 ati-drivers-2.5.1-r1.ebuild 3735
 MD5 9589e9577e2e9b5c8f846ead018931c7 ati-drivers-2.5.1.ebuild 3226
-MD5 a74aa56f43c551e0a8f6c2cf1bd6c4c6 ChangeLog 3012
+MD5 3fa323166346b32751052c943504c2e4 ChangeLog 3242
 MD5 b478e8446636c1b2be60449a8e6f43bc ati-drivers-2.9.8.ebuild 3767
 MD5 0502f917e7b43e4fdb170ae95b85961c ati-drivers-2.9.6.ebuild 3726
-MD5 60a036da1116be334c04e9eb5c1b9012 ati-drivers-3.2.4.ebuild 4571
+MD5 99a87a18b4760bf9c744998ee8adece2 ati-drivers-3.2.4.ebuild 4733
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
diff --git a/media-video/ati-drivers/ati-drivers-3.2.4.ebuild b/media-video/ati-drivers/ati-drivers-3.2.4.ebuild
index 7640cc22c32c..0c20ac3366b1 100644
--- a/media-video/ati-drivers/ati-drivers-3.2.4.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.4.ebuild,v 1.1 2003/08/12 00:04:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.2.4.ebuild,v 1.2 2003/09/04 23:05:06 lu_zero Exp $
 
 IUSE="qt kde gnome"
 
@@ -39,6 +39,19 @@ src_unpack() {
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 	Makefile >Makefile.new
 	mv Makefile.new Makefile
+	
+	if [ "`echo ${KV}|grep 2.6`" ] ; then
+	
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	einfo "creating Makefile for kernel 2.6"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
+	einfo "applying fglrx-2.6-fix-deprecated.patch"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-fix-deprecated.patch
+	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
+	einfo "applying fglrx-2.6-vmalloc-vmaddr"
+	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+	fi
 }
 
 pkg_setup(){
@@ -50,13 +63,7 @@ src_compile() {
 	einfo "building the glx module"
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
 	if [ "`echo ${KV}|grep 2.6`" ] ; then
-	    einfo "creating Makefile for kernel 2.6"
-	    patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
-	    einfo "applying fglrx-2.6-fix-deprecated.patch"
-	    patch -p1 < ${FILESDIR}/fglrx-2.6-fix-deprecated.patch
-	    einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
-	    patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-	    GENTOO_ARCH=${ARCH} unset ARCH
+		GENTOO_ARCH=${ARCH} unset ARCH
 	    addwrite "/usr/src/${FK}"
 	    make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
 	    ewarn "glx module not built"
diff --git a/media-video/ati-drivers/files/fglrx-2.6-vmalloc-vmaddr.patch b/media-video/ati-drivers/files/fglrx-2.6-vmalloc-vmaddr.patch
new file mode 100644
index 000000000000..aa4bc581129f
--- /dev/null
+++ b/media-video/ati-drivers/files/fglrx-2.6-vmalloc-vmaddr.patch
@@ -0,0 +1,14 @@
+diff -ruN build_mod.orig/firegl_public.c build_mod/firegl_public.c
+--- build_mod.orig/firegl_public.c	2003-09-05 00:45:33.539384168 +0200
++++ build_mod/firegl_public.c	2003-09-05 00:47:13.193234480 +0200
+@@ -129,7 +129,9 @@
+         #define pte_offset  pte_offset_map
+     #endif
+ #endif
+-
++#ifndef VMALLOC_VMADDR
++#define VMALLOC_VMADDR(x)  ((unsigned long)(x))
++#endif
+ // ============================================================
+ #ifndef TRUE
+ #define TRUE 1
diff --git a/media-video/ati-drivers/metadata.xml b/media-video/ati-drivers/metadata.xml
new file mode 100644
index 000000000000..72cb6bccefda
--- /dev/null
+++ b/media-video/ati-drivers/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>xfree</herd>
+<maintainer>
+  <email>lu_zero@gentoo.org</email>
+</maintainer>
+</pkgmetadata>