diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-09-03 22:29:45 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-09-03 22:29:45 +0000 |
| commit | 35fa438f939014a4ef7766c1a8650148e0819060 (patch) | |
| tree | 4d132b18eaaeefa01dd9b32497f33cb54d454a99 /media-video/ati-drivers | |
| parent | Create the man user/group. (diff) | |
| download | gentoo-2-35fa438f939014a4ef7766c1a8650148e0819060.tar.gz gentoo-2-35fa438f939014a4ef7766c1a8650148e0819060.tar.bz2 gentoo-2-35fa438f939014a4ef7766c1a8650148e0819060.zip | |
Clean outold cruft. Revbump to transition to eselect over opengl-update.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-video/ati-drivers')
31 files changed, 64 insertions, 2415 deletions
diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog index a07eed89c84d..e1b5162d055a 100644 --- a/media-video/ati-drivers/ChangeLog +++ b/media-video/ati-drivers/ChangeLog @@ -1,6 +1,23 @@ # 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.106 2005/08/23 21:22:11 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.107 2005/09/03 22:29:45 eradicator Exp $ + +*ati-drivers-8.14.13-r4 (03 Sep 2005) + + 03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> + -files/3.2.5-linux-2.6.0-test6-mm.patch, + -files/fglrx-2.6.10-pci_get_class.patch, -files/8.08-kernel-2.6.10.patch, + -files/fglrx-2.6-amd-adv-spec-fix.patch, -files/fglrx-2.6-get-page.patch, + -files/fglrx-2.6-makefile.patch, -files/8.14.13-amd64.patch, + -files/fglrx-2.6-fix-deprecated.patch, -files/fglrx-2.6-iminor.patch, + -files/fglrx-2.6-pagetable.patch, -files/fglrx-2.6-vmalloc-vmaddr.patch, + -ati-drivers-8.8.25-r3.ebuild, -ati-drivers-8.10.19.ebuild, + -ati-drivers-8.12.10.ebuild, -ati-drivers-8.13.3.ebuild, + -ati-drivers-8.13.4.ebuild, -ati-drivers-8.14.13.ebuild, + -ati-drivers-8.14.13-r1.ebuild, -ati-drivers-8.14.13-r2.ebuild, + ati-drivers-8.14.13-r3.ebuild, +ati-drivers-8.14.13-r4.ebuild, + ati-drivers-8.16.20.ebuild: + Clean outold cruft. Revbump to transition to eselect over opengl-update. 23 Aug 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.16.20.ebuild: diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest index 46c2230e3715..394dc37cbbba 100644 --- a/media-video/ati-drivers/Manifest +++ b/media-video/ati-drivers/Manifest @@ -1,41 +1,16 @@ +MD5 c65dcf2e5eaa8832f0d3b3f2494ac015 ChangeLog 19365 +MD5 98054c2a1cd595a5086bb9b5dc00bc2b ati-drivers-8.14.13-r4.ebuild 7446 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227 -MD5 ad2d09c03a4a3afc864e6f9973e13c93 ati-drivers-8.14.13-r2.ebuild 6609 -MD5 3be35345fbc4005a932468eb839a64ff ati-drivers-8.10.19.ebuild 5968 -MD5 47d0a60400a6785be278b336b21b5209 ati-drivers-8.13.3.ebuild 6800 -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 fad4275afdfb552471790ed48bc8e0d7 ati-drivers-8.16.20.ebuild 6342 -MD5 0d90e380d3d781397d5d4df57ba33c80 ChangeLog 18446 -MD5 e7facf4c6e40ede98655179dbe98377f ati-drivers-8.13.4.ebuild 6916 -MD5 594314a4a5243fae95ca414ac615e93e ati-drivers-8.8.25-r3.ebuild 5753 -MD5 8784654c96339c98675ef8fb27db41e8 ati-drivers-8.14.13-r3.ebuild 7610 -MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807 -MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468 -MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r1 157 +MD5 f5006f3fa128da4b1074f75a26e29f59 ati-drivers-8.16.20.ebuild 6178 +MD5 99fa366545ac55b7c20e8ff13b122af8 ati-drivers-8.14.13-r3.ebuild 7608 +MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39 +MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376 -MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156 -MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466 -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 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586 +MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120 +MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265 +MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198 -MD5 22ee278fbe72170afff5bc34947a35b4 files/8.14.13-amd64.patch 365 +MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586 MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368 -MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157 -MD5 c60a324510581e10db73034d6ffc89e7 files/digest-ati-drivers-8.13.3 154 -MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39 -MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157 -MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492 -MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370 -MD5 07627fc3e9b0e3a88796e9ae7b285373 files/digest-ati-drivers-8.13.4 154 -MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265 -MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847 -MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172 -MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096 -MD5 28e1ac88033da1899a711d26c10d93b6 files/fglrx-2.6-pagetable.patch 5027 -MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120 -MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309 -MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571 +MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158 diff --git a/media-video/ati-drivers/ati-drivers-8.10.19.ebuild b/media-video/ati-drivers/ati-drivers-8.10.19.ebuild deleted file mode 100644 index e4335b1ef89a..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.10.19.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# 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.10.19.ebuild,v 1.6 2005/04/08 00:53:11 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils rpm multilib linux-info linux-mod - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* x86 ~amd64" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6-pagetable.patch - fi - epatch ${FILESDIR}/8.8.25-via-amd64.patch - rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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`" modules || \ - ewarn "DRM module not built" - else - make -C ${KV_DIR} SUBDIRS="`pwd`" 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - ewarn "***" - ewarn "If you are experiencing problems with memory allocation try to add" - ewarn "this line to in your X11 configuration file:" - ewarn " Option \"KernelModuleParm\" \"agplock=0\" " - ewarn "That should solve the hangups you could have with Neverwinter Nights" - ewarn "***" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} diff --git a/media-video/ati-drivers/ati-drivers-8.12.10.ebuild b/media-video/ati-drivers/ati-drivers-8.12.10.ebuild deleted file mode 100644 index 70beaa65f727..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.12.10.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# 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.12.10.ebuild,v 1.8 2005/05/07 18:48:30 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils rpm multilib linux-info linux-mod toolchain-funcs - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* x86 ~amd64" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - - 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 - ewarn "You don't have AGP support enabled, the direct rendering" - ewarn "will not work." - fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_present DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled, the direct rendering" - ewarn "will not work." - fi - - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6-pagetable.patch - fi - epatch ${FILESDIR}/8.8.25-via-amd64.patch - epatch ${FILESDIR}/8.8.25-smp.patch - rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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) \ - modules || ewarn "DRM module not built" - else - 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - ewarn "***" - ewarn "If you are experiencing problems with memory allocation try to add" - ewarn "this line to in your X11 configuration file:" - ewarn " Option \"KernelModuleParm\" \"agplock=0\" " - ewarn "That should solve the hangups you could have with Neverwinter Nights" - ewarn "***" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} - -pkg_postrm() { - opengl-update --use-old xorg-x11 -} - diff --git a/media-video/ati-drivers/ati-drivers-8.13.3.ebuild b/media-video/ati-drivers/ati-drivers-8.13.3.ebuild deleted file mode 100644 index 444a39f78437..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.13.3.ebuild +++ /dev/null @@ -1,255 +0,0 @@ -# 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.13.3.ebuild,v 1.1 2005/05/21 20:22:18 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils rpm multilib linux-info linux-mod toolchain-funcs - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* ~amd64 ~x86" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - - 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 - ewarn "You don't have AGP support enabled, the direct rendering" - ewarn "will not work." - fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_present DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled, the direct rendering" - ewarn "will not work." - fi - - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6-pagetable.patch - epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch - fi - epatch ${FILESDIR}/8.8.25-via-amd64.patch - epatch ${FILESDIR}/8.8.25-smp.patch - rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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) \ - modules || ewarn "DRM module not built" - else - 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - ewarn "***" - ewarn "If you are experiencing problems with memory allocation try to add" - ewarn "this line to in your X11 configuration file:" - ewarn " Option \"KernelModuleParm\" \"agplock=0\" " - ewarn "That should solve the hangups you could have with Neverwinter Nights" - ewarn "***" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} - -pkg_postrm() { - opengl-update --use-old xorg-x11 -} - diff --git a/media-video/ati-drivers/ati-drivers-8.13.4.ebuild b/media-video/ati-drivers/ati-drivers-8.13.4.ebuild deleted file mode 100644 index ee6dce3037de..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.13.4.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# 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.13.4.ebuild,v 1.1 2005/06/25 09:19:44 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils rpm multilib linux-info linux-mod toolchain-funcs - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( - http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* ~amd64 ~x86" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - - 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 - ewarn "You don't have AGP support enabled, the direct rendering" - ewarn "will not work." - fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_present DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled, the direct rendering" - ewarn "will not work." - fi - - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6-pagetable.patch - epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch - epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch - epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch - fi - epatch ${FILESDIR}/8.8.25-via-amd64.patch - epatch ${FILESDIR}/8.8.25-smp.patch - rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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) \ - modules || ewarn "DRM module not built" - else - 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - ewarn "***" - ewarn "If you are experiencing problems with memory allocation try to add" - ewarn "this line to in your X11 configuration file:" - ewarn " Option \"KernelModuleParm\" \"agplock=0\" " - ewarn "That should solve the hangups you could have with Neverwinter Nights" - ewarn "***" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} - -pkg_postrm() { - opengl-update --use-old xorg-x11 -} - 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 deleted file mode 100644 index f8206bc55af6..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.14.13-r1.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# 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.6 2005/06/25 08:53:34 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils rpm multilib linux-info linux-mod toolchain-funcs - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* ~amd64 ~x86" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - - 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 - ewarn "You don't have AGP support enabled, the direct rendering" - ewarn "will not work." - fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_present DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled, the direct rendering" - ewarn "will not work." - fi - - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch - epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch - 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 -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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) \ - modules || ewarn "DRM module not built" - else - 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so - - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} - -pkg_postrm() { - opengl-update --use-old xorg-x11 -} - diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild index 7444509e58e9..71f6c8e33db4 100644 --- a/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild +++ b/media-video/ati-drivers/ati-drivers-8.14.13-r3.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-r3.ebuild,v 1.1 2005/08/03 23:04:42 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.2 2005/09/03 22:29:45 eradicator Exp $ IUSE="opengl dlloader" @@ -12,7 +12,7 @@ SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" LICENSE="ATI" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND=">=x11-base/xorg-x11-6.8.0 >=x11-base/opengl-update-2.1_pre1" diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r2.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild index 8658f6551b7f..11c3e2b49f53 100644 --- a/media-video/ati-drivers/ati-drivers-8.14.13-r2.ebuild +++ b/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild @@ -1,8 +1,8 @@ # 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-r2.ebuild,v 1.3 2005/08/23 21:22:12 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.1 2005/09/03 22:29:45 eradicator Exp $ -IUSE="opengl" +IUSE="opengl dlloader" inherit eutils rpm multilib linux-info linux-mod toolchain-funcs @@ -12,10 +12,10 @@ SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" LICENSE="ATI" -KEYWORDS="-* amd64 x86" +KEYWORDS="-* ~amd64 ~x86" RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" + app-admin/eselect-opengl" DEPEND=">=virtual/linux-sources-2.4 ${RDEPEND}" @@ -209,15 +209,35 @@ src_install-libs() { local X11_LIB_DIR="${X11_DIR}${inslibdir}" exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o + if use !dlloader ; then + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o + else + einfo "Adapting fglrx_drv to dlloader..." + gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \ + ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \ + -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \ + -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \ + -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \ + -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so + fi exeinto ${X11_LIB_DIR}/modules/dri doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ + if use !dlloader ; then + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a + else + einfo "Adapting libfglrxdrm to dlloader..." + ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a + gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \ + module.o FireGLdrm.o + rm module.o FireGLdrm.o + doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so + fi + cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ ${D}/${X11_LIB_DIR} #Not the best place insinto ${X11_DIR}/include/X11/extensions @@ -227,12 +247,7 @@ src_install-libs() { pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi + /usr/bin/eselect opengl set --use-old ati echo einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" @@ -248,6 +263,6 @@ pkg_postinst() { } pkg_postrm() { - opengl-update --use-old xorg-x11 + /usr/bin/eselect opengl set --use-old xorg-x11 } diff --git a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13.ebuild deleted file mode 100644 index 4b5b51c03059..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.14.13.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# 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.8 2005/06/25 08:53:34 lu_zero Exp $ - -IUSE="opengl" - -inherit eutils multilib linux-info linux-mod toolchain-funcs - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( -http://www2.ati.com/drivers/linux/ati-driver-installer-${PV}.run ) - amd64? ( - http://www2.ati.com/drivers/linux/64bit/ati-driver-installer-${PV}.run - )" - -LICENSE="ATI" -KEYWORDS="-* ~amd64 ~x86" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -## MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - - 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 - ewarn "You don't have AGP support enabled, the direct rendering" - ewarn "will not work." - fi - ebegin "Checking for DRM support disabled" - ! linux_chkconfig_present DRM - eend $? - if [[ $? -ne 0 ]] ; then - ewarn "You have DRM support enabled, the direct rendering" - ewarn "will not work." - fi - - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - sh ${DISTDIR}/${A} --extract ${WORKDIR}/fglrx &>/dev/null \ - || die "Unpack failed" - cp -af ${WORKDIR}/fglrx/common/* ${WORKDIR} - - if use amd64 ; - then - cp -af ${WORKDIR}/fglrx/x680_64a/* ${WORKDIR} - fi - - if use x86 ; - then - cp -af ${WORKDIR}/fglrx/x680/* ${WORKDIR} - fi - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - if kernel_is 2 6 - then - epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch - epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch - 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 -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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) \ - modules || ewarn "DRM module not built" - else - 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - insinto /usr - doins -r ${WORKDIR}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl ; then - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - fi - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so - - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi - # DRM module - update-modules -} - -pkg_postrm() { - opengl-update --use-old xorg-x11 -} - diff --git a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild b/media-video/ati-drivers/ati-drivers-8.16.20.ebuild index 32169582c59e..3a07f1fe4818 100644 --- a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild +++ b/media-video/ati-drivers/ati-drivers-8.16.20.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.16.20.ebuild,v 1.5 2005/08/23 21:22:12 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.6 2005/09/03 22:29:45 eradicator Exp $ IUSE="opengl" @@ -15,7 +15,7 @@ LICENSE="ATI" KEYWORDS="-*" #~amd64 ~x86" RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" + app-admin/eselect-opengl" DEPEND=">=virtual/linux-sources-2.4 ${RDEPEND}" @@ -221,12 +221,7 @@ src_install-libs() { pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi + /usr/bin/eselect opengl set --use-old ati echo einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" @@ -242,6 +237,6 @@ pkg_postinst() { } pkg_postrm() { - opengl-update --use-old xorg-x11 + /usr/bin/eselect opengl set --use-old xorg-x11 } diff --git a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild deleted file mode 100644 index 7ce5941f724b..000000000000 --- a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# 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.8.25-r3.ebuild,v 1.8 2005/04/18 06:49:42 eradicator Exp $ - -IUSE="" - -inherit eutils rpm multilib linux-info linux-mod - -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" -HOMEPAGE="http://www.ati.com" -SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm ) - amd64? ( http://www2.ati.com/drivers/linux/fglrx64_6_8_0-${PV}-1.x86_64.rpm )" - -LICENSE="ATI" -KEYWORDS="-* x86 ~amd64" - -RDEPEND=">=x11-base/xorg-x11-6.8.0 - >=x11-base/opengl-update-2.1_pre1" - -DEPEND=">=virtual/linux-sources-2.4 - ${RDEPEND}" - -PROVIDE="virtual/opengl" - -ATIBIN="${D}/opt/ati/bin" -RESTRICT="nostrip multilib-pkg-force" - -pkg_setup(){ - #check kernel and sets up KV_OBJ - linux-mod_pkg_setup - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." -} - -src_unpack() { - local OLDBIN="/usr/X11R6/bin" - - cd ${WORKDIR} - rpm_src_unpack - - cd ${WORKDIR}/lib/modules/fglrx/build_mod - - #epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch - - if kernel_is 2 6 - then - #epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch - epatch ${FILESDIR}/8.08-kernel-2.6.10.patch - epatch ${FILESDIR}/fglrx-2.6-pagetable.patch - fi - epatch ${FILESDIR}/8.8.25-via-amd64.patch - rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears -} - -src_compile() { - einfo "Building the DRM module..." - cd ${WORKDIR}/lib/modules/fglrx/build_mod - 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`" modules || \ - ewarn "DRM module not built" - else - make -C ${KV_DIR} SUBDIRS="`pwd`" 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}:" \ - -i make.sh - chmod +x make.sh - ./make.sh || die "DRM module not built" - fi -} - -pkg_preinst() { - # Clean the dinamic libGL stuff's home to ensure - # we don't have stale libs floating around ... - if [ -d "${ROOT}/usr/lib/opengl/ati" ] - then - rm -rf ${ROOT}/usr/lib/opengl/ati/* - fi -} - -src_install() { - local ATI_ROOT="/usr/lib/opengl/ati" - - cd ${WORKDIR} - - # DRM module - insinto /lib/modules/${KV_FULL}/video - # set_kvobj - doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ} - - local native_dir - use x86 && native_dir="lib" - use amd64 && native_dir="lib64" - - # Install the libs - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - elif has_multilib_profile; then - src_install-libs - elif use amd64; then - src_install-libs lib $(get_multilibdir) - src_install-libs lib64 $(get_libdir) - else - src_install-libs - fi &> /dev/null - - #apps - insinto /etc/env.d - doins ${FILESDIR}/09ati - exeinto /opt/ati/bin - doexe usr/X11R6/bin/* - - #ati custom stuff - cp -a ${WORKDIR}/usr/include ${D}/usr/include -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [ ${#} -eq 2 ]; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then - pkglibdir=lib64 - fi - - einfo "${pkglibdir} -> ${inslibdir}" - - local ATI_ROOT="/usr/${inslibdir}/opengl/ati" - - # The GLX libraries - exeinto ${ATI_ROOT}/lib - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 - dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so - - # Don't do this... see bug #47598 - #dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so - - # same as the xorg implementation - dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions - #Workaround - sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ - /usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \ - > $D/${ATI_ROOT}/lib/libGL.la - dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include - - # X and DRI driver - if has_version ">=x11-base/xorg-x11-6.8.0-r4" - then - local X11_DIR="/usr/" - else - local X11_DIR="/usr/X11R6/" - fi - - local X11_LIB_DIR="${X11_DIR}${inslibdir}" - - exeinto ${X11_LIB_DIR}/modules/drivers - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - exeinto ${X11_LIB_DIR}/modules/linux - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a - cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \ - ${D}/${X11_LIB_DIR} - #Not the best place - insinto ${X11_DIR}/include/X11/extensions - doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - exeinto ${X11_LIB_DIR}/modules/dri - doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so -} - - -pkg_postinst() { -# Ebuild shouldn't do this automatically, just tell the user to do it, -# otherwise it messes up livecd/gamecd stuff ... (drobbins, 1 May 2003) -# if [ "${ROOT}" = "/" ] -# then -# /usr/sbin/opengl-update ati -# fi - - echo - einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" - einfo "To change your XF86Config you can use the bundled \"fglrxconfig\"" - echo - ewarn "***" - ewarn "If you are experiencing problems with memory allocation try to add" - ewarn "this line to in your X11 configuration file:" - ewarn " Option \"KernelModuleParm\" \"agplock=0\" " - ewarn "That should solve the hangups you could have with Neverwinter Nights" - ewarn "***" - # DRM module - update-modules -} diff --git a/media-video/ati-drivers/files/3.2.5-linux-2.6.0-test6-mm.patch b/media-video/ati-drivers/files/3.2.5-linux-2.6.0-test6-mm.patch deleted file mode 100644 index dec34fe448ef..000000000000 --- a/media-video/ati-drivers/files/3.2.5-linux-2.6.0-test6-mm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- firegl_public.c 2003-09-30 10:42:12.813934291 -0500 -+++ firegl_public.c.new 2003-09-30 10:44:14.635715781 -0500 -@@ -896,7 +896,7 @@ - - int __ke_geteuid(void) - { -- return current->euid; -+ return tsk_euid(current); - } - - /*****************************************************************************/ diff --git a/media-video/ati-drivers/files/8.08-kernel-2.6.10.patch b/media-video/ati-drivers/files/8.08-kernel-2.6.10.patch deleted file mode 100644 index 727156bf20f4..000000000000 --- a/media-video/ati-drivers/files/8.08-kernel-2.6.10.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- agpgart_be.c 2005-01-06 9:05:02.000000000 +0100 -+++ agpgart_be.c 2005-01-06 9:19:16.000000000 +0100 - -@@ -255,6 +255,12 @@ - } - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+#define firegl_pci_find_class(class,from) pci_get_class(class,from) -+#else -+#define firegl_pci_find_class(class,from) pci_find_class(class,from) -+#endif -+ - int agp_backend_acquire(void) - { - if (agp_bridge.type == NOT_SUPPORTED) { -@@ -718,7 +724,7 @@ - * AGP devices and collect their data. - */ - -- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, -+ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, - device)) != NULL) { - pci_read_config_dword(device, 0x04, &scratch); - -@@ -794,6 +800,13 @@ - command &= ~0x00000001; - } - } -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ // the reference count has been increased in agp_backend_initialize. -+ if (device) -+ pci_dev_put(device); -+#endif -+ - /* - * PASS2: Figure out the 4X/2X/1X setting and enable the - * target (our motherboard chipset). -@@ -839,8 +852,9 @@ - * command registers. - */ - -- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, -+ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, - device)) != NULL) { -+ - pci_read_config_dword(device, 0x04, &scratch); - - if (!(scratch & 0x00100000)) -@@ -871,6 +885,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ // the reference count has been increased in agp_backend_initialize. -+ if (device) -+ pci_dev_put(device); -+#endif -+ - return 0; /* success */ - } - -@@ -5119,8 +5139,9 @@ - * AGP devices and collect their data. - */ - -- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, -+ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, - device)) != NULL) { -+ - pci_read_config_dword(device, 0x04, &scratch); - - if (!(scratch & 0x00100000)) -@@ -5187,6 +5208,13 @@ - command &= ~0x00000001; - } - } -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ // the reference count has been increased in agp_backend_initialize. -+ if (device) -+ pci_dev_put(device); -+#endif -+ - /* - * PASS2: Figure out the 4X/2X/1X setting and enable the - * target (our motherboard chipset). -@@ -5217,8 +5245,9 @@ - * command registers. - */ - -- while ((device = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, -+ while ((device = firegl_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, - device)) != NULL) { -+ - pci_read_config_dword(device, 0x04, &scratch); - - if (!(scratch & 0x00100000)) -@@ -5249,6 +5278,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ // the reference count has been increased in agp_backend_initialize. -+ if (device) -+ pci_dev_put(device); -+#endif -+ - return(0); /* success */ - } - -@@ -6494,10 +6529,10 @@ - // locate host bridge device - #ifdef __x86_64__ - do { -- dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev); -+ dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev); - } while((dev) && !agp_check_supported_device(dev)); - #else -- if ((dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, NULL)) == NULL) -+ if ((dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, NULL)) == NULL) - return -ENODEV; - #endif - -@@ -7040,8 +7075,12 @@ - &agp_bridge.mode); - return hp_zx1_setup(dev); - } -- dev = pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev); -+ dev = firegl_pci_find_class(PCI_CLASS_BRIDGE_HOST << 8, dev); - } while (dev); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ if(dev) pci_dev_put(dev); -+#endif - return -ENODEV; - } - #endif /* __ia64__ */ -@@ -7462,6 +7501,11 @@ - agp_bridge.free_gatt_table(); - vfree(agp_bridge.key_list); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) -+ // decrease the reference count. -+ pci_dev_put(agp_bridge.dev); -+#endif -+ - if (agp_bridge.needs_scratch_page == TRUE) { - agp_bridge.scratch_page &= ~(0x00000fff); - agp_bridge.agp_destroy_page((unsigned long) - - ---- firegl_public.c 2005-01-06 9:05:02.000000000 +0100 -+++ firegl_public.c 2005-01-06 9:19:16.000000000 +0100 -@@ -88,6 +88,7 @@ - #include <linux/smp_lock.h> - // newer SuSE kernels need this - #include <linux/highmem.h> -+#include <linux/pagemap.h> // for lock_page and unlock_page - - #if defined(__ia64__) - #include <linux/vmalloc.h> diff --git a/media-video/ati-drivers/files/8.14.13-amd64.patch b/media-video/ati-drivers/files/8.14.13-amd64.patch deleted file mode 100644 index c581a5c02661..000000000000 --- a/media-video/ati-drivers/files/8.14.13-amd64.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.10.19 b/media-video/ati-drivers/files/digest-ati-drivers-8.10.19 deleted file mode 100644 index 4117b07b9084..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.10.19 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a3ddb544071b1878ed19984c60623346 fglrx_6_8_0-8.10.19-1.i386.rpm 3787977 -MD5 ca724fda36ecf6c8a60a74e3a1528829 fglrx64_6_8_0-8.10.19-1.x86_64.rpm 7347995 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.12.10 b/media-video/ati-drivers/files/digest-ati-drivers-8.12.10 deleted file mode 100644 index 57880ca6ef23..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.12.10 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9c6397047331aadaa2c379ca78245810 fglrx_6_8_0-8.12.10-1.i386.rpm 3779718 -MD5 a54abd8af43d3066faccda4cecec851c fglrx64_6_8_0-8.12.10-1.x86_64.rpm 7317719 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.13.3 b/media-video/ati-drivers/files/digest-ati-drivers-8.13.3 deleted file mode 100644 index 91b8a048c717..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.13.3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 d1c56a82d0a711a6aac5a883cc9fc61b fglrx_6_8_0-8.13.3-1.i386.rpm 5616296 -MD5 13ae97fb2cc44718852f4b2463d669be fglrx64_6_8_0-8.13.3-1.x86_64.rpm 6166711 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.13.4 b/media-video/ati-drivers/files/digest-ati-drivers-8.13.4 deleted file mode 100644 index 94e74bc865e6..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.13.4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 d016cf3feebdf6df593a2baa58c27542 fglrx_6_8_0-8.13.4-1.i386.rpm 5614846 -MD5 d11969b95d4b49b2285538c246540907 fglrx64_6_8_0-8.13.4-1.x86_64.rpm 6164236 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13 b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13 deleted file mode 100644 index e2e96450a9aa..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 cc191cd54344b080eafad1657bd82711 ati-driver-installer-8.14.13.run 36895627 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r2 b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r2 deleted file mode 100644 index 5c1bc0c5f191..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5187698cee2edf3dee89bc3eee5729c1 fglrx_6_8_0-8.14.13-1.i386.rpm 8765541 -MD5 fc6c39cdf856955359c6f7087a78581c fglrx64_6_8_0-8.14.13-1.x86_64.rpm 14977136 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r1 b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r4 index 5c1bc0c5f191..5c1bc0c5f191 100644 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r1 +++ b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r4 diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r3 b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r3 deleted file mode 100644 index 6cee20b67110..000000000000 --- a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683 -MD5 4967e36a1bdf275a37251605b6a2356c fglrx64_6_8_0-8.8.25-1.x86_64.rpm 7275330 diff --git a/media-video/ati-drivers/files/fglrx-2.6-amd-adv-spec-fix.patch b/media-video/ati-drivers/files/fglrx-2.6-amd-adv-spec-fix.patch deleted file mode 100644 index 24a09f64392b..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-amd-adv-spec-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nurp ../fglrx-orig/build_mod/firegl_public.c build_mod/firegl_public.c ---- ../fglrx-orig/build_mod/firegl_public.c 2003-07-11 11:42:06.000000000 +0000 -+++ build_mod/firegl_public.c 2003-08-03 16:15:57.447117216 +0000 -@@ -3050,33 +3050,6 @@ static int __init have_cpuid_p(void) - - int __ke_amd_adv_spec_cache_feature(void) - { -- char vendor_id[16]; -- int ident; -- int family, model; -- -- /* Must have CPUID */ -- if(!have_cpuid_p()) -- goto donthave; -- if(cpuid_eax(0)<1) -- goto donthave; -- -- /* Must be x86 architecture */ -- cpuid(0, &ident, -- (int *)&vendor_id[0], -- (int *)&vendor_id[8], -- (int *)&vendor_id[4]); -- -- if (memcmp(vendor_id, "AuthenticAMD", 12)) -- goto donthave; -- -- ident = cpuid_eax(1); -- family = (ident >> 8) & 0xf; -- model = (ident >> 4) & 0xf; -- if (((family == 6) && (model >= 6)) || (family == 15)) { -- return 1; -- } -- --donthave: - return 0; - } - diff --git a/media-video/ati-drivers/files/fglrx-2.6-fix-deprecated.patch b/media-video/ati-drivers/files/fglrx-2.6-fix-deprecated.patch deleted file mode 100644 index 5f2cc41cefef..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-fix-deprecated.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Nurp ../fglrx-orig/build_mod/agpgart_be.c build_mod/agpgart_be.c ---- ../fglrx-orig/build_mod/agpgart_be.c 2003-07-11 11:42:06.000000000 +0000 -+++ build_mod/agpgart_be.c 2003-08-03 16:14:20.259891920 +0000 -@@ -240,7 +240,7 @@ int agp_backend_acquire(void) - // don't increment our own module usage count, cause this - // would prevent the firegl kernel module from ever beeing unloaded. - // (agp_backend_release is called during module unload) -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - #endif // STANDALONE_AGPGART - return 0; - } -@@ -252,7 +252,7 @@ void agp_backend_release(void) - } - atomic_dec(&agp_bridge.agp_in_use); - #ifdef STANDALONE_AGPGART -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - #endif // STANDALONE_AGPGART - } - -@@ -368,7 +368,7 @@ static void agp_free_memory_phys_list(ag - agp_free_key(curr->key); // release the agp handle - vfree(curr->memory); // release the table with the phys adresses - kfree(curr); // release the agp_memory structure itself -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - } - - agp_memory *agp_allocate_memory_phys_list( -@@ -398,13 +398,13 @@ agp_memory *agp_allocate_memory_phys_lis - * it - */ - -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - - /* allocate a "new" agp_memory structure for the requested pages */ - scratch_pages = (page_count + ENTRIES_PER_PAGE - 1) / ENTRIES_PER_PAGE; - new = agp_create_memory(scratch_pages); - if (new == NULL) { -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - return NULL; - } - new->alloc_type = AGP_ALLOC_TYPE_PHYS_LIST; -@@ -453,7 +453,7 @@ void agp_free_memory(agp_memory * curr) - agp_free_key(curr->key); - vfree(curr->memory); - kfree(curr); -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - } - - agp_memory *agp_allocate_memory(size_t page_count, u32 type) -@@ -478,14 +478,14 @@ agp_memory *agp_allocate_memory(size_t p - * it - */ - -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - - scratch_pages = (page_count + ENTRIES_PER_PAGE - 1) / ENTRIES_PER_PAGE; - - new = agp_create_memory(scratch_pages); - - if (new == NULL) { -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - return NULL; - } - #ifdef FGL -@@ -1566,7 +1566,7 @@ static agp_memory *intel_i810_alloc_by_t - new->page_count = pg_count; - new->num_scratch_pages = 0; - vfree(new->memory); -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - return new; - } - if(type == AGP_PHYS_MEMORY) { -@@ -1583,7 +1583,7 @@ static agp_memory *intel_i810_alloc_by_t - if (new == NULL) { - return NULL; - } -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - new->memory[0] = agp_bridge.agp_alloc_page(); - - if (new->memory[0] == 0) { -@@ -1614,7 +1614,7 @@ static void intel_i810_free_by_type(agp_ - vfree(curr->memory); - } - kfree(curr); -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - } - - static unsigned long intel_i810_mask_memory(unsigned long addr, int type) -@@ -1882,7 +1882,7 @@ static agp_memory *intel_i830_alloc_by_t - - if (nw == NULL) return(NULL); - -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - nw->memory[0] = agp_bridge.agp_alloc_page(); - physical = nw->memory[0]; - if (nw->memory[0] == 0) { -diff -Nurp ../fglrx-orig/build_mod/firegl_public.c build_mod/firegl_public.c ---- ../fglrx-orig/build_mod/firegl_public.c 2003-07-11 11:42:06.000000000 +0000 -+++ build_mod/firegl_public.c 2003-08-03 16:14:20.261891616 +0000 -@@ -322,8 +322,8 @@ struct firegl_stub_info_t *firegl_stub_p - #define inter_module_get(x) firegl_stub_pointer - #define inter_module_register(x,y,z) do { firegl_stub_pointer = z; } while (0) - /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */ --#define fops_put(fops) MOD_DEC_USE_COUNT --#define fops_get(fops) (fops); MOD_INC_USE_COUNT -+#define fops_put(fops) module_put(THIS_MODULE) -+#define fops_get(fops) (fops); try_module_get(THIS_MODULE) - #endif // LINUX_VERSION_CODE < 0x020400 - - -@@ -979,12 +979,12 @@ int __ke_error_code(enum __ke_error_num - - void __ke_mod_inc_use_count(void) - { -- MOD_INC_USE_COUNT; -+ try_module_get(THIS_MODULE); - } - - void __ke_mod_dec_use_count(void) - { -- MOD_DEC_USE_COUNT; -+ module_put(THIS_MODULE); - } - - /*****************************************************************************/ diff --git a/media-video/ati-drivers/files/fglrx-2.6-get-page.patch b/media-video/ati-drivers/files/fglrx-2.6-get-page.patch deleted file mode 100644 index 3bcaca0e2a91..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-get-page.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ruN lib.orig/modules/fglrx/build_mod/agpgart_be.c lib/modules/fglrx/build_mod/agpgart_be.c ---- lib.orig/modules/fglrx/build_mod/agpgart_be.c 2004-03-04 18:25:44.000000000 +0100 -+++ lib/modules/fglrx/build_mod/agpgart_be.c 2004-05-27 16:10:56.874535000 +0200 -@@ -1402,7 +1402,8 @@ - } - #endif - -- atomic_inc(&page->count); -+ //atomic_inc(&page->count); -+ get_page(page); - set_bit(PG_locked, &page->flags); - atomic_inc(&agp_bridge.current_memory_agp); - -diff -ruN lib.orig/modules/fglrx/build_mod/firegl_public.c lib/modules/fglrx/build_mod/firegl_public.c ---- lib.orig/modules/fglrx/build_mod/firegl_public.c 2004-05-27 16:24:10.879828208 +0200 -+++ lib/modules/fglrx/build_mod/firegl_public.c 2004-05-27 16:11:33.393983000 +0200 -@@ -2059,8 +2059,8 @@ - pMmPage = virt_to_page(kaddr); - #endif /* LINUX_VERSION_CODE < 0x020400 */ - -- atomic_inc(&(pMmPage->count)); /* inc usage count of page */ -- -+// atomic_inc(&(pMmPage->count)); /* inc usage count of page */ -+ get_page(pMmPage); - #if LINUX_VERSION_CODE >= 0x020400 - // __KE_DEBUG3("vm-address 0x%08lx => kernel-page-address 0x%p\n", - // address, page_address(pMmPage)); - diff --git a/media-video/ati-drivers/files/fglrx-2.6-iminor.patch b/media-video/ati-drivers/files/fglrx-2.6-iminor.patch deleted file mode 100644 index 545981915d8d..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-iminor.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN build_mod.orig/firegl_public.c build_mod/firegl_public.c ---- build_mod.orig/firegl_public.c 2003-09-14 19:58:43.586456656 +0200 -+++ build_mod/firegl_public.c 2003-09-14 20:04:47.975061168 +0200 -@@ -419,7 +419,9 @@ - - static int firegl_stub_open(struct inode *inode, struct file *filp) - { --#if LINUX_VERSION_CODE > 0x020500 -+#ifdef LINUX_VERSION_CODE >= 0x020600 -+ int minor = iminor(inode); -+#elif LINUX_VERSION_CODE > 0x020500 - int minor = minor(inode->i_rdev); - #else - int minor = MINOR(inode->i_rdev); -@@ -845,7 +847,9 @@ - - int __ke_inode_rdev_minor(struct inode* inode) - { --#if LINUX_VERSION_CODE > 0x020500 -+#ifdef LINUX_VERSION_CODE >= 0x020600 -+ return iminor(inode); -+#elif LINUX_VERSION_CODE > 0x020500 - return minor(inode->i_rdev); - #else - return MINOR(inode->i_rdev); diff --git a/media-video/ati-drivers/files/fglrx-2.6-makefile.patch b/media-video/ati-drivers/files/fglrx-2.6-makefile.patch deleted file mode 100644 index fbdfdfcd3e2c..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nurp ../fglrx-orig/build_mod/Makefile build_mod/Makefile ---- ../fglrx-orig/build_mod/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ build_mod/Makefile 2003-08-03 16:18:54.592187072 +0000 -@@ -0,0 +1,9 @@ -+# -+# Makefile for the drm device driver. -+# make -C /usr/src/linux SUBDIRS=`pwd` modules -+EXTRA_CFLAGS+=-DATI_AGP_HOOK -DATI -DFGL -DFGL_RX -DFGL_CUSTOM_MODULE -DFGL_LINUX253P1_VMA_API -D__AGP__ -+##-Ipatch/include -Ipatch/driver/char/drm -+ -+fglrx-objs := agpgart_be.o agp3.o i7505-agp.o nvidia-agp.o firegl_public.o libfglrx_ip.a.GCC3 -+ -+obj-m += fglrx.o diff --git a/media-video/ati-drivers/files/fglrx-2.6-pagetable.patch b/media-video/ati-drivers/files/fglrx-2.6-pagetable.patch deleted file mode 100644 index 164b0f21a547..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-pagetable.patch +++ /dev/null @@ -1,159 +0,0 @@ ---- lib/modules/fglrx/build_mod/firegl_public.c.orig 2005-02-05 08:18:17.301667616 -0500 -+++ lib/modules/fglrx/build_mod/firegl_public.c 2005-02-05 08:45:50.522339872 -0500 -@@ -1659,13 +1659,22 @@ - { - unsigned long pte_linear; - pgd_t* pgd_p; -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_t* pud_p; -+#endif - pmd_t* pmd_p; - pte_t* pte_p; - pte_t pte; - - pte_linear = VMALLOC_VMADDR(virtual_addr); // convert to pte linear address (x86 => nop) - pgd_p = pgd_offset(mm, pte_linear); -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_p = pud_offset(pgd_p, pte_linear); -+ pmd_p = pmd_offset(pud_p, pte_linear); -+#else - pmd_p = pmd_offset(pgd_p, pte_linear); -+#endif -+ - #ifndef FGL_ATOMIC_PTE - #if LINUX_VERSION_CODE > 0x020500 - pte_p = pte_offset_kernel(pmd_p, pte_linear); -@@ -2085,6 +2094,9 @@ - unsigned long address) - { - pgd_t* pgd_p; -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_t* pud_p; -+#endif - pmd_t* pmd_p; - pte_t* pte_p; - pte_t pte; -@@ -2185,7 +2197,12 @@ - /* alternatively we could generate a NOPAGE_OOM "out of memory" */ - } - /* locate medium level page table (x86 => nop) */ -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_p = pud_offset(pgd_p, pte_linear); -+ pmd_p = pmd_offset(pud_p, pte_linear); -+#else - pmd_p = pmd_offset(pgd_p, pte_linear); -+#endif - if (!pmd_present(*pmd_p)) - { - __KE_ERROR("FATAL ERROR: User queue buffer not present! (pmd)\n"); -@@ -2549,13 +2566,21 @@ - { - unsigned long pte_linear; - pgd_t* pgd_p; -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_t* pud_p; -+#endif - pmd_t* pmd_p; - pte_t* pte_p; - pte_t pte; - - pte_linear = VMALLOC_VMADDR(virtual_addr); // convert to pte linear address (x86 => nop) - pgd_p = pgd_offset(vma->vm_mm, pte_linear); -+#if LINUX_VERSION_CODE > 0x02060a /* KERNEL_VERSION(2,6,10) */ -+ pud_p = pud_offset(pgd_p, pte_linear); -+ pmd_p = pmd_offset(pud_p, pte_linear); -+#else - pmd_p = pmd_offset(pgd_p, pte_linear); -+#endif - #ifndef FGL_ATOMIC_PTE - #if LINUX_VERSION_CODE > 0x020500 - pte_p = pte_offset_kernel(pmd_p, pte_linear); -@@ -2704,13 +2729,13 @@ - #endif /* __ia64__ */ - vma->vm_flags |= VM_IO; /* not in core dump */ - } -- if (remap_page_range(FGL_VMA_API_PASS -+ if (remap_pfn_range(FGL_VMA_API_PASS - vma->vm_start, -- __ke_vm_offset(vma), -+ __ke_vm_offset(vma) >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) - { -- __KE_DEBUG("remap_page_range failed\n"); -+ __KE_DEBUG("remap_pfn_range failed\n"); - return -EAGAIN; - } - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -@@ -2771,13 +2796,13 @@ - { - if (__ke_vm_offset(vma) >= __pa(high_memory)) - vma->vm_flags |= VM_IO; /* not in core dump */ -- if (remap_page_range(FGL_VMA_API_PASS -+ if (remap_pfn_range(FGL_VMA_API_PASS - vma->vm_start, -- __ke_vm_offset(vma), -+ __ke_vm_offset(vma) >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) - { -- __KE_DEBUG("remap_page_range failed\n"); -+ __KE_DEBUG("remap_pfn_range failed\n"); - return -EAGAIN; - } - #ifdef __x86_64__ -@@ -2808,13 +2833,13 @@ - { - if (__ke_vm_offset(vma) >= __pa(high_memory)) - vma->vm_flags |= VM_IO; /* not in core dump */ -- if (remap_page_range(FGL_VMA_API_PASS -+ if (remap_pfn_range(FGL_VMA_API_PASS - vma->vm_start, -- __ke_vm_offset(vma), -+ __ke_vm_offset(vma) >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) - { -- __KE_DEBUG("remap_page_range failed\n"); -+ __KE_DEBUG("remap_pfn_range failed\n"); - return -EAGAIN; - } - #ifdef __x86_64__ -@@ -2858,6 +2883,37 @@ - - #if LINUX_VERSION_CODE >= 0x020400 - -+#if LINUX_VERSION_CODE >= 0x02060b -+ -+typedef struct { -+ void (*free_memory)(struct agp_memory *); -+ struct agp_memory * (*allocate_memory)(size_t, u32); -+ int (*bind_memory)(struct agp_memory *, off_t); -+ int (*unbind_memory)(struct agp_memory *); -+ void (*enable)(u32); -+ int (*acquire)(void); -+ void (*release)(void); -+ int (*copy_info)(struct agp_kern_info *); -+} drm_agp_t; -+ -+static const drm_agp_t drm_agp = { -+ &agp_free_memory, -+ &agp_allocate_memory, -+ &agp_bind_memory, -+ &agp_unbind_memory, -+ &agp_enable, -+ &agp_backend_acquire, -+ &agp_backend_release, -+ &agp_copy_info -+}; -+#undef DRM_AGP_MODULE_GET -+#undef DRM_AGP_MODULE_PUT -+ -+#define DRM_AGP_MODULE_GET &drm_agp -+#define DRM_AGP_MODULE_PUT -+ -+#endif -+ - static const drm_agp_t *drm_agp_module_stub = NULL; - - #define AGP_FUNCTIONS 8 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 deleted file mode 100644 index aa4bc581129f..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6-vmalloc-vmaddr.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/files/fglrx-2.6.10-pci_get_class.patch b/media-video/ati-drivers/files/fglrx-2.6.10-pci_get_class.patch deleted file mode 100644 index e3c73f83cedc..000000000000 --- a/media-video/ati-drivers/files/fglrx-2.6.10-pci_get_class.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN build_mod.orig/agpgart_be.c build_mod/agpgart_be.c ---- build_mod.orig/agpgart_be.c 2004-11-11 23:39:17.983856616 +0100 -+++ build_mod/agpgart_be.c 2004-11-11 23:41:27.212210920 +0100 -@@ -116,7 +116,14 @@ - #include <linux/pagemap.h> - #include <linux/miscdevice.h> - #include <linux/pm.h> -+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) -+#define pci_find_class pci_get_class - -+ -+ -+ -+ -+#endif - #if (LINUX_VERSION_CODE >= 0x020400) - #define FGL_PM_PRESENT - #else |