New version
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 13 Mar 2006 02:24:11 +0000 (02:24 +0000)
committerLuca Barbato <lu_zero@gentoo.org>
Mon, 13 Mar 2006 02:24:11 +0000 (02:24 +0000)
Package-Manager: portage-2.1_pre5-r2

x11-drivers/ati-drivers/ChangeLog
x11-drivers/ati-drivers/Manifest
x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild [new file with mode: 0644]
x11-drivers/ati-drivers/files/digest-ati-drivers-8.23.7 [new file with mode: 0644]

index 5eccbfe44b3d7fb32ebc7f2126868912caff1fda..b0e95e84aba18f9254ac7e1e1ed12df9d2878767 100644 (file)
@@ -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.27 2006/03/08 16:35:22 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.28 2006/03/13 02:24:11 lu_zero Exp $
+
+*ati-drivers-8.23.7 (13 Mar 2006)
+
+  13 Mar 2006; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.23.7.ebuild:
+  New drivers
 
   08 Mar 2006; Michele Noberasco <s4t4n@gentoo.org> ati-drivers-8.21.7-r1.ebuild:
   Stable for x86. See bug #124215.
index 95f5141f41f5beae176a38863503a30b00018ada..92e546e156a621abbed2ee24a0089be12495069f 100644 (file)
@@ -1,6 +1,6 @@
-MD5 6fdae38afbb247462b68e91fcae79612 ChangeLog 26769
-RMD160 3764dbb7451ba68dcb51fac6157af3aedde4e5df ChangeLog 26769
-SHA256 4a965fb6b6b792017fbca290cf8b9728971b87c943f69c3ab06f8af197d4f84c ChangeLog 26769
+MD5 86a7f247c4d8c58b3b37af3a00484e26 ChangeLog 26898
+RMD160 d09588bdcbf49b47fa63c7ecc5d867798e0c1694 ChangeLog 26898
+SHA256 b4f5c26541b4516cf2601f54ce1ab2c8f30e69bf690f8905e89498cd72edbd99 ChangeLog 26898
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
 RMD160 fdb66565c4601869a9770d995fee4c055090978f ati-drivers-8.14.13-r2.ebuild 7005
 SHA256 e12b64254b2459337c7e6a9e16ec31add663375d74cfdc78e3b5e489eed5e211 ati-drivers-8.14.13-r2.ebuild 7005
@@ -49,6 +49,9 @@ SHA256 ae67a291c40ed09e8726c4ed65a6f93cc4cca90b9eb5d16105f23638a2b10096 ati-driv
 MD5 2c599a8c0985a244933812ab478545c4 ati-drivers-8.22.5.ebuild 8894
 RMD160 2ac6e4fe56cbb072c386568ceab434ef0a358fa2 ati-drivers-8.22.5.ebuild 8894
 SHA256 cfd53c585cddbf3dcfc02e54633d5851eaeb4eee886fc7547d276a2da37b8db2 ati-drivers-8.22.5.ebuild 8894
+MD5 bf1935aed6ca251a3236e212b4d0a865 ati-drivers-8.23.7.ebuild 8894
+RMD160 168ade08631e60c5a91bf9e593df9b35beb3dd77 ati-drivers-8.23.7.ebuild 8894
+SHA256 f645612ebe3a2a46f549881d497188f240dfa8e3eb4dbbca27fc674645c6b865 ati-drivers-8.23.7.ebuild 8894
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 RMD160 2eb917685ae226a6913f00d0247514faf998d92f files/09ati 39
 SHA256 44336cd56c2712a3260a1289c1085f08e4cb61e6a73175eac4a7b3ebabe5011e files/09ati 39
@@ -115,6 +118,9 @@ SHA256 5c104d7d09ff96a5ea5ffec862143a98d7f1a787fb0fdcaeb4d6a2872a2d3859 files/di
 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
+MD5 73ed5ba89fc27d97d8487ddbbb91d1c8 files/digest-ati-drivers-8.23.7 596
+RMD160 d4270cb764537c2c2e172f72a01b0e30b99cc856 files/digest-ati-drivers-8.23.7 596
+SHA256 e6e4bbc3a090c81cb390b64eca1ec85d12b62e8aa9d1e3a36dd48f458b8f6b14 files/digest-ati-drivers-8.23.7 596
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
 RMD160 1c349a894ed606b8f51b4caf0b63a0dc152626f8 files/fglrx-2.6.12-inter_module_get.patch 1265
 SHA256 f1aedd70278cb8a11fdc9139ab698056dcc7ad2922aaa902fa7a8816ec10c43b files/fglrx-2.6.12-inter_module_get.patch 1265
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.23.7.ebuild
new file mode 100644 (file)
index 0000000..de54c8d
--- /dev/null
@@ -0,0 +1,330 @@
+# 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.23.7.ebuild,v 1.1 2006/03/13 02:24:11 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? ( 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 )
+        app-admin/eselect-opengl
+        || ( 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
+       elif has_version "<x11-base/xorg-x11-6.8.99"; then
+               X11_IMPLEM=xorg-x11
+               X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+               X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+               X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+       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
+
+       # remove intermodule calls for 2.6.16
+       if kernel_is 2 6 16; then
+               epatch ${FILESDIR}/${P}-intermodule.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
+
+       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
+
+       dodir /etc
+       cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/
+}
+
+
+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
+       # 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.23.7 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.23.7
new file mode 100644 (file)
index 0000000..533745a
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 3cc417f243a227163ac8a73e3f467240 ati-driver-installer-8.23.7-i386.run 34448865
+RMD160 f4f31ed77e84e9dc5a2885635488f3d582e1b474 ati-driver-installer-8.23.7-i386.run 34448865
+SHA256 b7226f640d08b583f05fc95dea75238aeedcd13d1252d3911b40f6fd3a064c24 ati-driver-installer-8.23.7-i386.run 34448865
+MD5 9b5b56edf50464a182f0b61586f19c23 ati-driver-installer-8.23.7-x86_64.run 28293314
+RMD160 97c7b027622c2382be39751ddb249840d8269243 ati-driver-installer-8.23.7-x86_64.run 28293314
+SHA256 a28e01b46c7187cb9542754a1b9621e1ba7f86d8803e44fed1a8c773ecf4341d ati-driver-installer-8.23.7-x86_64.run 28293314