Tweak libusb-1 patch to fix runtime misbehavior.

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

5 files changed, 37 insertions, 55 deletions

diff --git a/dev-embedded/smdk-dltool/ChangeLog b/dev-embedded/smdk-dltool/ChangeLog
index db27c9a4d690..047b699e5bd2 100644
--- a/dev-embedded/smdk-dltool/ChangeLog
+++ b/dev-embedded/smdk-dltool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/smdk-dltool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.4 2012/01/31 16:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/ChangeLog,v 1.5 2012/02/09 17:15:11 vapier Exp $
+
+*smdk-dltool-0.20-r2 (09 Feb 2012)
+
+  09 Feb 2012; Mike Frysinger <vapier@gentoo.org> -smdk-dltool-0.20.ebuild,
+  -smdk-dltool-0.20-r1.ebuild, +smdk-dltool-0.20-r2.ebuild,
+  files/smdk-dltool-0.20-libusb-1.0.patch:
+  Tweak libusb-1 patch to fix runtime misbehavior.
 
   31 Jan 2012; Mike Frysinger <vapier@gentoo.org> smdk-dltool-0.20-r1.ebuild:
   Drop debug code that shouldn't have been committed.
diff --git a/dev-embedded/smdk-dltool/Manifest b/dev-embedded/smdk-dltool/Manifest
index 18ebf1fe1789..675e4a3d71dc 100644
--- a/dev-embedded/smdk-dltool/Manifest
+++ b/dev-embedded/smdk-dltool/Manifest
@@ -3,26 +3,25 @@ Hash: SHA1
 
 AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2057 RMD160 aa21b1b5f6a11605609c88672a780b553d42111d SHA1 fdae238df63cce443bb4e1b1d85b9411506b5924 SHA256 46515ec624570fc9d04d136fb7fc8a4a53cbbdadade7a3c9695e6458aeda2e83
 AUX smdk-dltool-0.20-build.patch 430 RMD160 ea311960c9edd7d50d4e77077aabd176b7bf8cf6 SHA1 d0b56669e100ca0b793b28700ca72ddf6aab2813 SHA256 81e2059d8d6cf5a46b22c2691e122636756f3ef7bb2fb09e7ba23616643190b5
-AUX smdk-dltool-0.20-libusb-1.0.patch 7949 RMD160 7ac266794040ee8fb108eab6d7a0d599bbe5c601 SHA1 789f616e8e62aae5d51f9ae23f2e841adebb0034 SHA256 b06f72426e15c6d3b14c127e55621c2fb87512b34a2f990bd5022037a81eb124
+AUX smdk-dltool-0.20-libusb-1.0.patch 8156 RMD160 5b27c878c0141160575e418e3e01ed716b014162 SHA1 afcfb8c562d4aa73099c3cd9b6b8859ac8b5ea4a SHA256 1e3bf0b44b8d78874e8d3c3cc22f022776cd3136c2f72e47e24c207819bc8114
 DIST smdk-tools-v0.20.tar.gz 5170 RMD160 ba61a3a7727a826cafceb8330310f36d64147f6b SHA1 c598c8eae03afcdfc508c09808f6548ad6934f56 SHA256 fdda1a8ddb8b71a7a74e8efc85bd08ba8cb953a61eb610b846cf291436426e48
