From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QFm19-0004pC-Eg for garchives@archives.gentoo.org; Fri, 29 Apr 2011 11:37:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9049C1C04B; Fri, 29 Apr 2011 11:37:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A2821C04B for ; Fri, 29 Apr 2011 11:37:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BCED1B4020 for ; Fri, 29 Apr 2011 11:37:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D9E2180504 for ; Fri, 29 Apr 2011 11:37:41 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <3222020e0e8f16fed4bd2537b339508a5074b1c8.scarabeus@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-11.4.ebuild x11-drivers/ati-drivers/ati-drivers-8.840.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 3222020e0e8f16fed4bd2537b339508a5074b1c8 Date: Fri, 29 Apr 2011 11:37:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 810818a849fac5534fc49a4b22b73d20 commit: 3222020e0e8f16fed4bd2537b339508a5074b1c8 Author: Tomas Chvatal gentoo org> AuthorDate: Fri Apr 29 11:37:20 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Fri Apr 29 11:37:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D3222020e [ati-drivers] cleanup and drop older. --- x11-drivers/ati-drivers/ati-drivers-11.4.ebuild | 122 ++--- x11-drivers/ati-drivers/ati-drivers-8.840.ebuild | 572 ----------------= ------ 2 files changed, 51 insertions(+), 643 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild b/x11-driver= s/ati-drivers/ati-drivers-11.4.ebuild index 64b0282..3b81486 100644 --- a/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D4 =20 inherit eutils multilib linux-mod toolchain-funcs versionator =20 @@ -44,7 +44,7 @@ RDEPEND=3D" x11-libs/libXxf86vm x11-libs/qt-core x11-libs/qt-gui - ) + ) " =20 DEPEND=3D"${RDEPEND} @@ -156,19 +156,7 @@ _check_kernel_config() { eerror " Power management and ACPI options --->" eerror " [*] Power Management support" eerror "in the 'menuconfig'" - error=3D"${error} CONFIG_ACPI disabled" - failed=3D1 - fi - - if ! linux_chkconfig_present MAGIC_SYSRQ; then - eerror "${P} requires the magic SysRq keys in the kernel." - eerror "Please enable it:" - eerror " CONFIG_MAGIC_SYSRQ=3Dy" - eerror "in /usr/src/linux/.config or" - eerror " Kernel hacking --->" - eerror " [*] Magic SysRq key" - eerror "in the 'menuconfig'" - error=3D"${error} CONFIG_MAGIC_SYSRQ disabled" + error+=3D" CONFIG_ACPI disabled;" failed=3D1 fi =20 @@ -180,7 +168,7 @@ _check_kernel_config() { eerror " Bus options (PCI etc.) --->" eerror " [*] Message Signaled Interrupts (MSI and MSI-X)" eerror "in the kernel config." - error=3D"${error} CONFIG_PCI_MSI disabled" + error+=3D" CONFIG_PCI_MSI disabled;" failed=3D1 fi =20 @@ -195,7 +183,7 @@ _check_kernel_config() { eerror " [ ] Lock debugging: prove locking correctness" eerror " [ ] Lock usage statistics" eerror "in 'menuconfig'" - error=3D"${error} LOCKDEP enabled" + error+=3D" LOCKDEP enabled;" failed=3D1 fi =20 @@ -208,7 +196,7 @@ _check_kernel_config() { eerror "if this doesn't enable CONFIG_COMPAT add" eerror " CONFIG_COMPAT=3Dy" eerror "in /usr/src/linux/.config" - error=3D"${error} COMPAT disabled" + error+=3D" COMPAT disabled;" failed=3D1 fi =20 @@ -221,26 +209,34 @@ _check_kernel_config() { eerror "or add" eerror " CONFIG_BKL=3Dy" eerror "in /usr/src/linux/.config" - error=3D"${error} BKL disabled" + error+=3D" BKL disabled;" failed=3D1 fi =20 - [ "x${failed}" !=3D "x0" ] && die "${error}" + [[ ${failed} -ne 0 ]] && die "${error}" +} + +pkg_pretend() { + if use modules; then + MODULE_NAMES=3D"fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/bu= ild_mod/2.6.x)" + BUILD_TARGETS=3D"kmod_build" + linux-mod_pkg_setup + BUILD_PARAMS=3D"GCC_VER_MAJ=3D$(gcc-major-version) KVER=3D${KV_FULL} K= DIR=3D${KV_DIR}" + BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D\"-DMODULE -DATI -DFG= L\"" + if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm= /compat.h ; then + BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Darch_compat_alloc_user_space" + else + BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Dcompat_alloc_user_space" + fi + _check_kernel_config + fi } =20 pkg_setup() { # Define module dir. MODULE_DIR=3D"${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" # get the xorg-server version and set BASE_DIR for that - local ver_str=3D$(qatom `best_version x11-base/xorg-server` | cut -d ' = ' -f 3) - case ${ver_str} in - 1\.10*) BASE_DIR=3D"${S}/xpic" ;; - 1\.9*) BASE_DIR=3D"${S}/xpic" ;; - 9999*) BASE_DIR=3D"${S}/xpic" - ewarn "Experimental xorg-server-${ver_str}" - ewarn "Picking the last implementation" ;; - *) die "xorg-server-${ver_str} not supported" ;; - esac + BASE_DIR=3D"${S}/xpic" =20 # amd64/x86 if use amd64 ; then @@ -253,20 +249,6 @@ pkg_setup() { ARCH_DIR=3D"${S}/arch/x86" fi =20 - if use modules; then - MODULE_NAMES=3D"fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/bu= ild_mod/2.6.x)" - BUILD_TARGETS=3D"kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS=3D"GCC_VER_MAJ=3D$(gcc-major-version) KVER=3D${KV_FULL} K= DIR=3D${KV_DIR}" - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D\"-DMODULE -DATI -DFG= L\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm= /compat.h ; then - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Darch_compat_alloc_user_space" - else - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Dcompat_alloc_user_space" - fi - _check_kernel_config - fi - elog elog "Please note that this driver supports only graphic cards based on= " elog "r600 chipset and newer." @@ -423,18 +405,18 @@ src_install() { =20 # X modules. exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_dr= v.so || die + doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_dr= v.so exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdr= m.so || die + doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdr= m.so exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm= .so} || die + doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm= .so} =20 # Arch-specific files. # (s)bin. into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die + dobin "${ARCH_DIR}"/usr/X11R6/bin/* =20 # lib. exeinto /usr/$(get_libdir) @@ -448,54 +430,52 @@ src_install() { # Common files. # etc. insinto /etc/ati + exeinto /etc/ati # Everything except for the authatieventsd.sh script. doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpc= sdb.default} - insopts -m0755 - doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die + doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh =20 # include. insinto /usr - doins -r ${FOLDER_PREFIX}usr/include || die + doins -r ${FOLDER_PREFIX}usr/include insinto /usr/include/X11/extensions =20 # Just the atigetsysteminfo.sh script. into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* || die + dosbin ${FOLDER_PREFIX}usr/sbin/* =20 # data files for the control panel. if use qt4 ; then insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati || die + doins -r ${FOLDER_PREFIX}usr/share/ati insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die + doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ ccc_large System fi =20 # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die + dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx =20 - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die + doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 =20 pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null =20 exeinto /etc/acpi - doexe ati-powermode.sh || die + doexe ati-powermode.sh insinto /etc/acpi/events - doins events/* || die + doins events/* =20 popd > /dev/null =20 # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears || die - newdoc extra/fgl_glxgears/README README.fgl_glxgears || die + dobin extra/fgl_glxgears/fgl_glxgears + newdoc extra/fgl_glxgears/README README.fgl_glxgears =20 # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd \ - || die "Failed to install atieventsd.init.d" + newinitd "${FILESDIR}"/atieventsd.init atieventsd echo 'ATIEVENTSDOPTS=3D""' > "${T}"/atieventsd.conf - insopts -m0644 - newconfd "${T}"/atieventsd.conf atieventsd || die + newconfd "${T}"/atieventsd.conf atieventsd } =20 src_install-libs() { @@ -518,27 +498,27 @@ src_install-libs() { # The GLX libraries # (yes, this really is "lib" even on amd64/multilib --marienz) exeinto ${ATI_ROOT}/lib - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} || die - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} || die - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so || die + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so =20 exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/libglx= .so || die + doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/libglx= .so =20 # DRI modules, installed into the path used by recent versions of mesa. exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so = || die + doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so =20 # AMD Cal libraries exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* || die + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* =20 local envname=3D"${T}"/04ati-dri-path if [[ -n ${ABI} ]]; then envname=3D"${envname}-${ABI}" fi echo "LIBGL_DRIVERS_PATH=3D/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" || die + doenvd "${envname}" } =20 pkg_postinst() { diff --git a/x11-drivers/ati-drivers/ati-drivers-8.840.ebuild b/x11-drive= rs/ati-drivers/ati-drivers-8.840.ebuild deleted file mode 100644 index ec8e5b7..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-8.840.ebuild +++ /dev/null @@ -1,572 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -inherit eutils multilib linux-mod toolchain-funcs versionator - -DESCRIPTION=3D"Ati precompiled drivers for r600 (HD Series) and newer ch= ipsets" -HOMEPAGE=3D"http://www.ati.com" -# 8.ble will be used for beta releases. -if [[ $(get_major_version) -gt 8 ]]; then - ATI_URL=3D"https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/= linux/" - SRC_URI=3D"${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run" - FOLDER_PREFIX=3D"common/" -else - SRC_URI=3D"https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2= :${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" - FOLDER_PREFIX=3D"" -fi -IUSE=3D"debug +modules multilib qt4" - -LICENSE=3D"AMD GPL-2 QPL-1.0 as-is" -KEYWORDS=3D"" -SLOT=3D"1" - -RDEPEND=3D" - >=3Dx11-base/xorg-server-1.10 - !x11-drivers/ati-drivers:0 - !x11-apps/ati-drivers-extra - >=3Dapp-admin/eselect-opengl-1.0.7 - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - multilib? ( app-emulation/emul-linux-x86-opengl ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - x11-libs/qt-core - x11-libs/qt-gui - ) -" - -DEPEND=3D"${RDEPEND} - app-portage/portage-utils - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst -" - -EMULTILIB_PKG=3D"true" - -S=3D"${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=3D" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=3D" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=3D" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=3D" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=3D" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so -" - -QA_DT_HASH=3D" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/fglrxinfo - opt/sbin/atieventsd - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 -" - -_check_kernel_config() { - local failed=3D0 - local error=3D"" - if ! kernel_is 2 6; then - eerror "You need a 2.6 linux kernel to compile against!" - die "No 2.6 Kernel found" - fi - - if ! linux_chkconfig_present MTRR; then - ewarn "You don't have MTRR support enabled in the kernel." - ewarn "Direct rendering will not work." - fi - - if linux_chkconfig_builtin DRM; then - ewarn "You have DRM support built in to the kernel" - ewarn "Direct rendering will not work." - fi - - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - if ! linux_chkconfig_present ACPI; then - eerror "${P} requires the ACPI support in the kernel" - eerror "Please enable it:" - eerror " CONFIG_ACPI=3Dy" - eerror "in /usr/src/linux/.config or" - eerror " Power management and ACPI options --->" - eerror " [*] Power Management support" - eerror "in the 'menuconfig'" - error=3D"${error} CONFIG_ACPI disabled" - failed=3D1 - fi - - if ! linux_chkconfig_present MAGIC_SYSRQ; then - eerror "${P} requires the magic SysRq keys in the kernel." - eerror "Please enable it:" - eerror " CONFIG_MAGIC_SYSRQ=3Dy" - eerror "in /usr/src/linux/.config or" - eerror " Kernel hacking --->" - eerror " [*] Magic SysRq key" - eerror "in the 'menuconfig'" - error=3D"${error} CONFIG_MAGIC_SYSRQ disabled" - failed=3D1 - fi - - if ! linux_chkconfig_present PCI_MSI; then - eerror "${P} requires MSI in the kernel." - eerror "Please enable it:" - eerror " CONFIG_PCI_MSI=3Dy" - eerror "in /usr/src/linux/.config or" - eerror " Bus options (PCI etc.) --->" - eerror " [*] Message Signaled Interrupts (MSI and MSI-X)" - eerror "in the kernel config." - error=3D"${error} CONFIG_PCI_MSI disabled" - failed=3D1 - fi - - if linux_chkconfig_present LOCKDEP; then - eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." - eerror "Unfortunately, this option exports the symbol lock_acquire as = GPL-only." - eerror "This prevents ${P} from compiling with an error like this:" - eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only= symbol 'lock_acquire'" - eerror "Please make sure the following options have been unset:" - eerror " Kernel hacking --->" - eerror " [ ] Lock debugging: detect incorrect freeing of live l= ocks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - error=3D"${error} LOCKDEP enabled" - failed=3D1 - fi - - use amd64 && if ! linux_chkconfig_present COMPAT; then - eerror "${P} requires COMPAT." - eerror "Please enable the 32 bit emulation:" - eerror "Executable file formats / Emulations --->" - eerror " [*] IA32 Emulation" - eerror "in the kernel config." - eerror "if this doesn't enable CONFIG_COMPAT add" - eerror " CONFIG_COMPAT=3Dy" - eerror "in /usr/src/linux/.config" - error=3D"${error} COMPAT disabled" - failed=3D1 - fi - - kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then - eerror "${P} requires BKL." - eerror "Please enable the Big Kernel Lock:" - eerror "Kernel hacking --->" - eerror " [*] Big Kernel Lock" - eerror "in the kernel config." - eerror "or add" - eerror " CONFIG_BKL=3Dy" - eerror "in /usr/src/linux/.config" - error=3D"${error} BKL disabled" - failed=3D1 - fi - - [ "x${failed}" !=3D "x0" ] && die "${error}" -} - -pkg_setup() { - # Define module dir. - MODULE_DIR=3D"${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - local ver_str=3D$(qatom `best_version x11-base/xorg-server` | cut -d ' = ' -f 3) - case ${ver_str} in - 1\.10*) BASE_DIR=3D"${S}/xpic" ;; - 1\.9*) BASE_DIR=3D"${S}/xpic" ;; - 9999*) BASE_DIR=3D"${S}/xpic" - ewarn "Experimental xorg-server-${ver_str}" - ewarn "Picking the last implementation" ;; - 1\.8*|1\.7*) BASE_DIR=3D"${S}/xpic" ;; - *) die "xorg-server-${ver_str} not supported" ;; - esac - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR=3D"${BASE_DIR}_64a" - PKG_LIBDIR=3Dlib64 - ARCH_DIR=3D"${S}/arch/x86_64" - else - MY_BASE_DIR=3D"${BASE_DIR}" - PKG_LIBDIR=3Dlib - ARCH_DIR=3D"${S}/arch/x86" - fi - - if use modules; then - MODULE_NAMES=3D"fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/bu= ild_mod/2.6.x)" - BUILD_TARGETS=3D"kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS=3D"GCC_VER_MAJ=3D$(gcc-major-version) KVER=3D${KV_FULL} K= DIR=3D${KV_DIR}" - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D\"-DMODULE -DATI -DFG= L\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm= /compat.h ; then - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Darch_compat_alloc_user_space" - else - BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Dcompat_alloc_user_space" - fi - _check_kernel_config - fi - - elog - elog "Please note that this driver supports only graphic cards based on= " - elog "r600 chipset and newer." - elog "This represent the ATI Radeon HD series at this moment." - elog - elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati" - elog "as replacement is highly recommended. Rather than staying with" - elog "old versions of this driver." - elog "For migration informations please reffer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.x= ml" - einfo -} - -src_unpack() { - if [[ $(get_major_version) -gt 8 ]]; then - # Switching to a standard way to extract the files since otherwise no = signature file - # would be created - local src=3D"${DISTDIR}/${A}" - sh "${src}" --extract "${S}" 2&>1 /dev/null - else - unpack ${A} - fi -} - -src_prepare() { - # All kernel options for prepare are ment to be in here - if use modules; then - # version patches - # epatch "${FILESDIR}"/kernel/${PV}-*.patch - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # Fix a known compilation error - epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "sed failed." - - # Since "who" is in coreutils, we're using that one instead of "finger"= . - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powerm= ode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to e= patch powermode-opt-path-2.patch" - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" - cd "${S}" - - mkdir extra || die "mkdir failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=3DLIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=3D${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=3D${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_dr= v.so || die - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdr= m.so || die - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm= .so} || die - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die - - # lib. - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed in src_install-libs. - doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \ - -maxdepth 1 -type f -not -name '*.so*') - - # Common files. - # etc. - insinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpc= sdb.default} - insopts -m0755 - doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include || die - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* || die - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati || die - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die - make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh || die - insinto /etc/acpi/events - doins events/* || die - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears || die - newdoc extra/fgl_glxgears/README README.fgl_glxgears || die - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd \ - || die "Failed to install atieventsd.init.d" - echo 'ATIEVENTSDOPTS=3D""' > "${T}"/atieventsd.conf - insopts -m0644 - newconfd "${T}"/atieventsd.conf atieventsd || die -} - -src_install-libs() { - if [[ "${ABI}" =3D=3D "amd64" ]]; then - local EX_BASE_DIR=3D"${BASE_DIR}_64a" - local pkglibdir=3Dlib64 - local MY_ARCH_DIR=3D"${S}/arch/x86_64" - else - local EX_BASE_DIR=3D"${BASE_DIR}" - local pkglibdir=3Dlib - local MY_ARCH_DIR=3D"${S}/arch/x86" - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=3D/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=3D1 libminor=3D2 - local libver=3D${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} || die - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} || die - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so || die - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/libglx= .so || die - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so = || die - - # AMD Cal libraries - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* || die - - local envname=3D"${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname=3D"${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=3D/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" || die -} - -pkg_postinst() { - elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel cras= hes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -}