Version bump. Includes previous patch and various other fixes, including

improved i915 textured video support.
Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 12 insertions, 101 deletions

diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 772d9247e5cf..4f18988f332b 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,12 +1,8 @@
-AUX 1.6.4-fix_dri_abi.patch 1132 RMD160 32a4328ba637d49cc8a7470b342efef7a3f420ad SHA1 c5b1d9eb7edf1218032cb99af146f39c7618c77a SHA256 28db5891dcc7a77eab54c7eaa64eac2d97cdb408c47c8d6e81af1dc431aa1ec3
-MD5 41f4c5a820b4d1f0419cc4afd1e393df files/1.6.4-fix_dri_abi.patch 1132
-RMD160 32a4328ba637d49cc8a7470b342efef7a3f420ad files/1.6.4-fix_dri_abi.patch 1132
-SHA256 28db5891dcc7a77eab54c7eaa64eac2d97cdb408c47c8d6e81af1dc431aa1ec3 files/1.6.4-fix_dri_abi.patch 1132
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST xf86-video-i810-1.4.1.3.tar.bz2 377092
 DIST xf86-video-i810-1.6.0.tar.bz2 408777 RMD160 530e26d75978bfa75bc02a998d1077d058fbf2b6 SHA1 e2b4928e8bf0bf23a61b69613798dabae07e6df4 SHA256 47fe2f41c5eb06a344282de0273dc69c968d3d34009778faf2cb983cdf795291
 DIST xf86-video-i810-1.6.1.tar.bz2 411541 RMD160 87ecd83bcdcede77535e1264718956c54dfc4a54 SHA1 fbfb49a6207c7ade29374df4d846e70988983e8f SHA256 98eb0b6a338a7512aeba8bbb75c3f8b1ff5adb1976cd8c59847efa00fba786e8
-DIST xf86-video-i810-1.6.4.tar.bz2 444453 RMD160 d46554a3384cb51b43f28ec51cb51720677d3050 SHA1 3b2e2c591139019bb942aacb5001e13c1b45c860 SHA256 0d9fe2a4923df6b1d6ff1b17332ff4c9a5f84d4a376ad4b0fd3223b2dd939351
+DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
 EBUILD xf86-video-i810-1.4.1.3.ebuild 842 RMD160 517638a0e16f84bd365fb06ddbc7520444e2ca45 SHA1 bf3b5723998736cefc6bf7c4788e7a76a5fdc37a SHA256 b11a540f11e1a955162cec6daa6f687056a25aa4e9162d437367cb430cb12daf
 MD5 992f932c1fe86779699bb597fe6c39ff xf86-video-i810-1.4.1.3.ebuild 842
 RMD160 517638a0e16f84bd365fb06ddbc7520444e2ca45 xf86-video-i810-1.4.1.3.ebuild 842
@@ -19,14 +15,14 @@ EBUILD xf86-video-i810-1.6.1.ebuild 866 RMD160 e735df7d452f7bd75e8cc096d753b3954
 MD5 9b74943330cd6b0bd3f5d4a9fc59c80b xf86-video-i810-1.6.1.ebuild 866
 RMD160 e735df7d452f7bd75e8cc096d753b395420edba7 xf86-video-i810-1.6.1.ebuild 866
 SHA256 d5b6b30f5949ce8537b48584205a0b6da90ae6b57990d0b298fd6e69a68a4e18 xf86-video-i810-1.6.1.ebuild 866
-EBUILD xf86-video-i810-1.6.4-r1.ebuild 907 RMD160 defe638b2eb61c977c4f71feaea7cd70c395a1c6 SHA1 ad28947aee26149c7ceb05fd83042b6b054be8ac SHA256 64ca3692246b9e5fb4ca6a2082176b8a7906481c3846201b305639a3982bc6a3
-MD5 3469ab2fe8cff00db8b79f8f7a40a620 xf86-video-i810-1.6.4-r1.ebuild 907
-RMD160 defe638b2eb61c977c4f71feaea7cd70c395a1c6 xf86-video-i810-1.6.4-r1.ebuild 907
-SHA256 64ca3692246b9e5fb4ca6a2082176b8a7906481c3846201b305639a3982bc6a3 xf86-video-i810-1.6.4-r1.ebuild 907
-MISC ChangeLog 5485 RMD160 748346a83d6ec91aae7a7a5bcb816516080c24a4 SHA1 1dddff9540192dab5eaf30e637f3378dbcd6b71b SHA256 b94f801dea1d6ef41b82e468cbbad69f456690f279bcaf4887cdc1560265ad56
-MD5 6433209d473a4e6eba5672b935eeba7c ChangeLog 5485
-RMD160 748346a83d6ec91aae7a7a5bcb816516080c24a4 ChangeLog 5485
-SHA256 b94f801dea1d6ef41b82e468cbbad69f456690f279bcaf4887cdc1560265ad56 ChangeLog 5485
+EBUILD xf86-video-i810-1.6.5.ebuild 857 RMD160 884d8f8dc328b10d26ae12657eee4c9ecf2ea031 SHA1 0c60e6530b0dda7198ea77c4c02b72dc244692e3 SHA256 3bc89e1c29c424fc3dc0cfcfdadb6f732c68fae3c02e33f06429b4863e2c2fb4
+MD5 f326379e864db4ebbd4978612ff873ab xf86-video-i810-1.6.5.ebuild 857
+RMD160 884d8f8dc328b10d26ae12657eee4c9ecf2ea031 xf86-video-i810-1.6.5.ebuild 857
+SHA256 3bc89e1c29c424fc3dc0cfcfdadb6f732c68fae3c02e33f06429b4863e2c2fb4 xf86-video-i810-1.6.5.ebuild 857
+MISC ChangeLog 548 RMD160 4cebc6d7b194fe88b84f5b1ca81a0c3244f9ecec SHA1 5aaf96ef9b1bfa4de574d73bf1e79953c5a47a12 SHA256 d2a182a38a3390b0fc595b529ab39fc191decddda9eb9714ec0a1dad1234afaf
+MD5 00649e6e97ccaa8f8ee8e38ee39b5eeb ChangeLog 548
+RMD160 4cebc6d7b194fe88b84f5b1ca81a0c3244f9ecec ChangeLog 548
+SHA256 d2a182a38a3390b0fc595b529ab39fc191decddda9eb9714ec0a1dad1234afaf ChangeLog 548
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -40,6 +36,6 @@ SHA256 5b359cef10a99bc6ee980e4c05ef6e358ee10ac825330d381e3acbf9f27b80c5 files/di
 MD5 43119dbb745a067f3c62ebe4d612c57c files/digest-xf86-video-i810-1.6.1 268
 RMD160 e1dc761fc65a6637397d55ffcf12673017cd1581 files/digest-xf86-video-i810-1.6.1 268
 SHA256 90ea333ca178dfa7f10b3872852e5c6acb914a449f3f1499e084b3feaaee9d7d files/digest-xf86-video-i810-1.6.1 268
