summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2009-03-29 13:10:01 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2009-03-29 13:10:01 +0000
commitd5868c7024f1f84a79887bb13219c4e6bc699172 (patch)
tree4ef946326068d989b0bc3a6f729dc72003d27032 /x11-drivers
parentrevert commit 8129, x11-drm in portage lost nouveau support again. (diff)
downloadsunrise-d5868c7024f1f84a79887bb13219c4e6bc699172.tar.gz
sunrise-d5868c7024f1f84a79887bb13219c4e6bc699172.tar.bz2
sunrise-d5868c7024f1f84a79887bb13219c4e6bc699172.zip
x11-drivers/xf86-video-nouveau: update xf86-video-nouveau for x11-drm changes in portage. prefer x11 overlay's drm if available
svn path=/sunrise/; revision=8163
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-nouveau/ChangeLog6
-rw-r--r--x11-drivers/xf86-video-nouveau/Manifest6
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090328.ebuild (renamed from x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild)8
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild6
4 files changed, 14 insertions, 12 deletions
diff --git a/x11-drivers/xf86-video-nouveau/ChangeLog b/x11-drivers/xf86-video-nouveau/ChangeLog
index 61c811c02..5e50ce18a 100644
--- a/x11-drivers/xf86-video-nouveau/ChangeLog
+++ b/x11-drivers/xf86-video-nouveau/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Mar 2009; Chi-Thanh Christopher Nguyen (chithead)
+ <chithanh@cs.tu-berlin.de> -xf86-video-nouveau-0.0.20090325.ebuild,
+ +xf86-video-nouveau-0.0.20090328.ebuild, xf86-video-nouveau-9999.ebuild:
+ update xf86-video-nouveau for x11-drm changes in portage. prefer x11
+ overlay's drm if available
+
25 Mar 2009; Chi-Thanh Christopher Nguyen (chithead)
<chithanh@cs.tu-berlin.de> xf86-video-nouveau-0.0.20090325.ebuild,
xf86-video-nouveau-9999.ebuild:
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 6ce707839..c23e16cbe 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,4 +1,4 @@
-EBUILD xf86-video-nouveau-0.0.20090325.ebuild 976 RMD160 c5b774f26eff91eecc88cabcec63ed80d60538a4 SHA1 367c00e8a99fd9d1fae31912b36fcb36bdbd3b19 SHA256 b23cdebf71cc03fa495dfae8350dcd74ca603dd1578e0508a14572c8b096f123
-EBUILD xf86-video-nouveau-9999.ebuild 912 RMD160 65d7384113cc7635206f4d2f0587611d991cd601 SHA1 a5380451ae19092116c21ec58b499a90620574ec SHA256 15a7cc4514089f9f16484d58dcd0e7c99d104738844157b8269549d8c518ee89
-MISC ChangeLog 3512 RMD160 0ee9e722491f8d47c2ab13a3279b39f863e2d940 SHA1 655834f416116cd9a0d3f33fbdb37f3d8c5e493b SHA256 38dfb77d12d953d61c991d3a2d5a7a8b00f96201e918c71c216b7114f615c1ab
+EBUILD xf86-video-nouveau-0.0.20090328.ebuild 949 RMD160 989a1caa67b0e769af40a6a5c45b5687454a9df6 SHA1 ce166158378fbc7b827d79a6525d54294afb08ef SHA256 8c93a3fbe217adecbdce7019d002e37c3091783141fd336be695117bf5bfe828
+EBUILD xf86-video-nouveau-9999.ebuild 885 RMD160 79f3470352a38b294c5eb43c895bed7b58ea061e SHA1 be53346de23e5b721577457c1c07e045f2fe40f8 SHA256 d583de046096c23e6ddddbd85424ae5b83f1f96bd6f16fc00d21532f907aa517
+MISC ChangeLog 3813 RMD160 97c484010b02bc46f2b49781999927f64767129e SHA1 4fb50b023e81127772e78c6c9eb8ed7b1c0f2c32 SHA256 d7db19eb0c085b586c3739a7d13e6c70fe54d98900551cf81d6787317e38473a
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090328.ebuild
index 3e2ef819d..97869ec8c 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090325.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.20090328.ebuild
@@ -10,7 +10,7 @@ GIT_ECLASS="git"
inherit x-modular
-EGIT_TREE="a8eab45c154559cee434b66f85240a0315245ff4"
+EGIT_TREE="387a36fb3c97d1b1ed1747c108a85b874345f180"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
DESCRIPTION="Nouveau video driver"
@@ -31,10 +31,8 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xextproto
x11-proto/xf86driproto
x11-proto/xproto
- || ( x11-libs/libdrm_nouveau >=x11-libs/libdrm-9999 )"
+ || ( >=x11-libs/libdrm-9999 x11-libs/libdrm_nouveau )"
# need x11-base/x11-drm until nouveau drm enters the kernel
RDEPEND="${COMMON_DEPEND}
- || (
- >=x11-base/x11-drm-20090320[video_cards_nv]
- x11-base/x11-drm[video_cards_nouveau] )"
+ || ( x11-base/x11-drm[video_cards_nouveau] x11-base/nouveau-drm )"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
index e794dc15b..88b97399e 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-9999.ebuild
@@ -30,10 +30,8 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xextproto
x11-proto/xf86driproto
x11-proto/xproto
- || ( x11-libs/libdrm_nouveau >=x11-libs/libdrm-9999 )"
+ || ( >=x11-libs/libdrm-9999 x11-libs/libdrm_nouveau )"
# need x11-base/x11-drm until nouveau drm enters the kernel
RDEPEND="${COMMON_DEPEND}
- || (
- >=x11-base/x11-drm-20090320[video_cards_nv]
- x11-base/x11-drm[video_cards_nouveau] )"
+ || ( x11-base/x11-drm[video_cards_nouveau] x11-base/nouveau-drm )"