diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-12-29 00:07:31 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-12-29 00:07:31 +0000 |
commit | c379acf27dacb53c31ee859451b00242398f4516 (patch) | |
tree | 4df98d4d20cefe4e1bc7bf71e63a59dfe089381b /x11-drivers/ati-drivers | |
parent | Fix build failure with python-3.2 and certain locales (bug #449062, thanks to... (diff) | |
download | gentoo-2-c379acf27dacb53c31ee859451b00242398f4516.tar.gz gentoo-2-c379acf27dacb53c31ee859451b00242398f4516.tar.bz2 gentoo-2-c379acf27dacb53c31ee859451b00242398f4516.zip |
Attempt to re-unify portage and x11 overlay ebuilds.
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers/ati-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 6 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild | 21 |
2 files changed, 22 insertions, 5 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index d63d6f11b826..2ecf90b33e28 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.309 2012/12/25 16:41:58 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.310 2012/12/29 00:07:31 chithanh Exp $ + + 29 Dec 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + ati-drivers-12.6_beta_pre897.ebuild: + Attempt to re-unify portage and x11 overlay ebuilds. *ati-drivers-12.11_beta11 (25 Dec 2012) diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild index 9de10d3b4010..26a6e230826e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.9 2012/12/25 16:41:58 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.10 2012/12/29 00:07:31 chithanh Exp $ EAPI=4 @@ -21,7 +21,7 @@ fi IUSE="debug +modules multilib qt4 static-libs" LICENSE="AMD GPL-2 QPL-1.0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="1" RESTRICT="bindist" @@ -47,8 +47,8 @@ RDEPEND=" x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm - x11-libs/qt-core - x11-libs/qt-gui + x11-libs/qt-core:4 + x11-libs/qt-gui:4 ) " @@ -327,6 +327,10 @@ src_prepare() { #fixes bug #420751 epatch "${FILESDIR}"/ati-drivers-do_mmap.patch + # compile fix for linux-3.7 + # https://bugs.gentoo.org/show_bug.cgi?id=438516 + epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch" + # Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8 # see https://bugs.gentoo.org/show_bug.cgi?id=448216 epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch" @@ -581,11 +585,20 @@ src_install-libs() { dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so}) done + # See https://bugs.gentoo.org/show_bug.cgi?id=443466 + dodir /etc/revdep-rebuild/ + echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers" + #remove static libs if not wanted use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a } pkg_postinst() { + if has_version ">=x11-base/xorg-server-1.11.99"; then + ewarn "Problems have been reported with this driver and xorg-server-1.12." + ewarn "Stay with xorg-server-1.11 if you experience hangs (bug #436252)." + fi + elog "To switch to AMD OpenGL, run \"eselect opengl set ati\"" elog "To change your xorg.conf you can use the bundled \"aticonfig\"" elog |