diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-05 01:27:53 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-05 01:27:53 +0000 |
| commit | abf92652af3adf6652ab2f24e20a4d66ae174fab (patch) | |
| tree | 50abba32bc7a5b9e7f4d1ae866e444912a07ef0b /x11-drivers | |
| parent | Made the change back to ~ppc, I'm not sure what happened with wormo's commit. (diff) | |
| download | gentoo-2-abf92652af3adf6652ab2f24e20a4d66ae174fab.tar.gz gentoo-2-abf92652af3adf6652ab2f24e20a4d66ae174fab.tar.bz2 gentoo-2-abf92652af3adf6652ab2f24e20a4d66ae174fab.zip | |
Fix VT switching on some systems. (Phil Blacker, bug #139290)
(Portage version: 2.1.2_pre2-r3)
Diffstat (limited to 'x11-drivers')
4 files changed, 92 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog index 37e8672825bf..28b1b025cb30 100644 --- a/x11-drivers/xf86-video-i810/ChangeLog +++ b/x11-drivers/xf86-video-i810/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-i810 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.36 2006/10/02 16:14:09 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.37 2006/10/05 01:27:53 joshuabaergen Exp $ + +*xf86-video-i810-1.7.0-r1 (05 Oct 2006) + + 05 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/1.7.0-fix_vt_switch.patch, -xf86-video-i810-1.7.0.ebuild, + +xf86-video-i810-1.7.0-r1.ebuild: + Fix VT switching on some systems. (Phil Blacker, bug #139290) *xf86-video-i810-1.7.0 (02 Oct 2006) diff --git a/x11-drivers/xf86-video-i810/files/1.7.0-fix_vt_switch.patch b/x11-drivers/xf86-video-i810/files/1.7.0-fix_vt_switch.patch new file mode 100644 index 000000000000..91471b1a3230 --- /dev/null +++ b/x11-drivers/xf86-video-i810/files/1.7.0-fix_vt_switch.patch @@ -0,0 +1,44 @@ +--- a/src/i830_driver.c ++++ b/src/i830_driver.c +@@ -2620,37 +2620,15 @@ static Bool + I830Set640x480(ScrnInfoPtr pScrn) + { + I830Ptr pI830 = I830PTR(pScrn); +- int m = 0x30; /* 640x480 8bpp */ ++ int m; + +- switch (pScrn->depth) { +- case 15: +- m = 0x40; +- break; +- case 16: +- m = 0x41; +- break; +- case 24: +- m = 0x50; +- break; +- } +- +- m |= (1 << 15) | (1 << 14); ++ /* 640x480 8bpp */ ++ m = 0x30 | (1 << 15) | (1 << 14); + if (VBESetVBEMode(pI830->pVbe, m, NULL)) + return TRUE; + +- + /* if the first failed, let's try the next - usually 800x600 */ +- m = 0x32; +- switch (pScrn->depth) { +- case 15: +- case 16: +- m = 0x42; +- break; +- case 24: +- m = 0x52; +- break; +- } +- m |= (1 << 15) | (1 << 14); ++ m = 0x32 | (1 << 15) | (1 << 14); + + if (VBESetVBEMode(pI830->pVbe, m, NULL)) + return TRUE; diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.0-r1 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.0-r1 new file mode 100644 index 000000000000..bdcdec828ca9 --- /dev/null +++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.0-r1 @@ -0,0 +1,6 @@ +MD5 1bdda42ee3348fbd0a12aa83bf0df80a x11-driver-patches-3.tar.bz2 404 +RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff x11-driver-patches-3.tar.bz2 404 +SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a x11-driver-patches-3.tar.bz2 404 +MD5 0209384c5d36150b48cf721bcccf844e xf86-video-i810-1.7.0.tar.bz2 457811 +RMD160 bc40f101fe11bd65924ee6b5652e1f79d3192a9e xf86-video-i810-1.7.0.tar.bz2 457811 +SHA256 6d17c24fe79e13fd6a980ceb10c41bb117c28aa53f3f6c4833d6ef797a591039 xf86-video-i810-1.7.0.tar.bz2 457811 diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.0-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.0-r1.ebuild new file mode 100644 index 000000000000..d9f6155f0b0d --- /dev/null +++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.0-r1.ebuild,v 1.1 2006/10/05 01:27:53 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" +XDPVER=3 + +inherit x-modular + +DESCRIPTION="X.Org driver for Intel cards" +KEYWORDS="~amd64 ~ia64 ~sh ~x86 ~x86-fbsd" +IUSE="dri" +RDEPEND=">=x11-base/xorg-server-1.0.99 + x11-libs/libXvMC" +DEPEND="${RDEPEND} + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto + x11-proto/xproto + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 + x11-libs/libX11 )" + +CONFIGURE_OPTIONS="$(use_enable dri)" + +PATCHES="${FILESDIR}/${PV}-fix_vt_switch.patch" + +pkg_setup() { + if use dri && ! built_with_use x11-base/xorg-server dri; then + die "Build x11-base/xorg-server with USE=dri." + fi +} |