diff options
author | Rémi Cardona <remi@gentoo.org> | 2008-02-20 09:52:11 +0000 |
---|---|---|
committer | Rémi Cardona <remi@gentoo.org> | 2008-02-20 09:52:11 +0000 |
commit | af0be0d779fa2a27c99cca7a625e67cb7097c99b (patch) | |
tree | 45eacd25eca33a205b0e1045b570d400c9ece685 /x11-drivers/xf86-video-i810 | |
parent | Fixed filtering out of LDFLAGS, bug 209740, thank you Diego Pettenò! Compile... (diff) | |
download | gentoo-2-af0be0d779fa2a27c99cca7a625e67cb7097c99b.tar.gz gentoo-2-af0be0d779fa2a27c99cca7a625e67cb7097c99b.tar.bz2 gentoo-2-af0be0d779fa2a27c99cca7a625e67cb7097c99b.zip |
x11-drivers/xf86-video-i810: remove outdated snapshot and useless patches
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-drivers/xf86-video-i810')
5 files changed, 7 insertions, 137 deletions
diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog index 2890a843bf0c..551fae26b231 100644 --- a/x11-drivers/xf86-video-i810/ChangeLog +++ b/x11-drivers/xf86-video-i810/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/xf86-video-i810 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.77 2008/02/06 18:21:21 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.78 2008/02/20 09:52:11 remi Exp $ + + 20 Feb 2008; Rémi Cardona <remi@gentoo.org> + -files/1.7.0-fix_vt_switch.patch, -files/fix_965_xv.patch, + -files/xf86-video-i810-2.2.0-fix_xv_segfault.patch, + -xf86-video-i810-2.2.1_pre20080125.ebuild: + remove outdated snapshot and useless patches *xf86-video-i810-2.2.0.90 (06 Feb 2008) 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 deleted file mode 100644 index 91471b1a3230..000000000000 --- a/x11-drivers/xf86-video-i810/files/1.7.0-fix_vt_switch.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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/fix_965_xv.patch b/x11-drivers/xf86-video-i810/files/fix_965_xv.patch deleted file mode 100644 index 50736fc4d4d8..000000000000 --- a/x11-drivers/xf86-video-i810/files/fix_965_xv.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/packed_yuv_wm.g4a -+++ src/packed_yuv_wm.g4a -@@ -144,7 +144,7 @@ mac.sat (8) m8<1>F g15<8,8,1>F 1F { alig - */ - mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable }; - /* Send framebuffer write message: XXX: acc0? */ --send (16) 0 null g0<8,8,1>UW write ( -+send (16) 0 acc0<1>UW g0<8,8,1>UW write ( - 0, /* binding table index 0 */ - 8, /* pixel scoreboard clear */ - 4, /* render target write */ ---- src/wm_prog.h -+++ src/wm_prog.h -@@ -71,7 +71,7 @@ - { 0x00600041, 0x20007fbc, 0x008d0220, 0x40011687 }, - { 0x80600048, 0x21007fbe, 0x008d01e0, 0x3f800000 }, - { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 }, -- { 0x00800031, 0x20001d3c, 0x008d0000, 0x85a04800 }, -+ { 0x00800031, 0x24001d28, 0x008d0000, 0x85a04800 }, - { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 }, diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch deleted file mode 100644 index af849a45718c..000000000000 --- a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.0-fix_xv_segfault.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Michel Dänzer <michel@tungstengraphics.com> -Date: Tue, 18 Dec 2007 18:37:46 +0000 (+0100) -Subject: Always set pPriv->buf to NULL after freeing the memory it pointed to. -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=4757a218d733af12d04674455fc6e1fad48a1cd0 - -Always set pPriv->buf to NULL after freeing the memory it pointed to. - -Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13108 . ---- - ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -2574,6 +2574,7 @@ I830VideoBlockHandler(int i, pointer blo - */ - I830Sync(pScrn); - i830_free_memory(pScrn, pPriv->buf); -+ pPriv->buf = NULL; - pPriv->videoStatus = 0; - } - } -@@ -2686,6 +2687,7 @@ I830FreeSurface(XF86SurfacePtr surface) - /* Sync before freeing the buffer, because the pages will be unbound. */ - I830Sync(pScrn); - i830_free_memory(surface->pScrn, pPriv->buf); -+ pPriv->buf = NULL; - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1_pre20080125.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1_pre20080125.ebuild deleted file mode 100644 index 41a9722e5898..000000000000 --- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.1_pre20080125.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2008 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-2.2.1_pre20080125.ebuild,v 1.1 2008/01/25 16:15:36 remi Exp $ - -# Must be before x-modular eclass is inherited -# Enable snapshot to get the man page in the right place -# This should be fixed with a XDP patch later -#SNAPSHOT="yes" -XDPVER=-1 - -inherit x-modular - -# This really needs a pkgmove... -SRC_URI="mirror://gentoo/xf86-video-intel-${PV}.tar.bz2" - -S="${WORKDIR}/xf86-video-intel-${PV/_pre*}" - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.2 - x11-libs/libX11 )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -pkg_setup() { - if use dri && ! built_with_use x11-base/xorg-server dri; then - die "Build x11-base/xorg-server with USE=dri." - fi -} |