From dc44eff1a2e440ccd5afb4cbb52767f621436a1e Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 25 Dec 2006 13:39:28 +0000 Subject: [PATCH] New version Package-Manager: portage-2.1.2_rc4 --- x11-drivers/ati-drivers/ChangeLog | 7 +- x11-drivers/ati-drivers/Manifest | 16 +- .../ati-drivers/ati-drivers-8.32.5.ebuild | 364 ++++++++++++++++++ .../files/digest-ati-drivers-8.32.5 | 3 + 4 files changed, 385 insertions(+), 5 deletions(-) create mode 100644 x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild create mode 100644 x11-drivers/ati-drivers/files/digest-ati-drivers-8.32.5 diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 0fa7d9f1ba82..40b1b8bee029 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.55 2006/12/03 20:09:58 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.56 2006/12/25 13:39:28 lu_zero Exp $ + +*ati-drivers-8.32.5 (25 Dec 2006) + + 25 Dec 2006; Luca Barbato +ati-drivers-8.32.5.ebuild: + New version 03 Dec 2006; Luca Barbato ati-drivers-8.30.3-r1.ebuild: diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 80d44c62b8c5..d27320b919d8 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -19,6 +19,7 @@ DIST ati-driver-installer-8.27.10-x86_64.run 32487472 RMD160 04dc8598253791b5221 DIST ati-driver-installer-8.28.8.run 53989404 RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f SHA1 811b73481f82d178b26417fd3d4b227864bd4527 SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77 DIST ati-driver-installer-8.29.6.run 57776757 RMD160 b2440a153e4c95c8926d7333efbd864b2c1450bc SHA1 db53f411fa076bc927023f2636171b474aa360f0 SHA256 d1d341db0a4a6d723ce99b553dbc332f9e234e92ba22cb5cc4dbec40ece5ce6b DIST ati-driver-installer-8.30.3.run 58041208 RMD160 d4481bba9313cf9bcb71b7603034595677eb53f9 SHA1 37e73967e6921b0a362cb344929282be99e163ce SHA256 3d03b64ba8fd6fef3c50a2037a4e8d97955086fee3da274c2993d55aae058dcc +DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475 EBUILD ati-drivers-8.27.10-r1.ebuild 11283 RMD160 6453079c69f3019a5cf01af885abeb77a59f87a4 SHA1 c7f7cb42ef294f16b043654877bfcbc4a725a1fd SHA256 53c4bfbc5a72637ad6fe6c4caeca5dcac1c7b08676ff286e7e1d9c411c5cfe60 MD5 ed22a46365152134f6befb644d164871 ati-drivers-8.27.10-r1.ebuild 11283 RMD160 6453079c69f3019a5cf01af885abeb77a59f87a4 ati-drivers-8.27.10-r1.ebuild 11283 @@ -39,10 +40,14 @@ EBUILD ati-drivers-8.30.3.ebuild 11194 RMD160 6cef5a7467098dc471000bf7baf24776db MD5 dd66ec8951ad6e44f8959dabc43702f0 ati-drivers-8.30.3.ebuild 11194 RMD160 6cef5a7467098dc471000bf7baf24776db056a0f ati-drivers-8.30.3.ebuild 11194 SHA256 3422ebee63d8418afe1855cba0e0625d9aca39b9aa37054b18fd1323d96cc684 ati-drivers-8.30.3.ebuild 11194 -MISC ChangeLog 33296 RMD160 170f64b3052eedab1713f41f30716305a9fee874 SHA1 385ba2aedfd50e5c4aa09553b6fed440a192c8c6 SHA256 c131119a419398402ab0aa9578e00ff4cb5790aa8af0b3ae3e4ea05b7e01be82 -MD5 f6b1a7ae61e2157c63b84db730797861 ChangeLog 33296 -RMD160 170f64b3052eedab1713f41f30716305a9fee874 ChangeLog 33296 -SHA256 c131119a419398402ab0aa9578e00ff4cb5790aa8af0b3ae3e4ea05b7e01be82 ChangeLog 33296 +EBUILD ati-drivers-8.32.5.ebuild 10612 RMD160 44908ce276c2772e8296d6eac56c151c67fea68b SHA1 2cc75048ff3882434f8cdbce961a39131b4658d1 SHA256 463da28f83ba8782375a0afcad800886d327ea3feb0aca64f189e09871916ea7 +MD5 3dac8cf2851dcbb5cfb9fe41a0b77c60 ati-drivers-8.32.5.ebuild 10612 +RMD160 44908ce276c2772e8296d6eac56c151c67fea68b ati-drivers-8.32.5.ebuild 10612 +SHA256 463da28f83ba8782375a0afcad800886d327ea3feb0aca64f189e09871916ea7 ati-drivers-8.32.5.ebuild 10612 +MISC ChangeLog 33423 RMD160 79eb55b2c50879185dec90437994dda854497686 SHA1 eca92cd5927b485bb52363ac14870cbdd005a777 SHA256 e4f9fe7fd84b4bca7d9d292d64fab95ba4706062ac4b2b2107a4e7e3bc732bef +MD5 b23fd54dc852e21b020ea4bc3414cb33 ChangeLog 33423 +RMD160 79eb55b2c50879185dec90437994dda854497686 ChangeLog 33423 +SHA256 e4f9fe7fd84b4bca7d9d292d64fab95ba4706062ac4b2b2107a4e7e3bc732bef ChangeLog 33423 MISC metadata.xml 227 RMD160 995920cb9ba6325fe5a22db8af8e2fbd175626ba SHA1 55b89696d4d0085dabefd5a84c7de12856c1b399 SHA256 e88d5d6f3ed73a348132ed81f0f37e422b0ca0e739a36918c99beba883175bbf MD5 743a1c880d5bdf91acb9fc889a99fe2f metadata.xml 227 RMD160 995920cb9ba6325fe5a22db8af8e2fbd175626ba metadata.xml 227 @@ -62,3 +67,6 @@ SHA256 18779cfdde4edd8c60953531296ac2200483b8fbab9dc6001922bf0f5d4a9691 files/di MD5 74b92713cd7b0e4a8cb31b0cf50834ec files/digest-ati-drivers-8.30.3-r1 280 RMD160 91645bb5fe9039e684e70b913283b3c841f70b19 files/digest-ati-drivers-8.30.3-r1 280 SHA256 18779cfdde4edd8c60953531296ac2200483b8fbab9dc6001922bf0f5d4a9691 files/digest-ati-drivers-8.30.3-r1 280 +MD5 1963ca03d87d124fb7e1860ddb48abcb files/digest-ati-drivers-8.32.5 313 +RMD160 03a500dde0ac58356dc1ea7f447e8b88e284697c files/digest-ati-drivers-8.32.5 313 +SHA256 791d1512c572ce00dbaef63785b6cad94794d6b86181f3ed984df941cd49bd00 files/digest-ati-drivers-8.32.5 313 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild new file mode 100644 index 000000000000..a96058a21922 --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.32.5.ebuild @@ -0,0 +1,364 @@ +# 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.32.5.ebuild,v 1.1 2006/12/25 13:39:28 lu_zero 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 virtual/x11 ) + app-admin/eselect-opengl + || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) + acpi? ( + || ( x11-apps/xauth virtual/x11 ) + sys-power/acpid + )" + +DEPEND=">=virtual/linux-sources-2.4 + ${RDEPEND}" + +PROVIDE="virtual/opengl" + +S="${WORKDIR}/common/lib/modules/fglrx/build_mod" + +ATIBIN="${D}/opt/ati/bin" +RESTRICT="nostrip multilib-pkg-force stricter" + +QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so" +QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so" +QA_TEXTRELS_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2" +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 + if has_version "x11-base/xorg-server"; then + X11_IMPLEM=xorg-x11 + X11_IMPLEM_V="$(best_version x11-base/xorg-server)" + X11_IMPLEM_V="${X11_IMPLEM_V/x11-base\/xorg-server-/}" + elif has_version " /dev/null + eend $? || die "unpack failed" + + rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel} + + epatch ${FILESDIR}/${PN}-2.6.19.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" + + # 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, 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 < ${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.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 +} diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.32.5 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.32.5 new file mode 100644 index 000000000000..3543076ef98b --- /dev/null +++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.32.5 @@ -0,0 +1,3 @@ +MD5 ea5166083abbe2e28735e805dff78da1 ati-driver-installer-8.32.5-x86.x86_64.run 58503169 +RMD160 45bf6649227081f6ec10f65305661417c0314748 ati-driver-installer-8.32.5-x86.x86_64.run 58503169 +SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475 ati-driver-installer-8.32.5-x86.x86_64.run 58503169 -- 2.26.2