adding a patch to support the i915 chipset

Package-Manager: portage-2.1.2_pre1

5 files changed, 133 insertions, 6 deletions

diff --git a/x11-misc/i855crt/ChangeLog b/x11-misc/i855crt/ChangeLog
index 31dd6217c75e..094b2551d7c3 100644
--- a/x11-misc/i855crt/ChangeLog
+++ b/x11-misc/i855crt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/i855crt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.5 2006/08/06 10:39:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/ChangeLog,v 1.6 2006/09/20 14:56:14 blubb Exp $
+
+*i855crt-0.4-r1 (20 Sep 2006)
+
+  20 Sep 2006; <blubb@gentoo.org> +files/i855crt-i915support.diff,
+  +i855crt-0.4-r1.ebuild:
+  adding a patch to support the i915 chipset
 
   06 Aug 2006; Simon Stelling <blubb@gentoo.org> i855crt-0.4.ebuild:
   re-adding explicit RDEPEND
diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
index 18a27e247890..6574d7d4b441 100644
--- a/x11-misc/i855crt/Manifest
+++ b/x11-misc/i855crt/Manifest
@@ -1,12 +1,20 @@
-DIST i855crt-0.4.tar.gz 65209 RMD160 6aa715257ff120420a32bbc2ae7165f3266fc9e0 SHA256 942fb0cde89737e921837d5ecab2a49158b04a5389205728cfa49108ee0bc269
+AUX i855crt-i915support.diff 2527 RMD160 2c8acead805b39daafbafba722c24e80343b6802 SHA1 5dc9e4108c6bc7823eec6329f4730b651403f76b SHA256 b33ad441352d078e6d507aa9d68b968a2e2ae3a034fb558d1bcec9168ba0f846
+MD5 790695997da8523dd0f9c7b30b43a2e7 files/i855crt-i915support.diff 2527
+RMD160 2c8acead805b39daafbafba722c24e80343b6802 files/i855crt-i915support.diff 2527
+SHA256 b33ad441352d078e6d507aa9d68b968a2e2ae3a034fb558d1bcec9168ba0f846 files/i855crt-i915support.diff 2527
+DIST i855crt-0.4.tar.gz 65209 RMD160 6aa715257ff120420a32bbc2ae7165f3266fc9e0 SHA1 d0a88ae3b0ecffcb47396c937893bcd1314ec184 SHA256 942fb0cde89737e921837d5ecab2a49158b04a5389205728cfa49108ee0bc269
+EBUILD i855crt-0.4-r1.ebuild 797 RMD160 1d845495a705740d35edcc7935787a1e9a7c4a5c SHA1 9e4c410f9aefbe48d24273b7b25fd3fe4a063420 SHA256 aa827e2114ed93161323f110930865469cfc85f2a41948f8cc296ee95f633fc6
+MD5 82005522c9fd5f79942936ec523d139c i855crt-0.4-r1.ebuild 797
+RMD160 1d845495a705740d35edcc7935787a1e9a7c4a5c i855crt-0.4-r1.ebuild 797
+SHA256 aa827e2114ed93161323f110930865469cfc85f2a41948f8cc296ee95f633fc6 i855crt-0.4-r1.ebuild 797
 EBUILD i855crt-0.4.ebuild 734 RMD160 569a2cf2c34ca5e8b7336c1d8b1504cbcb70cbd6 SHA1 5c66e6ca56b68e273dfb3fa60d6e51ebac658a27 SHA256 38efe557c1b340f5a45a705d3f33e97122275daf2b50c28ad7ec0a23e503360c
 MD5 f08a53d6c1942a665bc3095b5c383ca3 i855crt-0.4.ebuild 734
 RMD160 569a2cf2c34ca5e8b7336c1d8b1504cbcb70cbd6 i855crt-0.4.ebuild 734
 SHA256 38efe557c1b340f5a45a705d3f33e97122275daf2b50c28ad7ec0a23e503360c i855crt-0.4.ebuild 734
-MISC ChangeLog 699 RMD160 97fd3de0dc89d6da77f33bce3626ea501c83e70d SHA1 85d55487f79124bf4afb94042da470824dd5d97a SHA256 d66f369ac4ea45ad668b475a28a2a44f5380c619b08c72616ff778f81041cd6d
-MD5 498163881d3776dcc2be4c8da5a7574f ChangeLog 699
-RMD160 97fd3de0dc89d6da77f33bce3626ea501c83e70d ChangeLog 699
-SHA256 d66f369ac4ea45ad668b475a28a2a44f5380c619b08c72616ff778f81041cd6d ChangeLog 699
+MISC ChangeLog 869 RMD160 abc5b882a42b8b9e709b5b78835a1f0c181c91ba SHA1 ef12f55259f18af18758050f626079a86a8589c0 SHA256 5ee7218468ea2ded62d45cf88f61b10139ff0187cb2eca4708a8f67106cd74b3
+MD5 0acea78b432f14e178d90588f4c62f4a ChangeLog 869
+RMD160 abc5b882a42b8b9e709b5b78835a1f0c181c91ba ChangeLog 869
+SHA256 5ee7218468ea2ded62d45cf88f61b10139ff0187cb2eca4708a8f67106cd74b3 ChangeLog 869
 MISC metadata.xml 421 RMD160 1978b5ece0a42284e76d28ef64f559bea9edb8f1 SHA1 87ad89f131a2df27c5682216972fdff6c205fef4 SHA256 113e6da46df9ada22e9ec36e9b769491714ef0b44428deba8d4d9eeb153e09ea
 MD5 6602fa08d501cbf78e1d46d30078e723 metadata.xml 421
 RMD160 1978b5ece0a42284e76d28ef64f559bea9edb8f1 metadata.xml 421