-MD5 8edd2a3d88e5e1ca0a8a534b4d76f0ad files/digest-xf86-video-i810-1.6.4-r1 524
-RMD160 e9f397b71bc73eff6c4c4f2773912f3b68dbceb1 files/digest-xf86-video-i810-1.6.4-r1 524
-SHA256 520ebabae4d63a168c6b695bef2d86413c3562c42132d975fabf4064d0127849 files/digest-xf86-video-i810-1.6.4-r1 524
+MD5 e314965a10c63bae2159894eeb0e5312 files/digest-xf86-video-i810-1.6.5 524
+RMD160 8079385b6a7061caef26a85bedf46efa48498590 files/digest-xf86-video-i810-1.6.5 524
+SHA256 56fc147bc95fb0e18bd4133d9843737d2f8a8b9992390192f6190d4120219817 files/digest-xf86-video-i810-1.6.5 524
diff --git a/x11-drivers/xf86-video-i810/files/1.6.4-fix_dri_abi.patch b/x11-drivers/xf86-video-i810/files/1.6.4-fix_dri_abi.patch
deleted file mode 100644
index 5845f748efd2..000000000000
--- a/x11-drivers/xf86-video-i810/files/1.6.4-fix_dri_abi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/i830_dri.h b/src/i830_dri.h
-index f97c1dd..44be353 100644
---- a/src/i830_dri.h
-+++ b/src/i830_dri.h
-@@ -3,7 +3,6 @@
- #ifndef _I830_DRI_H
- #define _I830_DRI_H
- 
--#include "xf86dri.h"
- #include "xf86drm.h"
- #include "i830_common.h"
- 
-@@ -19,6 +18,21 @@ typedef struct _I830DRIRec {
-    drm_handle_t regs;
-    drmSize regsSize;
- 
-+   drmSize unused1; /* backbufferSize */
-+   drm_handle_t unused2; /* backbuffer */
-+
-+   drmSize unused3; /* depthbufferSize */
-+   drm_handle_t unused4; /* depthbuffer */
-+
-+   drmSize unused5; /* rotatedSize /*/
-+   drm_handle_t unused6; /* rotatedbuffer */
-+
-+   drm_handle_t unused7; /* textures */
-+   int unused8; /* textureSize */
-+
-+   drm_handle_t unused9; /* agp_buffers */
-+   drmSize unused10; /* agp_buf_size */
-+
-    int deviceID;
-    int width;
-    int height;
-@@ -26,6 +40,11 @@ typedef struct _I830DRIRec {
-    int cpp;
-    int bitsPerPixel;
- 
-+   int unused11[8]; /* was front/back/depth/rotated offset/pitch */
-+
-+   int unused12; /* logTextureGranularity */
-+   int unused13; /* textureOffset */
-+
-    int irq;
-    int sarea_priv_offset;
- } I830DRIRec, *I830DRIPtr;
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4-r1 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4-r1
deleted file mode 100644
index a2ad3179b915..000000000000
--- a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 56e24a79cccb1d3828de48cb9a7a61b6 xf86-video-i810-1.6.4.tar.bz2 444453
-RMD160 d46554a3384cb51b43f28ec51cb51720677d3050 xf86-video-i810-1.6.4.tar.bz2 444453
-SHA256 0d9fe2a4923df6b1d6ff1b17332ff4c9a5f84d4a376ad4b0fd3223b2dd939351 xf86-video-i810-1.6.4.tar.bz2 444453
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4-r1.ebuild
deleted file mode 100644
index ae4658c28c06..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.6.4-r1.ebuild,v 1.1 2006/08/10 22:27:25 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-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 )"
-
-PATCHES="${FILESDIR}/${PV}-fix_dri_abi.patch"
-
-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
-}