summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-09-02 21:51:04 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-09-02 21:51:04 +0000
commit75cdeb266aa90f1403d7d49b97a425de85c86412 (patch)
treeb3212ed3072182a54c849b856856d84002d1d522 /x11-apps/intel-gpu-tools
parentStable for x86, wrt bug #431892 (diff)
downloadgentoo-2-75cdeb266aa90f1403d7d49b97a425de85c86412.tar.gz
gentoo-2-75cdeb266aa90f1403d7d49b97a425de85c86412.tar.bz2
gentoo-2-75cdeb266aa90f1403d7d49b97a425de85c86412.zip
Make nouveau support optional, bug #433683.
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps/intel-gpu-tools')
-rw-r--r--x11-apps/intel-gpu-tools/ChangeLog6
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild13
2 files changed, 15 insertions, 4 deletions
diff --git a/x11-apps/intel-gpu-tools/ChangeLog b/x11-apps/intel-gpu-tools/ChangeLog
index fa9d30a14d47..b7f3e9bfd7c2 100644
--- a/x11-apps/intel-gpu-tools/ChangeLog
+++ b/x11-apps/intel-gpu-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/intel-gpu-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.11 2012/09/01 11:36:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.12 2012/09/02 21:51:04 chithanh Exp $
+
+ 02 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ intel-gpu-tools-1.3.ebuild:
+ Make nouveau support optional, bug #433683.
*intel-gpu-tools-1.3 (01 Sep 2012)
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
index a472794014c3..69be97342eae 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
@@ -1,16 +1,23 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild,v 1.1 2012/09/01 11:36:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild,v 1.2 2012/09/02 21:51:04 chithanh Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="intel gpu userland tools"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="video_cards_nouveau"
RESTRICT="test"
DEPEND="x11-libs/cairo
- >=x11-libs/libdrm-2.4.31[video_cards_intel]
+ >=x11-libs/libdrm-2.4.31[video_cards_intel,video_cards_nouveau?]
>=x11-libs/libpciaccess-0.10"
RDEPEND="${DEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable video_cards_nouveau nouveau)
+ )
+ xorg-2_src_configure
+}