diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-12 15:31:34 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-12 15:31:34 +0000 |
| commit | 8f2c0268db5cf77f1c474f8044d07448eb789ca6 (patch) | |
| tree | 8eb359253f884386a292ff1fdd7efae9f6f07067 /x11-base | |
| parent | fix problems with -fstack-protector on amd64 with a strange patch from bug 10... (diff) | |
| download | gentoo-2-8f2c0268db5cf77f1c474f8044d07448eb789ca6.tar.gz gentoo-2-8f2c0268db5cf77f1c474f8044d07448eb789ca6.tar.bz2 gentoo-2-8f2c0268db5cf77f1c474f8044d07448eb789ca6.zip | |
Really fix bug #150052.
(Portage version: 2.1.2_pre2-r8)
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.1-r1.ebuild | 31 |
2 files changed, 23 insertions, 14 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index aa2d3754c10b..bde6a677e743 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.174 2006/10/12 02:53:25 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.175 2006/10/12 15:31:34 joshuabaergen Exp $ + + 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.1-r1.ebuild: + Really fix bug #150052. 12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> +files/xorg-conf-example.patch, 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 a4ccc00ff3fb..9922b416e561 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.9 2006/10/12 02:53:25 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.10 2006/10/12 15:31:34 joshuabaergen Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -351,12 +351,10 @@ src_unpack() { if use kdrive; then einfo "Removing unused kdrive drivers ..." for card in ${IUSE_VIDEO_CARDS}; do - # (bug #136370) Radeon needs fbdev and vesa - if use video_cards_radeon; then - if [[ ${card} = video_cards_fbdev ]] \ - || [[ ${card} = video_cards_vesa ]]; then - continue - fi + # Skip binary drivers + if [[ ${card} = video_cards_nvidia ]] \ + || [[ ${card} = video_cards_fglrx ]]; then + continue fi real_card=${card#video_cards_} @@ -370,13 +368,20 @@ src_unpack() { disable_card=0 if ! use ${card}; then - disable_card=1 - elif ! use x86; then - # Bug #150052 - if [[ ${vm86_devices/${card#video_cards_}/} != ${vm86_devices} ]]; then - ewarn " $real_card does not work on your architecture; disabling." - disable_card=1 + # (bug #136370) Radeon needs fbdev and vesa + if ! use x86 \ + && use video_cards_radeon; then + if [[ ${card} = fbdev ]] \ + || [[ ${card} = vesa ]]; then + continue + fi fi + disable_card=1 + # Bug #150052 + elif ! use x86 && + [[ ${vm86_devices/${card#video_cards_}/} != ${vm86_devices} ]]; then + ewarn " $real_card does not work on your architecture; disabling." + disable_card=1 fi if [[ $disable_card = 1 ]]; then |