Add a patch from upstream that fixes the DRI ABI. (Bug #143419, Sebastian

Bergmann.  Thanks to Roderick B. Greening for the upstream poking.)
(Portage version: 2.1.1_pre4-r4)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 48 deletions

diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index 1c306043abb5..772d9247e5cf 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,3 +1,7 @@
+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
@@ -15,14 +19,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.ebuild 857 RMD160 b6cec41b70d1f878f8ee19f39ddc243dd14531fe SHA1 cfa6c3dc53971a3d7a9643cd19e7bdbc04934b3e SHA256 53e17cd6c32311931ee4e7979e910c32765824352c17da8af41540f596d77c40
-MD5 71d697bd1fbd18c4f9c8f420439beecb xf86-video-i810-1.6.4.ebuild 857
-RMD160 b6cec41b70d1f878f8ee19f39ddc243dd14531fe xf86-video-i810-1.6.4.ebuild 857
-SHA256 53e17cd6c32311931ee4e7979e910c32765824352c17da8af41540f596d77c40 xf86-video-i810-1.6.4.ebuild 857
-MISC ChangeLog 5138 RMD160 365da404353424739ac0a6e9b61b26147104379e SHA1 8af4dcad46a3b6ef36f4602912109f6e2157212b SHA256 b3d63308cb9df337c2c5515f2a1ecf7020d195942d828a91e48016e12f30f2d9
-MD5 0101033e38a0f9d6ac44694b8e45ee6c ChangeLog 5138
-RMD160 365da404353424739ac0a6e9b61b26147104379e ChangeLog 5138
-SHA256 b3d63308cb9df337c2c5515f2a1ecf7020d195942d828a91e48016e12f30f2d9 ChangeLog 5138
+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
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -36,6 +40,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 524
-RMD160 e9f397b71bc73eff6c4c4f2773912f3b68dbceb1 files/digest-xf86-video-i810-1.6.4 524
-SHA256 520ebabae4d63a168c6b695bef2d86413c3562c42132d975fabf4064d0127849 files/digest-xf86-video-i810-1.6.4 524
+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
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4
deleted file mode 100644
index a2ad3179b915..000000000000
--- a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.4
+++ /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.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4.ebuild
deleted file mode 100644
index b1489baef4ff..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.4.ebuild
+++ /dev/null
@@ -1,31 +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.ebuild,v 1.1 2006/08/10 01:36:29 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 )"
-
-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
-}