diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-08-02 16:33:37 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-08-02 16:33:37 +0000 |
| commit | 1915b0e9a0cb9dea6a74d852efc70a405c39fa7f (patch) | |
| tree | cbe1877217e86fb508316b45ea7bf005dfb44400 /x11-base | |
| parent | Version bump to fix #141959 by Fredrik Tolf. (diff) | |
| download | gentoo-2-1915b0e9a0cb9dea6a74d852efc70a405c39fa7f.tar.gz gentoo-2-1915b0e9a0cb9dea6a74d852efc70a405c39fa7f.tar.bz2 gentoo-2-1915b0e9a0cb9dea6a74d852efc70a405c39fa7f.zip | |
Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver.
(Portage version: 2.1.1_pre4-r1)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1.ebuild | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 3f8e528db4a2..844ceade9dce 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.149 2006/07/19 14:36:49 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.150 2006/08/02 16:33:37 dberkholz Exp $ + + 02 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild: + Add VIDEO_CARDS=fglrx back in, now that there's a compatible driver. 19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-server-1.0.2-r7.ebuild: Stable on hppa. diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild index a3856059befe..0bf6ef2d4404 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.13 2006/07/16 17:59:41 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.14 2006/08/02 16:33:37 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -102,10 +102,10 @@ IUSE_VIDEO_CARDS=" video_cards_vga video_cards_via video_cards_vmware - video_cards_voodoo" + video_cards_voodoo + video_cards_fglrx" # video_cards_nvidia -# video_cards_fglrx" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -146,8 +146,7 @@ RDEPEND="x11-libs/libXfont kdrive? ( sdl? ( media-libs/libsdl ) ) !media-video/nvidia-glx !x11-drivers/nvidia-drivers - !x11-drivers/nvidia-legacy-drivers - !x11-drivers/ati-drivers" + !x11-drivers/nvidia-legacy-drivers" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent # Xpm is dmx- and xorgcfg-dependent, pulls in Xt @@ -326,6 +325,7 @@ PDEPEND=" video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) + video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 ) ) !minimal? ( >=x11-drivers/xf86-video-dummy-0.2.0 diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild index 8e48b19a6de2..30d948c404d9 100644 --- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.3 2006/07/16 17:58:02 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.4 2006/08/02 16:33:37 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -98,10 +98,10 @@ IUSE_VIDEO_CARDS=" video_cards_vga video_cards_via video_cards_vmware - video_cards_voodoo" + video_cards_voodoo + video_cards_fglrx" # video_cards_nvidia -# video_cards_fglrx" IUSE_SERVERS="dmx kdrive xorg" IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES} @@ -142,8 +142,7 @@ RDEPEND="x11-libs/libXfont kdrive? ( sdl? ( media-libs/libsdl ) ) !media-video/nvidia-glx !x11-drivers/nvidia-drivers - !x11-drivers/nvidia-legacy-drivers - !x11-drivers/ati-drivers" + !x11-drivers/nvidia-legacy-drivers" # Xres is dmx-dependent, xkbui is xorgcfg-dependent # Xaw is dmx- and xorgcfg-dependent # Xpm is dmx- and xorgcfg-dependent, pulls in Xt @@ -322,6 +321,7 @@ PDEPEND=" video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) + video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 ) ) !minimal? ( >=x11-drivers/xf86-video-dummy-0.2.0 |