-EBUILD smdk-dltool-0.20-r1.ebuild 920 RMD160 7e4c935625906cd8ff90d2ca3047b86972f4efff SHA1 ce4cbb530ec58e08af5a2b051b6686c77a5a13df SHA256 30b05e495c464f5e488b461ba577a8627d2788bf09968f0e3c030e09d3e357ac
-EBUILD smdk-dltool-0.20.ebuild 862 RMD160 d5b8bf62cd9103e607fa39b33238d1ee4c96489d SHA1 180b8878016cf6952a0d99cb0d2aff10761baada SHA256 3e36f3ead3abed42130c713f55d6293d34e49381c342fb7bc61f53ec35721366
-MISC ChangeLog 924 RMD160 8e1a0ef35b3bdbbf62b19ecce2cbff569864b538 SHA1 b65c35e6c39ad27dec5ceca0fd7528fdaa947d31 SHA256 08e43906837f42f0b05b6580550a0cfd8ace061151f2c61e897332cba3f0a901
+EBUILD smdk-dltool-0.20-r2.ebuild 920 RMD160 7ae3e3206cb93e79e6215e58fd392925b32cf101 SHA1 af4a994e61d68473946959d842e0c89b28267e03 SHA256 6e8e6cdb1cb24f8c695621ec5200409247810de24e412c1dc38afd5e5eb3733f
+MISC ChangeLog 1191 RMD160 802c3f4645a5d253681892aec623a1963413394c SHA1 8cdec115c0ffcd08e19fd9d69a4587fb6a86d900 SHA256 4771f375531c7314e2467188c16e99d25b02b3bd6eebe1335108eec5b88b8407
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPKBNRAAoJELEHsLL7fEFW7tgP/iAXm2oRqnTziN1nbhItNwYs
-S7uDS2ycOuCueHaAxYKmYtqTEy+HDkuHxnZfu25DJozD5pT/JPvIb70/eoH90MWV
-nxgqp3AUGkTNgygJuWGBR8ilJMT7NYb63pOBl1VsBP9D4dxH6pEgKBzesXQ8dk5t
-kBUExyhuPiT8bza4oUsHANXK4mIx2O7k0+lbiIw84KJ+zbsH0d4k/NFX+gCTpLT7
-SunTPbcYzlEIpwgWsJjQOiDchNb3hPLkFMlTUxjoehGg0npuEwSvclnXrBnMDn6o
-aR/C301/d0vvDE4EEY5kyeMPkp5IpFW+1VGxv5GkDyPO1OYGY62K7ieZUdxanIFp
-4QEpnvT5WSXDvDPwb8Ley/yjQmNqYRCp83O7RBIONG9FvaWY6/gKCxXjZYTMlMYF
-uT3uq61/HuKNOLgnRQLVosm5sgoP6pspW5SQRLddS01QotGS2jxaHrGUUgFKBYoo
-omFcoBAimjFOtJXNJGab8zKpJbHm5tv7KtHf5R53E5dU73SARzCMpOyvniMMxcbM
-/XGoVFYJYAqLlVJYdUcvNUp4nqdZcfh58UByzhqVOdZTGS9beURaNdxtdOVX4Wu6
-lLvY3bPnwXUTJ0OcOV4QM/K2gVI3s90qDhsvCFVWJCiuijkC6XIK/hegrNlsDLYU
-QwJ9xbhh4jfnMrHalVuE
-=65tK
+iQIcBAEBAgAGBQJPM/8mAAoJELEHsLL7fEFW9R8P/jIboUR++Zz5/5D9O/cKubZV
+YFRDqpi0r7xuOsppR/UaxIC7hcUEzusizekPfIKvNnYC+C60QN/I30D7b+P+5mEa
+7u6U9DkWa0ULjurZhp6ym9NWiuU9XQizg2CcYzuXaHEwyn4omsT2F6dij90Pxm8R
+cGE+Uq36cn0Z6U+OHt7EkOWebL26tg6a39OmfzThQQCJypv7VzHnk4ml0wHtsbgd
+zOi9Ddh90x5pzpK4qIqg8FAAg5BuOWRN+tyRHIKPDp1GSEcIfyZviGwPUSOH3mtZ
+hhAS7Lau5RCWK8LqciAbTn9W4Uwqc2aTNO+XTX2wCLpP3D3G6QYTicMf2UtN1VL9
+Kw378i4Ng5g05PZkvVlkKGMdoo8goVqNMwI69qBqfH0llA93Fq3trtwCenGHPJCI
+N4Z9vJAIeaoGvDuAL45sdDU4DOXT6U8UDXIcs9fHcCkkDgtaI4/4gPhrTiJZ23t9
+OJmmrP/7HAL17ZqpHDc6MQYnJzgCBwd2lGAhB4PP7f5GumqrSh4fjX34KOEko/4Z
+WGILKgToF29Sp8dOCH8JzIsI/B8b5t0yWbrCXvryBuUSAwM6Zq1W7XXTO5QxJnOx
+kGCIbA0/k/vzFCt/2DOQkz6vX4R2HUWpZc08TxQG816/xaTBgY1DOU+weTqzirfR
+e1OmVdxSwS2LNSD1JgHY
+=77hm
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
index 408c7e47df9c..ee72106c8b85 100644
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
+++ b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
@@ -107,7 +107,7 @@ migrate to libusb-1 by me (Mike Frysinger)
  		.name		= NULL
  	}
  };
-@@ -181,12 +198,14 @@ int flg_show = 0;
+@@ -181,12 +204,14 @@ int flg_show = 0;
  
  int main(int argc, char **argv)
  {
@@ -127,7 +127,7 @@ migrate to libusb-1 by me (Mike Frysinger)
  
  	printf("SMDK42XX,S3C64XX USB Download Tool\n");
  	printf("Version 0.20 (c) 2004,2005,2006"
-@@ -197,7 +216,7 @@ int main(int argc, char **argv)
+@@ -197,7 +222,7 @@ int main(int argc, char **argv)
  		int index = 0;
  		int c;
  
@@ -136,7 +136,7 @@ migrate to libusb-1 by me (Mike Frysinger)
  
  		DBG(("option index %d\n",c ));
  
-@@ -218,117 +237,116 @@ int main(int argc, char **argv)
+@@ -218,117 +243,125 @@ int main(int argc, char **argv)
  			break;
  
  		case 'b':
@@ -277,12 +277,21 @@ migrate to libusb-1 by me (Mike Frysinger)
 -	}
 +	ret = libusb_open(found, &devh);
 +	if (ret == 0) {
++		/*
++		 * Seems to break some recovery modes :(
++		 * http://crosbug.com/26083
++		 * These fail:
++		 * smdk-dltool -a 0x02021400 -f bl1.bin
++		 * smdk-dltool -a 0x02023400 -f bl2.bin
++		 */
++#if 0
 +		uint8_t configuration;
 +		struct libusb_config_descriptor *config;
 +		libusb_get_active_config_descriptor(found, &config);
 +		configuration = config->bConfigurationValue;
 +		libusb_free_config_descriptor(config);
 +		libusb_set_configuration(devh, configuration);
++#endif
 +	} else
 +		errp("libusb_open");
  
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild
index ba155332ffb5..8fe8138dbd04 100644
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild
+++ b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r1.ebuild,v 1.2 2012/01/31 16:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20-r2.ebuild,v 1.1 2012/02/09 17:15:11 vapier Exp $
 
 EAPI="4"
 
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild
deleted file mode 100644
index 96027a06463e..000000000000
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild,v 1.2 2012/01/27 18:43:13 vapier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Tool to communicate with Samsung SMDK boards"
-HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
-SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
-
-# Email sent to author on 2012-01-18 querying about license
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	tc-export CC
-}
-
-src_install() {
-	newbin dltool smdk-usbdl
-	dodoc readme.txt
-}