* [gentoo-commits] gentoo-x86 commit in sys-apps/usbutils/files: usbutils-006-libusbx-1.0.13.patch
@ 2012-09-24 11:45 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-09-24 11:45 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/09/24 11:45:07
Added: usbutils-006-libusbx-1.0.13.patch
Log:
Fix building against >=dev-libs/libusbx-1.0.13 wrt #435866 by Zoltan Puskas
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch?rev=1.1&content-type=text/plain
Index: usbutils-006-libusbx-1.0.13.patch
===================================================================
http://bugs.gentoo.org/435866
http://github.com/libusbx/libusbx/commit/3f513b62467d1842ec0771aaec01fde2f57bfb9c
--- lsusb.c
+++ lsusb.c
@@ -437,7 +437,7 @@
printf(" Remote Wakeup\n");
if (config->bmAttributes & 0x10)
printf(" Battery Powered\n");
- printf(" MaxPower %5umA\n", config->MaxPower * 2);
+ printf(" MaxPower %5umA\n", config->bMaxPower * 2);
/* avoid re-ordering or hiding descriptors for display */
if (config->extra_length) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/usbutils/files: usbutils-006-libusbx-1.0.13.patch
@ 2012-09-25 9:01 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-09-25 9:01 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/09/25 09:01:31
Modified: usbutils-006-libusbx-1.0.13.patch
Log:
Remove ugly has_version usage and use LIBUSBX_API_VERSION in the patch.
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch?r1=1.1&r2=1.2
Index: usbutils-006-libusbx-1.0.13.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/usbutils/files/usbutils-006-libusbx-1.0.13.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- usbutils-006-libusbx-1.0.13.patch 24 Sep 2012 11:45:07 -0000 1.1
+++ usbutils-006-libusbx-1.0.13.patch 25 Sep 2012 09:01:31 -0000 1.2
@@ -3,12 +3,15 @@
--- lsusb.c
+++ lsusb.c
-@@ -437,7 +437,7 @@
+@@ -437,7 +437,11 @@
printf(" Remote Wakeup\n");
if (config->bmAttributes & 0x10)
printf(" Battery Powered\n");
-- printf(" MaxPower %5umA\n", config->MaxPower * 2);
++ #if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01000100)
+ printf(" MaxPower %5umA\n", config->bMaxPower * 2);
++ #else
+ printf(" MaxPower %5umA\n", config->MaxPower * 2);
++ #endif
/* avoid re-ordering or hiding descriptors for display */
if (config->extra_length) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/usbutils/files: usbutils-006-libusbx-1.0.13.patch
@ 2013-04-19 6:03 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-04-19 6:03 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/04/19 06:03:22
Removed: usbutils-006-libusbx-1.0.13.patch
Log:
Punt -libusbx-1.0.13.patch which is no longer required by current dev-libs/libusbx wrt #466428 by Lukáš Závodný
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-19 6:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24 11:45 [gentoo-commits] gentoo-x86 commit in sys-apps/usbutils/files: usbutils-006-libusbx-1.0.13.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2012-09-25 9:01 Samuli Suominen (ssuominen)
2013-04-19 6:03 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox