diff options
author | Jeffrey Gardner <je_fro@gentoo.org> | 2009-04-14 06:37:18 +0000 |
---|---|---|
committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-04-14 06:37:18 +0000 |
commit | 1eaa7b3bea7f2f6d00d2fa32992ec231bb0c071f (patch) | |
tree | 93df05f89d3627b7baabc68a88e3770838f5d481 /x11-drivers | |
parent | version bump (diff) | |
download | historical-1eaa7b3bea7f2f6d00d2fa32992ec231bb0c071f.tar.gz historical-1eaa7b3bea7f2f6d00d2fa32992ec231bb0c071f.tar.bz2 historical-1eaa7b3bea7f2f6d00d2fa32992ec231bb0c071f.zip |
Add 8.33.6 so ati-drivers-extra can live again :)
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 6 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/Manifest | 4 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild | 352 |
3 files changed, 360 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index d6d347ab68e6..1fd869b7dceb 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.151 2009/04/13 20:18:05 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.152 2009/04/14 06:37:18 je_fro Exp $ + + 14 Apr 2009; Jeff Gardner <je_fro@gentoo.org> + +ati-drivers-8.33.6-r1.ebuild: + Add 8.33.6 so ati-drivers-extra can live again :) 13 Apr 2009; Jeff Gardner <je_fro@gentoo.org> +files/8.552/ati-powermode-opt-path-2.patch, ati-drivers-8.552-r2.ebuild: diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index dc49b1e90d2d..0ba32d569d97 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -24,6 +24,7 @@ DIST ati-driver-installer-8-3-x86.x86_64.run 53433193 RMD160 74b004c81f372addcde DIST ati-driver-installer-8.27.10-x86.run 25136032 RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 SHA1 dc386ae275e7623d383a83b50b8685b53fe97f03 SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0 DIST ati-driver-installer-8.27.10-x86_64.run 32487472 RMD160 04dc8598253791b52215ba3be847a9dc6eb54079 SHA1 9844ad5dc79a8d914d8707d2d17cf6be0de9e7d5 SHA256 1039d0b2218bab7076ef55626e510a779027ab658e62730c74dc2de439f4ab33 DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475 +DIST ati-driver-installer-8.33.6-x86.x86_64.run 58620730 RMD160 141531330a77d2981d56fd5682d3220d757cc51d SHA1 d1c364698e524da3f4cd8d43bfbd2cd261ed0ae3 SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae DIST ati-driver-installer-8.35.5-x86.x86_64.run 57314907 RMD160 a398b0b1f5ac6ca8b56b91064ab39412dc039188 SHA1 07d02058a958a20c9b80a1802ff64524ad9a8b95 SHA256 c366ce2b53127307b1d6f301df6e060cff2b7145cb10605c864ca084e01c3414 DIST ati-driver-installer-8.36.5-x86.x86_64.run 53331877 RMD160 5581d7ad761f60c874f7c2cd59b1d95506a2ea23 SHA1 c0edc17d1816ec7415d64d0cc85193060f61e080 SHA256 217cc46fed71eabfc3852f09f460d630dedad16bb7e86c2d761e06f6c0e0e8d1 DIST ati-driver-installer-8.39.4-x86.x86_64.run 40085391 RMD160 b23da1864ab4718ddfbc077950443507f30af70a SHA1 2b1b66169df36c3e6c811562b63642ff4dce2b1d SHA256 c8c37f2e13dc10aa223c7dc50aa04cba211c913d254704908f5d3cd57debac22 @@ -32,6 +33,7 @@ DIST ati-driver-installer-9-1-x86.x86_64.run 82398155 RMD160 b7d047131c4c3dc80e8 DIST ati-driver-installer-9.2-x86.x86_64.run 83286827 RMD160 fe98a9b39dbf27c7350afd4767c793826e94c53d SHA1 3ae672145f60f0348c44a7dfef98ec730a51fbf5 SHA256 7a611b83a3a8937e3511a02a730f8c7fb0b89d9070f4fa4de4e7fa9aeada421a EBUILD ati-drivers-8.27.10-r1.ebuild 10567 RMD160 1f895a73a94524b74a12e146965fa12d5141f3a1 SHA1 7ddd8c9955487d4e642241130a2f13c8e6dad330 SHA256 f1792d199b950647d4a2b827e5e017094e96cf5f5002a65a12689823a6bd2215 EBUILD ati-drivers-8.32.5.ebuild 9917 RMD160 af7cdad20a43f8e2fdef17745506724945afa63a SHA1 843e3ade7c92de12d1d0a2d9bb7d43d3924a62a8 SHA256 0d8d854f157559671c96910aaf041a044c6174b0bf466580c839a71da11b6318 +EBUILD ati-drivers-8.33.6-r1.ebuild 10010 RMD160 4c9efff62dc623c1a87c87924a6164877040ad4a SHA1 1aebd8eaa59b5c43882d1fed3276167385bb6de2 SHA256 540b0ed308f5354970aa871209ab03329851709a225f25f6347b1bbc84123c49 EBUILD ati-drivers-8.35.5.ebuild 13457 RMD160 6969313da9cfc6814aa05ac9d72acf3a4db1fd92 SHA1 78f8d77610f52c6e71a9ace216c29c40f5b2c863 SHA256 d25cad0cbec0dd34780d4c17fef46efe157096b7c2b4c5e572a2d593f6f5c696 EBUILD ati-drivers-8.36.5.ebuild 12946 RMD160 72391178ae4525a203affea069ed3ae93dc03267 SHA1 466527f2bdb8eb9016d1a5880e6167d244425fbc SHA256 732d378aac98b42a23825ecbbf02582224909e41e7d6ddcc455d47e8c5b213ad EBUILD ati-drivers-8.39.4.ebuild 14111 RMD160 4cd7d87055e941a56da78b2c0e00f285592e54f1 SHA1 5f87a1003c80d338596ceeb1cb5f19a09ce5650d SHA256 7023bf0e8ac2c6ceca515cdcfe75e5b3405e4dc37a07ae20548fd822f15badfb @@ -41,5 +43,5 @@ EBUILD ati-drivers-8.471.3.ebuild 14679 RMD160 6207bd14a240106959bae07c123527b11 EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79 EBUILD ati-drivers-8.573-r1.ebuild 14797 RMD160 b08db9339579ad4641f2328617dbb67e77239239 SHA1 fd188e633a4a78f989936841b2263d3671c12ad1 SHA256 8c659c640e4e9bf078840b97bfa47918cc84fe772a560962accf330f3c64698e EBUILD ati-drivers-8.582.ebuild 14794 RMD160 581ae32efc15a474a80256bb9dc30c7d56453e75 SHA1 2769b8687ecb459af943d337e1ea582df21f288a SHA256 a02439b55b6d18a4bf078b7465e9ba38907edf09e2ab5dd919fc21b7d3ba9122 -MISC ChangeLog 51880 RMD160 ca3e624a97dd651018a140a3b08302e8257eedb0 SHA1 0c4fab71a30c36afad8497de66107b040041961e SHA256 c1ea65c5f436497bd02c3afcef2f964b3658a2a5dac3fdac4892f39cc4694b67 +MISC ChangeLog 52014 RMD160 7d8c14089d0310981e8b827864b609c9165dba54 SHA1 5541de902c9f5d07f263a246f94b7cc53b642f24 SHA256 061c8ef0dc5e2c907764695fb84c38717525dadf87ab70eea4950fce7f6f594d MISC metadata.xml 294 RMD160 ce6129af48ca9c259fa89b297249a558c58657a2 SHA1 f17731063fe83ac4b733ec2127b2dcf1017a7095 SHA256 5db182fb2524bf0627a165b0fc4fbdb17b9e1668a49428ec68c9c6ac13a02eea diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild new file mode 100644 index 000000000000..e8fdd68214b4 --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.33.6-r1.ebuild @@ -0,0 +1,352 @@ +# Copyright 1999-2009 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.33.6-r1.ebuild,v 1.9 2009/04/14 06:37:18 je_fro Exp $ + +IUSE="acpi doc opengl" + +inherit eutils rpm multilib linux-mod toolchain-funcs + +DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" +HOMEPAGE="http://www.ati.com" +ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/" +SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run" + +LICENSE="ATI" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-base/xorg-server + app-admin/eselect-opengl + || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) + acpi? ( + x11-apps/xauth + sys-power/acpid + )" + +DEPEND=">=virtual/linux-sources-2.4 + ${RDEPEND}" + +S="${WORKDIR}/common/lib/modules/fglrx/build_mod" + +ATIBIN="${D}/opt/ati/bin" +RESTRICT="strip test" +EMULTILIB_PKG="true" + +QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so + usr/lib/opengl/ati/lib/libGL.so.1.2" +QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so + usr/lib32/xorg/modules/dri/fglrx_dri.so" +QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so + usr/lib/xorg/modules/dri/atiogl_a_dri.so + usr/lib/xorg/modules/drivers/fglrx_drv.so + usr/lib/opengl/ati/lib/libGL.so.1.2" +QA_TEXTRELS_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so + usr/lib32/opengl/ati/lib/libGL.so.1.2 + usr/lib32/xorg/modules/dri/fglrx_dri.so + usr/lib32/xorg/modules/dri/atiogl_a_dri.so" + +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 + if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 1 ] && + [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 0 ] && + [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ] || + [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" != 0 ] + then + BASE_DIR="${WORKDIR}/x710" + else + BASE_DIR="${WORKDIR}/x690" + fi + 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 + MODULE_NAMES="fglrx(video)" + BUILD_TARGETS="kmod_build" + linux-mod_pkg_setup + BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" + + if ! linux_chkconfig_present MTRR; then + ewarn "You don't have MTRR support enabled, the direct rendering will not work." + fi + + if linux_chkconfig_builtin DRM; then + ewarn "You have DRM support enabled builtin, the direct rendering will not work." + fi + + if ! linux_chkconfig_present AGP && ! linux_chkconfig_present PCIEPORTBUS ;then + ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering" + ewarn "could work only using the internal support." + fi + + # Set up X11 implementation + X11_IMPLEM=xorg-x11 + X11_IMPLEM_V="$(best_version x11-base/xorg-server)" + X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}" + 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} + + epatch "${FILESDIR}"/${PN}-2.6.20.patch + + if use acpi + then + sed -i \ + -e "s/\/var\/lib\/xdm\/authdir/\/etc\/X11\/xdm\/authdir/" \ + -e "s/\/var\/lib\/gdm/\/var\/gdm/" \ + -e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \ + "${WORKDIR}/common/etc/ati/authatieventsd.sh" \ + || die "sed failed." + + cd "${WORKDIR}" + epatch "${FILESDIR}"/ati-powermode.sh.patch + fi +} + +src_compile() { + einfo "Building the DRM module..." + ln -s \ + ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ + || die "cannot find precompiled core" + + export _POSIX2_VERSION="199209" + + if kernel_is 2 6; then + cp 2.6.x/Makefile . + convert_to_m Makefile + linux-mod_src_compile + else + # 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="" + linux-mod_src_install + + cd "${WORKDIR}" + + local native_dir + use x86 && native_dir="lib" + use amd64 && native_dir="lib64" + + if has_multilib_profile; then + local OABI=${ABI} + for ABI in $(get_install_abis); do + src_install-libs + done + ABI=${OABI} + unset OABI + elif use amd64; then + src_install-libs lib $(get_multilibdir) + src_install-libs lib64 $(get_libdir) + else + src_install-libs + fi &> /dev/null + + #apps, man pages, and conf files + exeinto /opt/ati/bin + doexe ${ARCH_DIR}/usr/X11R6/bin/* + if use acpi + then + exeinto /opt/ati/sbin + doexe ${ARCH_DIR}/usr/sbin/* + insinto /opt/ati/man/man8 + doins common/usr/share/man/man8/* + newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd + dodir /etc/conf.d + echo 'ATIEVENTSDOPTS=""' > "${D}"/etc/conf.d/atieventsd + fi + #ati custom stuff + insinto /usr + doins -r "${WORKDIR}"/common/usr/include + + #documentation + if use doc; then + dodir /usr/share/doc/fglrx + cp -pPR common/usr/share/doc/fglrx/* \ + "${D}"/usr/share/doc/fglrx + fi + + #env.d entry + cp "${FILESDIR}"/09ati "${T}"/ + + if use acpi + then + local ATIETC="${WORKDIR}/common/usr/share/doc/fglrx/examples/etc/acpi" + exeinto /etc/acpi + doexe "${ATIETC}"/ati-powermode.sh + insinto /etc/acpi/events + doins "${ATIETC}"/events/a-ac-aticonfig + doins "${ATIETC}"/events/a-lid-aticonfig + fi + + #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/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri" + fi + cat >>"${T}"/09ati <<EOF + +LIBGL_DRIVERS_PATH="\$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 + + if has_version ">=x11-base/xorg-x11-6.8.99" || \ + has_version "x11-base/xorg-server" + then + cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \ + "${D}"/usr/$(get_libdir) + else + cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \ + "${D}"/usr/$(get_libdir) + fi + + #Not the best place + insinto ${X11_DIR}/include/X11/extensions + doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h + + # misc ati configuration files for /etc + dodir /etc/ati + cp -pP ${COMMON_DIR}/etc/ati/fglrxprofiles.csv "${D}"/etc/ati/ + cp -pP ${COMMON_DIR}/etc/ati/fglrxrc "${D}"/etc/ati/ + cp -pP ${COMMON_DIR}/etc/ati/logo* "${D}"/etc/ati/ + if use acpi + then + cp -pP ${COMMON_DIR}/etc/ati/authatieventsd.sh "${D}"/etc/ati/ + fi +} + +pkg_postinst() { + /usr/bin/eselect opengl set --use-old ati + + echo + einfo "To switch to ATI OpenGL, run \"eselect opengl set 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 + echo + einfo "If you experience unexplained segmentation faults and kernel crashes" + einfo "with this driver and multi-threaded applications such as wine," + einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." + # DRM module + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm + /usr/bin/eselect opengl set --use-old xorg-x11 +} |