Fix some X lockups with the new tdfx driver. (Bug #136123, Rick Sheppard,

thanks to Sok Ann Yap for finding the patch.)
(Portage version: 2.1.1_pre1)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 57 deletions

diff --git a/x11-drivers/xf86-video-tdfx/Manifest b/x11-drivers/xf86-video-tdfx/Manifest
index 9816ee1ab8b4..ac1e0f3015f8 100644
--- a/x11-drivers/xf86-video-tdfx/Manifest
+++ b/x11-drivers/xf86-video-tdfx/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tdfx_getsecs.patch 1236 RMD160 744c328f83aca6b5ab1ce84a374601c10cea29c9 SHA1 b808925beef5b120718029a22eee5c88ea4045cd SHA256 20a7b2dd75a6c992106a35ed76f275b7029b950a09ef49fda122ef72e1c65875
+MD5 5d53223c18a4881f8256ff1835a29b9d files/tdfx_getsecs.patch 1236
+RMD160 744c328f83aca6b5ab1ce84a374601c10cea29c9 files/tdfx_getsecs.patch 1236
+SHA256 20a7b2dd75a6c992106a35ed76f275b7029b950a09ef49fda122ef72e1c65875 files/tdfx_getsecs.patch 1236
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST xf86-video-tdfx-1.1.1.3.tar.bz2 261241 RMD160 6bf5166262f91815eb3c591352d82c094342a6b5 SHA1 dad2f158742cfa8f146ea4387632d69d80ceec26 SHA256 f67b69132a99714cafbe4728ce0f6292ca326113fa5880c206a6cecd0f53e744
 DIST xf86-video-tdfx-1.2.1.tar.bz2 269783 RMD160 9d86f47b1eb5b921122a8c13d6e0335098fced3f SHA1 af7917ab7435c0aebfeea958a50c3120b7e2e6e0 SHA256 c237565a1703bdf01fa9208bf51439d2f36e9c586a5bf3f51ae0a39e8bf3959b
@@ -8,14 +9,14 @@ EBUILD xf86-video-tdfx-1.1.1.3.ebuild 854 RMD160 8c315be27fd5ed016001bc992bf9a39
 MD5 fc7603dd3fdc4436be81475b5af9050c xf86-video-tdfx-1.1.1.3.ebuild 854
 RMD160 8c315be27fd5ed016001bc992bf9a39e1a2ee7a2 xf86-video-tdfx-1.1.1.3.ebuild 854
 SHA256 6fdafc6d91663dc00db32c96c927ab4eb2a74a387f4799caf17dc2f6ceb75f76 xf86-video-tdfx-1.1.1.3.ebuild 854
