access_ok bug #109493 fixed and drm support as module bug #109689 fixed

Package-Manager: portage-1.589-cvs

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 8957091c188f2dcaae31fefb9629b4bf0438cc91..c22591e28c2c7d39ff2f875cb030b4aa0e5bfe58 100644 (file)
--- 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.118 2005/10/16 15:27:48 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.119 2005/10/19 14:20:48 lu_zero Exp $
+
+  19 Oct 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.18.6.ebuild:
+  Fix the verify_area/access_ok symbol, as reported in bug #109493 (thank you
+  Alex Giouzenis <agios@computer.org>), fixed the bug #109689 ( thank you Jakub
+  Argasiñski <argasek@tekla.art.pl>)
 
   16 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
   files/digest-ati-drivers-8.18.6, Manifest:

diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 75edcd93ab98d50977679a5453d71fd652b7ae1f..28736997602cb9b59910fb36ca6b25d4cfb0e61d 100644 (file)
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,10 +1,10 @@
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
-MD5 89e54d4881cc564b26e66e38730f359e ati-drivers-8.18.6.ebuild 6988
+MD5 2e5825fd6b2b03eb70a10b920f7eb3e3 ati-drivers-8.18.6.ebuild 7086
 MD5 a37cb5612ebeb94a8e4fa889c88c7c9e ati-drivers-8.14.13-r4.ebuild 7495
 MD5 2e1be14c39b4c9fd43e3f87b580e5302 ati-drivers-8.14.13-r5.ebuild 7781
 MD5 142444f733b464a3c075fac4415aef50 ati-drivers-8.16.20.ebuild 6227
-MD5 c69f68cf44c6d8f8420187dde74057e2 ChangeLog 20871
+MD5 395be9f215c89150683db997591cf310 ChangeLog 21144
 MD5 a96355b7f8818179863b85c69bf584c3 ati-drivers-8.14.13-r3.ebuild 7675
 MD5 9f31103cb72e7f3a236941fa70891c5a ati-drivers-8.16.20-r1.ebuild 6512
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807

diff --git a/media-video/ati-drivers/ati-drivers-8.18.6.ebuild b/media-video/ati-drivers/ati-drivers-8.18.6.ebuild
index 058118b78f39be1b72884828520baddf88e6d5df..ad5b3c698ec85b10bdb8b376a48d97a7c2b7a206 100644 (file)
--- a/media-video/ati-drivers/ati-drivers-8.18.6.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.18.6.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.18.6.ebuild,v 1.1 2005/10/15 16:18:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.18.6.ebuild,v 1.2 2005/10/19 14:20:48 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -32,7 +32,6 @@ pkg_setup(){
        #check kernel and sets up KV_OBJ
        linux-mod_pkg_setup
        local agp
-
        ebegin "Checking for MTRR support enabled"
        linux_chkconfig_present MTRR
        eend $?
@@ -58,10 +57,10 @@ pkg_setup(){
 
        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"
+       ewarn "You have DRM support enabled builtin, the direct rendering"
        ewarn "will not work."
        fi
 
@@ -80,11 +79,13 @@ src_unpack() {
 
        cd ${WORKDIR}/lib/modules/fglrx/build_mod
 
-#      if kernel_is 2 6
-#      then
+       if kernel_is 2 6
+       then
+               sed -i -e "s:verify_area:access_ok:g" \
+                       drm_os_linux.h firegl_public.c firegl_public.h
 #              epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
 #              epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
-#      fi
+       fi
 #      epatch ${FILESDIR}/8.8.25-via-amd64.patch
 #      epatch ${FILESDIR}/8.8.25-smp.patch
 #      epatch ${FILESDIR}/8.14.13-amd64.patch
@@ -119,7 +120,7 @@ src_compile() {
                        -e "s:\`uname -r\`:${KV_FULL}:" \
                        -i make.sh
                chmod +x make.sh
-               ./make.sh || die "DRM module not built"
+               ./make.sh || ewarn "DRM module not built"
        fi
 }