@@ -14,3 +22,6 @@ SHA256 113e6da46df9ada22e9ec36e9b769491714ef0b44428deba8d4d9eeb153e09ea metadata
 MD5 645a84a1d5aab78f4719dc1df40e7028 files/digest-i855crt-0.4 232
 RMD160 c6d549fef9f20e37cbb4a6c5bbfa54958ac9afe9 files/digest-i855crt-0.4 232
 SHA256 ad746be71344a1a05655707e743761e8618a5b4c1b8ca91c5d372008e058265e files/digest-i855crt-0.4 232
+MD5 645a84a1d5aab78f4719dc1df40e7028 files/digest-i855crt-0.4-r1 232
+RMD160 c6d549fef9f20e37cbb4a6c5bbfa54958ac9afe9 files/digest-i855crt-0.4-r1 232
+SHA256 ad746be71344a1a05655707e743761e8618a5b4c1b8ca91c5d372008e058265e files/digest-i855crt-0.4-r1 232
diff --git a/x11-misc/i855crt/files/digest-i855crt-0.4-r1 b/x11-misc/i855crt/files/digest-i855crt-0.4-r1
new file mode 100644
index 000000000000..f43aa2bee495
--- /dev/null
+++ b/x11-misc/i855crt/files/digest-i855crt-0.4-r1
@@ -0,0 +1,3 @@
+MD5 6522fa9b261be53c366ba153876fcc83 i855crt-0.4.tar.gz 65209
+RMD160 6aa715257ff120420a32bbc2ae7165f3266fc9e0 i855crt-0.4.tar.gz 65209
+SHA256 942fb0cde89737e921837d5ecab2a49158b04a5389205728cfa49108ee0bc269 i855crt-0.4.tar.gz 65209
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
new file mode 100644
index 000000000000..83c9c38dd19a
--- /dev/null
+++ b/x11-misc/i855crt/files/i855crt-i915support.diff
@@ -0,0 +1,73 @@
+diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c
+--- ../i855-crt-0.4/dumpreg.c	2004-05-01 17:50:45.000000000 +0100
++++ ./dumpreg.c	2005-05-31 15:18:12.927156400 +0100
+@@ -36,10 +36,11 @@
+ 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
+-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
++		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
+-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
++		(p = strstr(*buff_ptr, I865STR)) != NULL ||
++		(p = strstr(*buff_ptr, I915STR)) != NULL ;
+ 	
+ 		if(i)
+ 		{
+@@ -89,7 +90,7 @@
+ 	chip = i810_chip(&buff, &len, pci_f);
+ 	if (chip == NULL) 
+ 	{
+-		fprintf(stderr, "No know videocard has been found.\n");
++		fprintf(stderr, "No known videocard has been found.\n");
+ 		exit(1);
+ 	}
+ 	pclose(pci_f);
+diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c
+--- ../i855-crt-0.4/i855crt.c	2004-05-08 13:27:20.000000000 +0100
++++ ./i855crt.c	2005-05-31 15:17:57.100562408 +0100
+@@ -254,14 +254,15 @@
+ 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
+ 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
+-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
++		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
+ 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
+-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
++		(p = strstr(*buff_ptr, I865STR)) != NULL ||
++		(p = strstr(*buff_ptr, I915STR)) != NULL ;
+ 	
+ 		if(i)
+ 		{
+-			fprintf(stderr,"This driver is untested with your videocard !\n");  
++			fprintf(stderr,"This driver is untested with your video card !\n");  
+ 			return p;
+ 		}
+ 		
+@@ -493,7 +494,7 @@
+ 	chip = i810_chip(&buff, &len, pci_f);
+ 	if (chip == NULL) 
+ 	{
+-		fprintf(stderr, "No know videocard has been found.\n");
++		fprintf(stderr, "No known videocard has been found.\n");
+ 		exit(1);
+ 	}
+ 	pclose(pci_f);
+diff -ur ../i855-crt-0.4/i855crt.h ./i855crt.h
+--- ../i855-crt-0.4/i855crt.h	2004-05-01 17:06:28.000000000 +0100
++++ ./i855crt.h	2005-05-31 15:07:53.232364328 +0100
+@@ -1,3 +1,4 @@
++
+ /* 
+ * This is part of the source for i855crt driver
+ * copyright(c) Merello Andrea 2004
+@@ -45,6 +46,7 @@
+ #define I845STR			"8086:2562"
+ #define I855STR			"8086:3582"
+ #define I865STR			"8086:2572"
++#define I915STR			"8086:2592"
+ #define MEMSTR			"Memory at"
+ #define NONPRSTR		"32-bit, non-prefetchable"
+ 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
new file mode 100644
index 000000000000..549e64d6a0b3
--- /dev/null
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.1 2006/09/20 14:56:14 blubb Exp $
+
+inherit eutils
+
+DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
+HOMEPAGE="http://i855crt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXext
+		x11-libs/libXv"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-i915support.diff || die "failed to apply patch"
+
+	# upstream ships it with the binary, we want to make sure we compile it
+	make clean || die "make clean failed"
+}
+
+src_install() {
+	dobin i855crt
+	insinto /etc
+	doins i855crt.conf
+}