--- /usr/portage/x11-drivers/ati-drivers/ati-drivers-8.30.3-r1.ebuild 2006-11-02 12:22:52.000000000 -0600
+++ ../gentoo/x11-drivers/ati-drivers/ati-drivers-8.32.1.ebuild 2006-12-01 20:10:17.858956016 -0600
@@ -27,11 +27,11 @@
PROVIDE="virtual/opengl"
+S="${WORKDIR}/common/lib/modules/fglrx/build_mod"
+
ATIBIN="${D}/opt/ati/bin"
RESTRICT="nostrip multilib-pkg-force stricter"
-MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
-
QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
@@ -77,41 +77,26 @@
}
pkg_setup(){
+ CONFIG_CHECK="~MTRR"
+ ERROR_MTRR="You don't have MTRR support enabled, the direct rendering will not work."
+
#check kernel and sets up KV_OBJ
linux-mod_pkg_setup
- local agp
- ebegin "Checking for MTRR support enabled"
- linux_chkconfig_present MTRR
- eend $?
- if [[ $? -ne 0 ]] ; then
- ewarn "You don't have MTRR support enabled, the direct rendering"
- ewarn "will not work."
- fi
-
- ebegin "Checking for AGP support enabled"
- linux_chkconfig_present AGP
- eend $?
-
- 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_builtin DRM
- eend $?
- if [[ $? -ne 0 ]] ; then
- ewarn "You have DRM support enabled builtin, the direct rendering"
- ewarn "will not work."
+ if linux_chkconfig_builtin DRM; then
+ ewarn "You have DRM support enabled builtin, the direct rendering will not work."
fi
+ if ! linux_chkconfig_present AGP && ! linux_chkconfig_present PCIEPORTBUS ;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
+
+ MODULE_NAMES="fglrx(video)"
+ BUILD_TARGETS="modules"
+ use_m && BUILD_PARAMS="-C ${KV_DIR} M=\"${S}\" GCC_VER_MAJ=$(gcc-major-version)" \
+ || BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=\"${S}\" GCC_VER_MAJ=$(gcc-major-version)"
+
# Set up X11 implementation
if has_version "x11-base/xorg-server"; then
X11_IMPLEM=xorg-x11
@@ -142,6 +127,8 @@
rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+ epatch ${FILESDIR}/${PN}-8.31.5-linux-2.6.19.patch
+
if use acpi
then
sed -i \
@@ -158,17 +145,16 @@
src_compile() {
einfo "Building the DRM module..."
- cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
ln -s \
${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
|| die "cannot find precompiled core"
- if kernel_is 2 6
- then
+ export _POSIX2_VERSION="199209"
+
+ if kernel_is 2 6; then
set_arch_to_kernel
addwrite "/usr/src/${FK}"
cp 2.6.x/Makefile .
- export _POSIX2_VERSION="199209"
if use_m ;
then
make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
@@ -177,9 +163,7 @@
make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
modules || ewarn "DRM module not built"
fi
- set_arch_to_portage
else
- export _POSIX2_VERSION="199209"
# That is the dirty way to avoid the id -u check
sed -e 's:`id -u`:0:' \
-e "s:\`uname -r\`:${KV_FULL}:" \
@@ -200,7 +184,6 @@
src_install() {
local ATI_LIBGL_PATH=""
- cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
linux-mod_src_install
cd ${WORKDIR}