Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20269
Modified Files:
libusb.info libusb.patch
Log Message:
Fix 32-bit breakage. Tested both ways this time.
Index: libusb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libusb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libusb.patch 9 Jun 2009 06:22:17 -0000 1.3
+++ libusb.patch 9 Jun 2009 17:17:57 -0000 1.4
@@ -233,25 +233,28 @@
int usb_interrupt_write(usb_dev_handle *dev, int ep, char *bytes, int size,
int timeout)
{
-@@ -1064,7 +1116,7 @@
+@@ -1064,7 +1116,8 @@
result = (*(device))->GetDeviceAddress(device, (USBDeviceAddress
*)&address);
if (usb_debug >= 2)
- fprintf(stderr, "usb_os_find_devices: Found USB device at location
0x%08lx\n", location);
-+ fprintf(stderr, "usb_os_find_devices: Found USB device at location
0x%08" PRIx32 "\n", location);
++ fprintf(stderr, "usb_os_find_devices: Found USB device at location
0x%08" PRIx32 "\n",
++ (uint32_t) location);
/* first byte of location appears to be associated with the device's bus
*/
if (location >> 24 == bus_loc >> 24) {
-@@ -1091,7 +1143,7 @@
+@@ -1091,8 +1144,8 @@
LIST_ADD(fdev, dev);
if (usb_debug >= 2)
- fprintf(stderr, "usb_os_find_devices: Found %s on %s at location
0x%08lx\n",
+- dev->filename, bus->dirname, location);
+ fprintf(stderr, "usb_os_find_devices: Found %s on %s at location 0x%08"
PRIx32 "\n",
- dev->filename, bus->dirname, location);
++ dev->filename, bus->dirname, (uint32_t) location);
}
-@@ -1177,7 +1229,12 @@
+ /* release the device now */
+@@ -1177,7 +1230,12 @@
if ((pipeRef = ep_to_pipeRef(device, ep)) == -1)
USB_ERROR(-EINVAL);
Index: libusb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libusb.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- libusb.info 9 Jun 2009 06:22:17 -0000 1.10
+++ libusb.info 9 Jun 2009 17:17:57 -0000 1.11
@@ -1,6 +1,6 @@
Package: libusb
Version: 0.1.12
-Revision: 1014
+Revision: 1015
Maintainer: Ben Hines <bhi...@alumni.ucsd.edu>
Source: http://download.sourceforge.net/%n/%n-%v.tar.gz
Source-MD5: caf182cbc7565dac0fd72155919672e6
@@ -23,7 +23,7 @@
make
<<
PatchFile: %n.patch
-PatchFile-MD5: 8c202a96e6c90027f9a93533d24d3d07
+PatchFile-MD5: 834282b7beb069f89c2ec300cf5469e4
InstallScript: <<
make install DESTDIR=%d
# for some reason, libusb's build strips out the -Wl's?
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
