Add patch contributed by David Krapohl <david.krapohl@gmail.com> to add support for Intel 965GM (bug #186661). Clean out older version.

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.24-gentoo-r4 x86_64

4 files changed, 85 insertions, 8 deletions

diff --git a/sys-apps/915resolution/915resolution-0.5.3.ebuild b/sys-apps/915resolution/915resolution-0.5.3-r2.ebuild
index 62bf392f209e..f08d5069814d 100644
--- a/sys-apps/915resolution/915resolution-0.5.3.ebuild
+++ b/sys-apps/915resolution/915resolution-0.5.3-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/915resolution/915resolution-0.5.3.ebuild,v 1.1 2007/04/17 16:36:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/915resolution/915resolution-0.5.3-r2.ebuild,v 1.1 2008/07/29 20:33:49 chutzpah Exp $
+
+inherit eutils flag-o-matic
 
 DESCRIPTION="Utility to patch VBIOS of Intel 855 / 865 / 915 chipsets"
 HOMEPAGE="http://www.geocities.com/stomljen/"
@@ -8,13 +10,24 @@ SRC_URI="http://www.geocities.com/stomljen/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-freebsd.patch"
+
+	# add support for 965GM (bug #186661)
+	epatch "${FILESDIR}/${P}-965GM.patch"
+}
+
 src_compile() {
+	filter-flags -O -O1 -O2 -O3 -Os
 	emake clean
 	emake CFLAGS="${CFLAGS}" || die "Compiliation failed."
 }