-EBUILD xf86-video-tdfx-1.2.1.ebuild 861 RMD160 852eebab423e425622c05499545daa0b7c32a5db SHA1 56586865b20fd40bd491a829145f66d177e2d5a3 SHA256 8de85c4a3ae5a2c3e28c79c81fa025a97b3b035150628dc8884da1f0ace23f5d
-MD5 cd5e3ca91c60fdb94875d30e927f0431 xf86-video-tdfx-1.2.1.ebuild 861
-RMD160 852eebab423e425622c05499545daa0b7c32a5db xf86-video-tdfx-1.2.1.ebuild 861
-SHA256 8de85c4a3ae5a2c3e28c79c81fa025a97b3b035150628dc8884da1f0ace23f5d xf86-video-tdfx-1.2.1.ebuild 861
-MISC ChangeLog 2821 RMD160 84d3d38d490a188e5c93a3180daccc2f1af28721 SHA1 dfb173bfbc8afd050390d690e886a00d4560b68c SHA256 d5aacb6b263f7b1e6155e2d736fa9183783e2aa477490e839c5236ce68af4253
-MD5 2d93cb038457d6610abb0266eeed6c5c ChangeLog 2821
-RMD160 84d3d38d490a188e5c93a3180daccc2f1af28721 ChangeLog 2821
-SHA256 d5aacb6b263f7b1e6155e2d736fa9183783e2aa477490e839c5236ce68af4253 ChangeLog 2821
+EBUILD xf86-video-tdfx-1.2.1-r1.ebuild 909 RMD160 e618d32e66c3a6403516178789428e8460a390d2 SHA1 a1d22286b1a28f851123077ac1b4c3cbacabce8c SHA256 033e86f4444e8fcab58451953892ff2f499abed1ddc926b4578461cf7cd58f2b
+MD5 757e0ed9390760d6421c70e6dc2ef588 xf86-video-tdfx-1.2.1-r1.ebuild 909
+RMD160 e618d32e66c3a6403516178789428e8460a390d2 xf86-video-tdfx-1.2.1-r1.ebuild 909
+SHA256 033e86f4444e8fcab58451953892ff2f499abed1ddc926b4578461cf7cd58f2b xf86-video-tdfx-1.2.1-r1.ebuild 909
+MISC ChangeLog 3145 RMD160 844262ea7d1f2ec6933945db20ad77cf58c7d453 SHA1 c21961449557b7ad73031acaf851e86c055afd44 SHA256 35e96bfdf4c544ac10a2a8535379c9ae590b30ad0c57660dc2546d6ca005ff17
+MD5 75d2fa3a0ca916be397dca4998053d4e ChangeLog 3145
+RMD160 844262ea7d1f2ec6933945db20ad77cf58c7d453 ChangeLog 3145
+SHA256 35e96bfdf4c544ac10a2a8535379c9ae590b30ad0c57660dc2546d6ca005ff17 ChangeLog 3145
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -23,13 +24,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 557bace643d2caf014e95bc38777d38a files/digest-xf86-video-tdfx-1.1.1.3 530
 RMD160 67ccf4509756954eba86667efc7fdc0e57d9c37f files/digest-xf86-video-tdfx-1.1.1.3 530
 SHA256 f9190fc89c0cd9ae00255ba1a9dec4111e6a7417dc2ee2da30f403456a542602 files/digest-xf86-video-tdfx-1.1.1.3 530
-MD5 843eae396e4a7dd72653f1085e6a2537 files/digest-xf86-video-tdfx-1.2.1 524
-RMD160 a0cb159a46b963feca78a5e4d21cf5e8c00093f9 files/digest-xf86-video-tdfx-1.2.1 524
-SHA256 c3f7dc28d8f76b3234b4112a74d97200220061a3caf71159022f84194d4ca80e files/digest-xf86-video-tdfx-1.2.1 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhKI+AiZjviIA2XgRAvhPAJ9OiWV1eiQbu2EnC/wnPrBIdqHyzQCg8DBN
-XSdKQl4bfEM3je+5OU+sOpU=
-=6L7v
------END PGP SIGNATURE-----
+MD5 843eae396e4a7dd72653f1085e6a2537 files/digest-xf86-video-tdfx-1.2.1-r1 524
+RMD160 a0cb159a46b963feca78a5e4d21cf5e8c00093f9 files/digest-xf86-video-tdfx-1.2.1-r1 524
+SHA256 c3f7dc28d8f76b3234b4112a74d97200220061a3caf71159022f84194d4ca80e files/digest-xf86-video-tdfx-1.2.1-r1 524
diff --git a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1 b/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1
deleted file mode 100644
index 29706ac2b605..000000000000
--- a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1
+++ /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 7513cf373d4ddbbf93651d9ae29ac7f3 xf86-video-tdfx-1.2.1.tar.bz2 269783
-RMD160 9d86f47b1eb5b921122a8c13d6e0335098fced3f xf86-video-tdfx-1.2.1.tar.bz2 269783
-SHA256 c237565a1703bdf01fa9208bf51439d2f36e9c586a5bf3f51ae0a39e8bf3959b xf86-video-tdfx-1.2.1.tar.bz2 269783
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1.ebuild
deleted file mode 100644
index 1e7cdc7a328e..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +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-tdfx/xf86-video-tdfx-1.2.1.ebuild,v 1.2 2006/06/05 21:29:27 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for tdfx cards"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-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
-}