diff options
author | 2006-03-08 14:16:31 +0000 | |
---|---|---|
committer | 2006-03-08 14:16:31 +0000 | |
commit | ae654121e2e3f29686f9f57af3c6f42db402af4f (patch) | |
tree | f7ec8eba0cca8657177d055b16f4f46e8f6d6d84 /x11-drivers/ati-drivers | |
parent | Removed svg useflag, switched svg on by default (diff) | |
download | gentoo-2-ae654121e2e3f29686f9f57af3c6f42db402af4f.tar.gz gentoo-2-ae654121e2e3f29686f9f57af3c6f42db402af4f.tar.bz2 gentoo-2-ae654121e2e3f29686f9f57af3c6f42db402af4f.zip |
revision for opengl-update on 8.21.7
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'x11-drivers/ati-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 7 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/Manifest | 6 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild | 317 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7-r1 | 6 |
4 files changed, 335 insertions, 1 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 148b651c7896..a14760501da3 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.25 2006/02/23 21:08:51 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.26 2006/03/08 14:16:31 anarchy Exp $ + +*ati-drivers-8.21.7-r1 (08 Mar 2006) + + 08 Mar 2006; <anarchy@gentoo.org> +ati-drivers-8.21.7-r1.ebuild: + revision for opengl-update on 8.21.7 23 Feb 2006; <anarchy@gentoo.org> +files/ati-drivers-8.22.5-intermodule.patch, ati-drivers-8.22.5.ebuild: diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 5bac44ffc209..3746681e5289 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -40,6 +40,9 @@ SHA256 8054e0a5061e2881161e73c522040477f46a305b5b36e92182dce90e941ea25f ati-driv MD5 3316753abad1e8f0badfe252e3cae416 ati-drivers-8.20.8.ebuild 8387 RMD160 e63c28e2b8206331678b36b79e1699b5c63c9ee5 ati-drivers-8.20.8.ebuild 8387 SHA256 8601e455bd7a6161bfeb47d95ad2c02cc867357a9b2a3a77fe4cb7b8aaf4b535 ati-drivers-8.20.8.ebuild 8387 +MD5 355ba8c021977c8bf5bf3e2dba54d476 ati-drivers-8.21.7-r1.ebuild 8463 +RMD160 cd2a0ad848fa3a9a90e8bc6e126cab47deba6703 ati-drivers-8.21.7-r1.ebuild 8463 +SHA256 3dc21dd6a9bcda1407b6f0d4ece36703df3a9fd15c15c253b434f41bfebddb37 ati-drivers-8.21.7-r1.ebuild 8463 MD5 938ae1a4bff6e6e33ee859dd2a3ca5a6 ati-drivers-8.21.7.ebuild 8469 RMD160 68784475bce2aefee05a6ef9eea3ea03476ea2d5 ati-drivers-8.21.7.ebuild 8469 SHA256 ae67a291c40ed09e8726c4ed65a6f93cc4cca90b9eb5d16105f23638a2b10096 ati-drivers-8.21.7.ebuild 8469 @@ -106,6 +109,9 @@ SHA256 842abb3720cb86c90681fd053da430e0a1841eef595ebea00f327d4aa162012e files/di MD5 e5296c265380cfc62e0bcafc5360807d files/digest-ati-drivers-8.21.7 380 RMD160 d495f79088708ad02c366a318a710a4e676562cd files/digest-ati-drivers-8.21.7 380 SHA256 208b78962cd284d7ed81af4eac174a269384a5e66bba64324e4466ed963f31f5 files/digest-ati-drivers-8.21.7 380 +MD5 6939eac3a8d0c0ec955c537437077493 files/digest-ati-drivers-8.21.7-r1 596 +RMD160 16b5c3c17b0a69768e30d443e0ad2b88781c3dbe files/digest-ati-drivers-8.21.7-r1 596 +SHA256 46a6fabddf192d46fe9f52c985f4a080133cbe2fd789cdefae9cfe43fffba572 files/digest-ati-drivers-8.21.7-r1 596 MD5 c3eca00b2284649ba6d10e1d27ef260a files/digest-ati-drivers-8.22.5 596 RMD160 a31343326c85aeb28e9f88542542ded42a256453 files/digest-ati-drivers-8.22.5 596 SHA256 eb5ca9c22deac672f2e3afff6028f5bfb06840c674660b9a610ef2befc1095cd files/digest-ati-drivers-8.22.5 596 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild new file mode 100644 index 000000000000..454293e561c6 --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.21.7-r1.ebuild,v 1.1 2006/03/08 14:16:31 anarchy 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? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run ) + amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )" + +LICENSE="ATI" +KEYWORDS="~amd64 ~x86" + +RDEPEND="|| ( x11-base/xorg-server virtual/x11 ) + >=x11-base/opengl-update-2.1_pre1 + || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )" + +DEPEND=">=virtual/linux-sources-2.4 + ${RDEPEND}" + +PROVIDE="virtual/opengl" + +ATIBIN="${D}/opt/ati/bin" +RESTRICT="nostrip multilib-pkg-force stricter" + +MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)" + + +choose_driver_paths() { + ARCH_DIR="${WORKDIR}/arch" + COMMON_DIR="${WORKDIR}/common" + + #new modular X paths, 0 is a workaround. + if has_version "x11-base/xorg-server"; then + BASE_DIR="${WORKDIR}/x690" + xlibdir="xorg" + else + BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})" + xlibdir="" + + # Determine if we are facing X.org 6.8.99 aka 6.9 + if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] && + [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] && + [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] + then + BASE_DIR="${BASE_DIR}90" + else + BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0" + fi + fi + + if use amd64 ; then + BASE_DIR="${BASE_DIR}_64a" + ARCH_DIR="${ARCH_DIR}/x86_64" + else + ARCH_DIR="${ARCH_DIR}/x86" + fi +} + +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 $? + 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." + fi + + # Set up X11 implementation + if has_version "x11-base/xorg-server"; then + X11_IMPLEM=xorg-x11 + else + X11_IMPLEM_P="$(best_version virtual/x11)" + X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" + X11_IMPLEM="${X11_IMPLEM##*\/}" + X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}" + X11_IMPLEM_V="${X11_IMPLEM_V##*\/}" + fi + einfo "X11 implementation is ${X11_IMPLEM}." + choose_driver_paths +} + +src_unpack() { + local OLDBIN="/usr/X11R6/bin" + + ebegin "Unpacking Ati drivers" + sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null + eend $? || die "unpack failed" + + rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel} + + cd ${WORKDIR}/common/lib/modules/fglrx/build_mod + + # fix kernel oops for acpi + if kernel_is 2 6 15; then + epatch ${FILESDIR}/${P}-linux-2.6.15.patch + fi +} + + +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 + 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 || ewarn "DRM module not built" + fi +} + +pkg_preinst() { + # Clean the dynamic 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_LIBGL_PATH="" + cd ${WORKDIR}/common/lib/modules/fglrx/build_mod + linux-mod_src_install + + cd ${WORKDIR} + + 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 + exeinto /opt/ati/bin + doexe ${ARCH_DIR}/usr/X11R6/bin/* + + #ati custom stuff + insinto /usr + doins -r ${WORKDIR}/common/usr/include + + #env.d entry + cp ${FILESDIR}/09ati ${T}/ + + #Work around hardcoded path in 32bit libGL.so on amd64, bug 101539 + if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then + ATI_LIBGL_PATH="/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri" + fi + cat >>${T}/09ati <<EOF + +LIBGL_DRIVERS_PATH="$ATI_LIBGL_PATH" +EOF + + doenvd ${T}/09ati +} + +src_install-libs() { + local pkglibdir=lib + local inslibdir="$(get_libdir)/${xlibdir}" + ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri" + 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/$(get_libdir)/opengl/ati" + + # The GLX libraries + exeinto ${ATI_ROOT}/lib + doexe ${ARCH_DIR}/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/$(get_libdir)/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/X11R6/" + else + local X11_DIR="/usr/" + fi + + local X11_LIB_DIR="${X11_DIR}${inslibdir}" + + exeinto ${X11_LIB_DIR}/modules/drivers + # In X.org 6.8.99 / 6.9 this is a .so + doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o + + exeinto ${X11_LIB_DIR}/modules/dri + doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so + doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so + + exeinto ${X11_LIB_DIR}/modules/linux + # In X.org 6.8.99 / 6.9 this is a .so + if has_version ">=x11-base/xorg-x11-6.8.99" || \ + has_version "x11-base/xorg-server" + then + doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so + else + doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a + fi + + cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \ + ${D}/usr/$(get_libdir) + #Not the best place + insinto ${X11_DIR}/include/X11/extensions + doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h + + dodir /etc + cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/ +} + + +pkg_postinst() { + /usr/bin/opengl-update --use-old ati + + echo + einfo "To switch to ATI OpenGL, run \"opengl-update ati\"" + einfo "To change your xorg.conf you can use the bundled \"aticonfig\"" + 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 + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm + /usr/bin/opengl-update --use-old xorg-x11 +} diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7-r1 new file mode 100644 index 000000000000..c5f542720f49 --- /dev/null +++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.21.7-r1 @@ -0,0 +1,6 @@ +MD5 d20ca4b2d9da8249461c4bb7c75333b6 ati-driver-installer-8.21.7-i386.run 37095872 +RMD160 22d241eaa060c8bf6fbcd3bb340cfa603b7e4bd6 ati-driver-installer-8.21.7-i386.run 37095872 +SHA256 8fe26909c49d6dab64aa97e840c07abf8be0bd0abfbff2285cf2ebfb5a51a93d ati-driver-installer-8.21.7-i386.run 37095872 +MD5 6895783811017aad8e1d9316641f2b65 ati-driver-installer-8.21.7-x86_64.run 28235137 +RMD160 8d0af873b42c5c94c27a05895d97dc5f8f4836ad ati-driver-installer-8.21.7-x86_64.run 28235137 +SHA256 8a5ddf6a391834f1111b19a36d2592714f15b9565be306d58b9c540f9fa54007 ati-driver-installer-8.21.7-x86_64.run 28235137 |