@@ -22,7 +35,7 @@ src_compile() {
 src_install() {
 	dosbin ${PN}
 	newconfd "${FILESDIR}/confd" ${PN}
-	newinitd "${FILESDIR}/initd" ${PN}
+	newinitd "${FILESDIR}/initd-r1" ${PN}
 	dodoc README.txt changes.log chipset_info.txt dump_bios
 }
 
diff --git a/sys-apps/915resolution/ChangeLog b/sys-apps/915resolution/ChangeLog
index 8f11329557e1..a64df8466bf6 100644
--- a/sys-apps/915resolution/ChangeLog
+++ b/sys-apps/915resolution/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/915resolution
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/915resolution/ChangeLog,v 1.12 2007/06/21 19:43:14 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/915resolution/ChangeLog,v 1.13 2008/07/29 20:33:49 chutzpah Exp $
+
+*915resolution-0.5.3-r2 (29 Jul 2008)
+
+  29 Jul 2008; Patrick McLean <chutz@gentoo.org>
+  +files/915resolution-0.5.3-965GM.patch, -915resolution-0.5.3.ebuild,
+  +915resolution-0.5.3-r2.ebuild:
+  Add patch contributed by David Krapohl <david.krapohl@gmail.com> to add
+  support for Intel 965GM (bug #186661). Clean out older version.
 
   21 Jun 2007; Christoph Mende <angelos@gentoo.org>
   915resolution-0.5.3-r1.ebuild:
diff --git a/sys-apps/915resolution/Manifest b/sys-apps/915resolution/Manifest
index 73d3ec1ce6d4..89d829130925 100644
--- a/sys-apps/915resolution/Manifest
+++ b/sys-apps/915resolution/Manifest
@@ -1,9 +1,10 @@
+AUX 915resolution-0.5.3-965GM.patch 1542 RMD160 e0de5621a760bd2678bcac5fea60f230d68c946d SHA1 852c9746281e30a2bf401c30b23f43a70022501c SHA256 843de9d58572b27414c66bd1c3ce1d61f4d56da11f16064a55f35f9976768c81
 AUX 915resolution-0.5.3-freebsd.patch 2279 RMD160 3d9ea969c18041c881142f41741d1446a6b8bb8c SHA1 5ac9e2f01aa13470d935217bf5183b6a25e499ca SHA256 7a9ba1e0bdc123ea5dc661633dd7b660be9b35be7cae087b991fcf68ad90bb15
 AUX confd 633 RMD160 5518de5337843b8b69e853a9641a1ae6494a0cb7 SHA1 2ba05cdf7dcff3ad3f46f44ec73fb792e6630569 SHA256 932b9c2c0f3bec0aff627afe43efb81d1e28906b0d2028e1ec65633d668b9124
 AUX initd 960 RMD160 d8ea8b2e94d33a65f9cdf39cf3b439d17039c310 SHA1 f41fd2056d12f55ed864b0a4770fc61f445ac4d3 SHA256 54833d3dfb7cf8f5342fbd8cb0c288d7a6c5ace577524f398e23bb5d392ecc62
 AUX initd-r1 1337 RMD160 4e35a384345b530b359e79f0849795774f324223 SHA1 4f333d0e5689b5f506c3f2b750dc158b4ca2dae6 SHA256 e0add05fe60f21013c9f618b432b1de8f08910e57be69a33649b2886d324ff1e
 DIST 915resolution-0.5.3.tar.gz 22583 RMD160 a406c6810bbfcf94c5352ea1b1e9178af4078589 SHA1 377a32d33f1987adf372341c8c6664d5673da9b8 SHA256 b64cab834b5e410bca555dc9db8e69f62f6f02496942f35ff4a68f3f27f1b542
 EBUILD 915resolution-0.5.3-r1.ebuild 1338 RMD160 bba937c8b714b1213960df6b1e7f3332319722ba SHA1 0c8193fef4e61f708910c4edc16a77208b24e351 SHA256 8afb7990ee8acf33cb452b27df9358be8935f29892b88dd17b9f5117fc3fe8f8
-EBUILD 915resolution-0.5.3.ebuild 1176 RMD160 92d51ce08889baf5c243d2ac90bf18d1d22fa675 SHA1 0391ae39bb0a496dbcf5887be4b3ca90006b51e3 SHA256 0d6a4d04289bdac1c5e231fdf4037493053dc1e3deea9bdd6a22bb19b825b245
-MISC ChangeLog 2299 RMD160 047afb8cefb5ec551759da125068926d62dda092 SHA1 b5dacc67589592713da25432b12b4484c0ba4ad1 SHA256 70e7f48d73eb31e8494ff07a2bcef0adcdecd78e4583dac147b580b4e4d7c8d4
+EBUILD 915resolution-0.5.3-r2.ebuild 1418 RMD160 63353b84bee1c2414af81d6714c70939f5521762 SHA1 6a13ccb12cb429fc10c00d32f3a3ca9b5b45567c SHA256 1ea62aa3f2590acc269cc132ec1805053e175cdd0b40320aee206ca8924c8141
+MISC ChangeLog 2634 RMD160 3ead9fcc85b333c94c39c4a7cf02f0df75ae93d7 SHA1 8a7bf9d720261845c5bdc90b6664ed7556a0a9a4 SHA256 c272e5171d35dd922331a6322f05cb91b6eaecccf98bb6bf0e4b78a8101b5fdc
 MISC metadata.xml 880 RMD160 4d30d36ae8e839d3dd3aba4786956efc020b1f13 SHA1 8573ae1d386db341f1156811aaab368405719a07 SHA256 7c026fc1fdcc9e7357126f7b7c012c5ec9b57586997a1028f9ec04bf8c3b7562
diff --git a/sys-apps/915resolution/files/915resolution-0.5.3-965GM.patch b/sys-apps/915resolution/files/915resolution-0.5.3-965GM.patch
new file mode 100644
index 000000000000..5e25ea652797
--- /dev/null
+++ b/sys-apps/915resolution/files/915resolution-0.5.3-965GM.patch
@@ -0,0 +1,55 @@
+diff -Nru 915resolution-0.5.3/915resolution.c_orig 915resolution-0.5.3/915resolution.c
+--- 915resolution-0.5.3/915resolution.c_orig	2007-04-15 12:46:56.000000000 +0200
++++ 915-resolution-0.5.3/915resolution.c	2007-07-15 21:21:05.000000000 +0200
+@@ -56,12 +56,12 @@
+ 
+ typedef enum {
+     CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM,
+-    CT_946GZ, CT_G965, CT_Q965
++    CT_946GZ, CT_G965, CT_Q965, CT_965GM
+ } chipset_type;
+ 
+ char * chipset_type_names[] = {
+     "UNKNOWN", "830",  "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM",
+-    "946GZ",   "G965", "Q965"
++    "946GZ",   "G965", "Q965", "965GM"
+ };
+ 
+ typedef enum {
+@@ -225,6 +225,10 @@
+         type = CT_Q965;
+         break;
+ 
++    case 0x2a008086:
++    	type = CT_965GM;
++	break;
++
+     default:
+         type = CT_UNKWN;
+         break;
+@@ -511,6 +515,7 @@
+     case CT_946GZ:
+     case CT_G965:
+     case CT_Q965:
++    case CT_965GM:
+         outl(0x80000090, 0xcf8);
+         map->b1 = inb(0xcfd);
+         map->b2 = inb(0xcfe);
+@@ -551,6 +556,7 @@
+     case CT_946GZ:
+     case CT_G965:
+     case CT_Q965:
++    case CT_965GM:
+         outl(0x80000090, 0xcf8);
+         outb(map->b1, 0xcfd);
+         outb(map->b2, 0xcfe);
+@@ -809,6 +815,9 @@
+         else if (!strcmp(argv[index], "G965")) {
+             *forced_chipset = CT_G965;
+         }
++	else if (!strcmp(argv[index], "965GM")) {
++	    *forced_chipset = CT_965GM;
++	}
+         else if (!strcmp(argv[index], "Q965")) {
+             *forced_chipset = CT_Q965;
+         }