x11-drivers/xf86-video-i810: remove outdated snapshot and useless patches

Package-Manager: portage-2.1.4.4

6 files changed, 8 insertions, 143 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/Manifest b/x11-drivers/xf86-video-i810/Manifest
index a9860ccbc3ea..99ab9efde52d 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,20 +1,15 @@
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
-AUX 1.7.0-fix_vt_switch.patch 848 RMD160 8511bc7ceaf2875f71f04d260dda7d19dd8d5f76 SHA1 8c9764a1e1e47962948c931bb13d9470621bc56b SHA256 dbd1cf7b7ee7708c87bc4530a532e42afb4ecd463e9360c19a23468b8c26fa66
-AUX fix_965_xv.patch 909 RMD160 e58792c2d330c6880a90b8634a4c87dc6156ec17 SHA1 20044ea12f46005f4fca6d9b42e4da27cad1051d SHA256 18a3b8fd01e0e414b93f7259746dff216c8790cf27a6cc04acc3f9e71031f00c
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
-AUX xf86-video-i810-2.2.0-fix_xv_segfault.patch 1018 RMD160 1b989baf999dc8c8697fa1624d079dbb1e704a04 SHA1 a8a15459796be87640861a2028864e1012f3a9af SHA256 ab7253f729c82b049439e3110df11910c31c0d0ef37e4145b573d0511ada9db8
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
 DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2 SHA1 3c2837283ec3e9d1aeec430bb2460178aec94a90 SHA256 ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259
 DIST xf86-video-intel-2.1.1.tar.bz2 584729 RMD160 47596231378bed5c9a48511318b6e56ab184f319 SHA1 5a4e6205818ddd8fc8529e2bd5f6310fdc247f84 SHA256 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c
 DIST xf86-video-intel-2.2.0.90.tar.bz2 602031 RMD160 bccabea790b876e8cab4ca6803b7a33cce697c6f SHA1 6c93afc8381c2b758f727f655dc61573a1f72b1d SHA256 f5705cdf3466954f50d2dd8565e05da37c5def10ae3f891e76a93c646eccabed
-DIST xf86-video-intel-2.2.1_pre20080125.tar.bz2 591880 RMD160 cd5d80e1e26c5b880f58eb29efbea4fea8efd84a SHA1 035a647d0b7375763510bc72ba8b41d8e96a9506 SHA256 09e12f9a7d76c9cd8dcbbeae13a2edc382d881bedb4e32dbef1703073da39840
 EBUILD xf86-video-i810-1.6.5.ebuild 903 RMD160 b0f667881f34ec0aaf6c84c4722343aa80e8357c SHA1 f6cdec5ac5fb797f1bf20850d279762a4c450a65 SHA256 b67b560d633cfc290a494b0f0e277f81d063e6319c8f38fa0fd41aca67ab3c2a
 EBUILD xf86-video-i810-1.7.4.ebuild 863 RMD160 6e9e46e03134f840dfcdc0263871bd77ac57b9af SHA1 2d523f124ccb9c19014c977091ec02414a7bc8bc SHA256 d8998319b1fe36e5d6be2fc001f8061fe1395644d13e191f952fca882aa41175
 EBUILD xf86-video-i810-2.1.1.ebuild 1271 RMD160 42bb0909762236767f46048651c2c8692db339b9 SHA1 b8d4fff6c7354bc0faabdcafe4c74ea8e4d4f718 SHA256 04c59a29df8f52cbe8efb97be1bd6e0e1de2949f71a8695468d35ea97ff45fed
 EBUILD xf86-video-i810-2.2.0.90.ebuild 1163 RMD160 25a179cd03fb49fcccca211a8ec9cc437a3169b2 SHA1 5037d9aa3954cd69a159960d1fd66228fdb2b7f9 SHA256 130c083c10dcaf77cb6232b17e12ecf21d8580e8a05acdde21ddc462455102d7
-EBUILD xf86-video-i810-2.2.1_pre20080125.ebuild 1140 RMD160 42295bf7f6222a05c9ef04d74998a05fc23cf512 SHA1 eaa02852150d01183e8adf3ca866460fa317a552 SHA256 4371905a564bb15dfeab497538930aaea1a7b95059cb78d4791a724788dbad06
-MISC ChangeLog 14060 RMD160 05450204a000dce778b8333db33e27e8ea1aa79b SHA1 b8b85f183dc609a57e80f5709f5fae42c5abc28b SHA256 abe28bd018130d5f0163828e4b5137f57dc45b3b9a71e8f01cb58a8be178a9f1
+MISC ChangeLog 14315 RMD160 c543836f288f7c0071ccc3c24fcd6545a85da2a7 SHA1 1a7af4dd874b8fbea8cc2f663fd7fa94664c3c19 SHA256 e415043812db999700a9a4eb51a2f5563c6a8a791e526b961b12b55e81f37774
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
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
-}