diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-25 18:25:24 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-25 18:25:24 +0000 |
| commit | eb31373e617840d413a0a2bab88d42123dd654b5 (patch) | |
| tree | d529a89f1c02d78ad1fae8674dc9832beb2c77f0 /x11-base/xorg-server | |
| parent | Stable on ppc; bug #137302. (diff) | |
| download | gentoo-2-eb31373e617840d413a0a2bab88d42123dd654b5.tar.gz gentoo-2-eb31373e617840d413a0a2bab88d42123dd654b5.tar.bz2 gentoo-2-eb31373e617840d413a0a2bab88d42123dd654b5.zip | |
Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other servers require them. This replaces the existing fix for bug #136370 and should also fix bug #152797.
(Portage version: 2.1.2_pre3-r8)
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild | 34 |
2 files changed, 33 insertions, 9 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 1a63ec852952..f9698e5708d3 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # 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.183 2006/10/25 07:18:47 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.184 2006/10/25 18:25:24 dberkholz Exp $ + + 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.1.1-r1.ebuild: + Unbreaking kdrive, part 3: Build fbdev and vesa for all cases in which other + servers require them. This replaces the existing fix for bug #136370 and + should also fix bug #152797. 25 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-server-1.1.1-r1.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild index 5561f7582ea9..532e4fecdee6 100644 --- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.1-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.1-r1.ebuild,v 1.18 2006/10/25 07:18:47 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.19 2006/10/25 18:25:24 dberkholz Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -353,6 +353,12 @@ src_unpack() { # Set up kdrive servers to build if use kdrive; then einfo "Removing unused kdrive drivers ..." + + # Some kdrive servers require fbdev and vesa + local kdrive_fbdev="radeon neomagic sis siliconmotion" + # Some kdrive servers require just vesa + local kdrive_vesa="chips mach64 mga nv glint r128 via" + for card in ${IUSE_VIDEO_CARDS}; do real_card=${card#video_cards_} @@ -372,13 +378,25 @@ src_unpack() { fi if ! use ${card}; then - # (bug #136370) Radeon needs fbdev and vesa - if use x86 \ - && use video_cards_radeon; then - if [[ ${real_card} = fbdev ]] \ - || [[ ${real_card} = vesa ]]; then - continue - fi + if use x86; then + # Some kdrive servers require fbdev and vesa + for i in ${kdrive_fbdev}; do + if use video_cards_${i}; then + if [[ ${real_card} = fbdev ]] \ + || [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done + + # Some kdrive servers require just vesa + for i in ${kdrive_vesa}; do + if use video_cards_${i}; then + if [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done fi disable_card=1 # Bug #150052 |