summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-03-19 09:55:41 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-03-19 09:55:41 +0000
commit080457a984e72afff0f947a2d30a933db53d1b9c (patch)
tree8cf879c70be701aab4a5c1305affe88dfbda829f /x11-drivers
parentsci-chemistry/pymol: Prefix love (diff)
downloadhistorical-080457a984e72afff0f947a2d30a933db53d1b9c.tar.gz
historical-080457a984e72afff0f947a2d30a933db53d1b9c.tar.bz2
historical-080457a984e72afff0f947a2d30a933db53d1b9c.zip
Add configuration check for radeon KMS and against radeonfb, bug #461718.
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-ati/ChangeLog6
-rw-r--r--x11-drivers/xf86-video-ati/Manifest4
-rw-r--r--x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild6
3 files changed, 11 insertions, 5 deletions
diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 5b3a6603d183..6ad9429f50d5 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-drivers/xf86-video-ati
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.197 2013/01/31 14:16:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.198 2013/03/19 09:55:37 chithanh Exp $
+
+ 19 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xf86-video-ati-7.1.0.ebuild:
+ Add configuration check for radeon KMS and against radeonfb, bug #461718.
*xf86-video-ati-7.1.0 (31 Jan 2013)
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index d08a2a80949c..9a8edb7211a4 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -11,6 +11,6 @@ EBUILD xf86-video-ati-6.14.3-r1.ebuild 690 SHA256 eb2f5e17498ea861419554e73dad14
EBUILD xf86-video-ati-6.14.6-r1.ebuild 763 SHA256 f1ed4a2aeb86c1ed4163d128727f11b5ad925ec6de404a477651a1e09fa9d6dd SHA512 7f7f8ec188a7b5fc82e72281eedfee1520de1df0203a485951a80b943c9342db66601a1ddc8825544630bf11bc7045be7e5100de1dfec2b3702a676adb88795c WHIRLPOOL 1d07997a0e77627efb9d4ba99858256b253a4661b80f33857772b51a3cd90c5b87b0ab5c9d96f8f39245929c56626ce8fee72a5c7d57373e5d6cd1716d757753
EBUILD xf86-video-ati-7.0.0-r1.ebuild 688 SHA256 118481939e504c21dff4cadad4f4e70d628b6b0738d44a71c8d5a3e738dd82f7 SHA512 e1578c7d6b0e843dfbbe7efd7966264fd535c09a5cefa92bf0e6c540b4c5fe1d250f32dbd07fda3efef82bcfb5b6e6c6c2adfb15dfac28a6e1a4a4ce471ae52c WHIRLPOOL be09347c08c6dfbcad3b6497a0fadf15d79417c1a4adca92985d48d2977ef784ae5916229d3b6f87da77b6794b0f3f1be984e4f180c2427c21ba829f5c991ae4
EBUILD xf86-video-ati-7.0.0.ebuild 624 SHA256 aa084667c43bc33e9db1394869ed67adf1f1f4076e0319fdd679d0c46a6ab053 SHA512 8f0a3ebc4163b1723534545c2ab02b59e6c634dc7f333588eb9993f2d3d825022086f365cae68a33410ca1c6ed95b116e6145ee974a1e277a12a6ffff2d89594 WHIRLPOOL f8aec9bdef54e0b9e5dbd770f063a111b3fdd07fcc6dc63ee25441a828de421629ff9c332911482d2ace61d809545b0c1ea0ca7634ac1cdf713d7b20aaf0ef3f
-EBUILD xf86-video-ati-7.1.0.ebuild 630 SHA256 d83d326d5686c0f984a92ee1261f3af66c2a594334c8c72145dae1eafad35def SHA512 5168bc9b33034b5aefcc6b0064b6a3efb9905277463fbb98b65960e9ba4d7555738fdbb733e99168f8c20dfb3bc628610d32eb021a9ad823f7ec9e5f255faa90 WHIRLPOOL 2d33bc9b0ef3a802aa12fa6631665fa6073a75f1496b93c4bc92f8f3780f5978fee8f21f002175c7d6190a70f036ed6f3fa17cd568d8d1d0a83161d71341ad4d
-MISC ChangeLog 34874 SHA256 96cee9ad8b1a49fc3ecb297e90ae245fef98c4c06ad84b57af9e6bad8990814a SHA512 2cddc1d8c76190c2d1407dc61c88bdc37c2d9c2a3c944a4d656870875f4b271a1f0e4fb7fe722ae2248979e84e5b63823b4fe8d3dd7e8a42b54eee870e63c107 WHIRLPOOL a165e8084d7f9fcfae5e8a699b470453820e585c56bd1df68621e8ef58e39966956d27a6ad1f944114d78f45af4e082ecbb2d77d2456b0414aef4de240e1ba73
+EBUILD xf86-video-ati-7.1.0.ebuild 685 SHA256 7665d3b311c3639618c7f550c982b31925c661b2dc31104d7dfa73ddb3765214 SHA512 74132a93b970643b99ee6855a51a28ba69b9555354e55100013c11747bf13a791006285a52225534e50459990d461c8ea8ef9229a38fd335ffb3ac2bb77964dc WHIRLPOOL c9f49ab2f60f739cd49f64fc08e6dc9cbf8bd2a2935a616f33931341cfe5bd93739e861354066f1d8e7131297be01f189fd0827ee0c5cbcd2cb30110ecc356ae
+MISC ChangeLog 35051 SHA256 a15ac52543b20b2f078229ec04c7278a8181ef5d85063424179e971cb9ee5117 SHA512 fdd5443d647f989ca92943299ba6560572d8ca6c1bc414e6e4e95eaac64dbc9479d85754d043b50075cd72df751d0393c5033ab2b4a173a95ed7f5ff705aaa13 WHIRLPOOL 6accc6bd3c0023f6b41253298e722073a567d04967661d2974545fd33df2ee034fb7bc08f6a2d0e1fb1c1d159700780f27a2a689208ee19778a84ce58b51f78a
MISC metadata.xml 234 SHA256 c576bf25080db3484d07d654f7154894c03e15ba75c1e0a2461e4b3cee64ea3e SHA512 68aca8ec7b1603cc347d814cacf1415dd0eb3211b28e3325a8218c27a47ebe0e8dcb1d336db6054005da5fd9a85c4c3a7b67fababdb2f0a311e4b6b9e82caec7 WHIRLPOOL a72d888c968b4f22f8b37fe083b70ec18bce0942543fe6d1644ed27080ec882122972c78271689f2096ce6615c9a21ee3e4758da8288be6813da0b1efc07d335
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
index a94f56d25a0a..64075c0d6c2d 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild,v 1.1 2013/01/31 14:16:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild,v 1.2 2013/03/19 09:55:37 chithanh Exp $
EAPI=5
XORG_DRI=always
-inherit xorg-2
+inherit linux-info xorg-2
DESCRIPTION="ATI video driver"
@@ -17,6 +17,8 @@ RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]
udev? ( virtual/udev )"
DEPEND="${RDEPEND}"
+CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+
src_configure() {
XORG_CONFIGURE_OPTIONS=(
$(use_enable glamor)