Add patch by Robert Pearce to support newer FTDI chips #376117.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 66 insertions, 7 deletions

diff --git a/dev-embedded/ftdi_eeprom/ChangeLog b/dev-embedded/ftdi_eeprom/ChangeLog
index b8cd8db3c052..ae61e707253a 100644
--- a/dev-embedded/ftdi_eeprom/ChangeLog
+++ b/dev-embedded/ftdi_eeprom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/ftdi_eeprom
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ChangeLog,v 1.4 2010/06/22 22:19:02 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ChangeLog,v 1.5 2011/08/20 19:40:21 vapier Exp $
+
+*ftdi_eeprom-0.3-r1 (20 Aug 2011)
+
+  20 Aug 2011; Mike Frysinger <vapier@gentoo.org> +ftdi_eeprom-0.3-r1.ebuild,
+  +files/ftdi_eeprom-0.3-newer-chips.patch:
+  Add patch by Robert Pearce to support newer FTDI chips #376117.
 
 *ftdi_eeprom-0.3 (22 Jun 2010)
 
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
index 1298e5b6e2be..6a26ca9244c1 100644
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ b/dev-embedded/ftdi_eeprom/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ftdi_eeprom-0.3-newer-chips.patch 726 RMD160 7dd21449076f870007e21948a0d0b003c5736354 SHA1 ea85e720c1eb0c85c251b1f86f9c55751c76be29 SHA256 428c88044740effe1a2efb5ea408cf0983e96b6b0422947ef175db9078ac6820
 DIST ftdi_eeprom-0.2.tar.gz 571464 RMD160 1a06ede3638c2943b1b487d38196fff9f678d5b6 SHA1 b7f76804784d94b3f1d42f2ff37eb8e2f40baeff SHA256 b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f
 DIST ftdi_eeprom-0.3.tar.gz 103723 RMD160 035a30feb81e269a66f41acefa9b39fc850d8dd2 SHA1 6d9b99cd60bd0bd64f5ebba03bda16a3d16d13a0 SHA256 7b40ec5abb2c93362b9636974e4e4715cb588121c1e1da09d7f499ac7f12d056
 EBUILD ftdi_eeprom-0.2-r1.ebuild 715 RMD160 4856afa3c3e00d2b1149293ad48597951b6c180d SHA1 5fe33e9b43cebd78e17a501692a178fb75fec46a SHA256 1aa74bee994d71335f0fd48bafd9c921e73f057a697af8e69f412e42b7eddcf7
 EBUILD ftdi_eeprom-0.2.ebuild 593 RMD160 fb4780139beb7e10ea03660791b160848c482f62 SHA1 312880604965778f54f52142bddae8e5127f9385 SHA256 ccf9d38753cb651f0f5dd092c2691f9c89e879144a39b7a0d1aacc2107147c8a
+EBUILD ftdi_eeprom-0.3-r1.ebuild 746 RMD160 4471040d4eda4f97b719bbd0a15689400a157052 SHA1 41458597c4585f4b13bcd2737ac1f804a0d51726 SHA256 728caf4a1ac1e43580fccfdf78468574d82e5d13f0be6d0a999b3e207195d3e3
 EBUILD ftdi_eeprom-0.3.ebuild 645 RMD160 f0b08ba982a96ef9db9828ee191a6ea7fc9a8586 SHA1 8292cb1cb03c63feca006046728c3b457f6ac5d8 SHA256 0ac953c880883dda4a7a6b1a6dbcb349fdb2d85f8e94a8a2d7aab3317281b253
-MISC ChangeLog 890 RMD160 8d5fbbc46e21223b50cb4e17f0507407856a5c83 SHA1 8c30084f0ce743b0c850700b8b43376273425dea SHA256 ad90739f517904c6b8cb5db5aacd6537452e128bdba170c02eaa0ee31b690025
+MISC ChangeLog 1114 RMD160 fe3735f4598f28ce75a82e54dfa55b2acfd223c0 SHA1 61c00970971d3daade999ad833416c90d43f34a7 SHA256 684cad46bd19550f846ba16f7825b9f5398a92b556b7bb8ffc37dbcb1ac7406a
 MISC metadata.xml 275 RMD160 177241993faa62ef38a66f95467b4797dd4f8f4f SHA1 841d996f1620ac2a180c7e396c952de646d0e323 SHA256 776932125fa5904b7904dac867342c0b6133168555fd041e691f0e2598849697
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkwhNs4ACgkQTwhj9JtAlp6lSgEAlF23swoegWGVRO4zadMKAbzL
-DwjzS8R7jguUveKE9AMA/iIwvBYOGi7SynUUArotdMVeSQ1spKkpiGyu4Z3MY0wX
-=5S23
+iF4EAREIAAYFAk5QDasACgkQaC/OocHi7JZmiwD+OYn1ylFwrKvnHn7MEYl6/Zht
+myPGBG68Azrye24eZL4BAJ8wFEUFgfIUeG64cEedV0ghOzmWsHw1ZJYkkbTFwyg6
+=p4HH
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
new file mode 100644
index 000000000000..7a678cd4bce2
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
@@ -0,0 +1,23 @@
+latest upstream vcs tree supports this stuff in a diff way
+
+https://bugs.gentoo.org/376117
+
+patch by Robert Pearce
+
+--- ftdi_eeprom-0.2/src/main.c
++++ ftdi_eeprom-0.2/src/main.c
+@@ -131,9 +131,13 @@
+ 	
+ 	if (i != 0) {
+ 	    printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
+-	    printf("Retrying with default FTDI id.\n");
++	    printf("Retrying with default FTDI ids.\n");
+ 
+     	    i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
++	    if (i != 0)
++    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
++	    if (i != 0)
++    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6011);
+ 	    if (i != 0) {
+ 		printf("Sorry, unable to find FTDI USB chip\n");
+ 		exit (-1);
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
new file mode 100644
index 000000000000..d98e7253ee31
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild,v 1.1 2011/08/20 19:40:21 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
+HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
+SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-embedded/libftdi
+	dev-libs/confuse"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README src/example.conf
+}