[pkgsrc/trunk]: pkgsrc/devel/libusb without this patch it failed to compile o...

[schwarz <schwarz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9fa927ddbda
branches:  trunk
changeset: 572153:a9fa927ddbda
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sat Feb 20 22:42:02 2010 +0000

description:
without this patch it failed to compile on MacOS 10.6 in 64 bit mode

diffstat:

 devel/libusb/distinfo         |   3 ++-
 devel/libusb/patches/patch-af |  43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)

diffs (61 lines):

diff -r ed3a30395164 -r a9fa927ddbda devel/libusb/distinfo
--- a/devel/libusb/distinfo     Sat Feb 20 20:51:11 2010 +0000
+++ b/devel/libusb/distinfo     Sat Feb 20 22:42:02 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2007/10/11 18:25:19 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/02/20 22:42:02 schwarz Exp $
 
 SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
 RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
@@ -8,3 +8,4 @@
 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
 SHA1 (patch-ad) = f81135a5f92bf0c2e1ca921368bd39482bd3b580
 SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
+SHA1 (patch-af) = e6771da24e1a695a8c7029f97a9c0d42aa23f5e5
diff -r ed3a30395164 -r a9fa927ddbda devel/libusb/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libusb/patches/patch-af     Sat Feb 20 22:42:02 2010 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
+
+--- darwin.c.orig      2010-02-20 23:22:35.000000000 +0100
++++ darwin.c   2010-02-20 23:36:10.000000000 +0100
+@@ -254,7 +254,7 @@
+   
+   result = IOCreatePlugInInterfaceForService(usbDevice, kIOUSBDeviceUserClientTypeID,
+                                            kIOCFPlugInInterfaceID, &plugInInterface,
+-                                           &score);
++                                           (SInt32*)&score);
+   
+   result = IOObjectRelease(usbDevice);
+   if (result || !plugInInterface)
+@@ -557,7 +557,7 @@
+   result = IOCreatePlugInInterfaceForService(usbInterface,
+                                            kIOUSBInterfaceUserClientTypeID,
+                                            kIOCFPlugInInterfaceID,
+-                                           &plugInInterface, &score);
++                                           &plugInInterface, (SInt32*)&score);
+   /* No longer need the usbInterface object after getting the plug-in */
+   result = IOObjectRelease(usbInterface);
+   if (result || !plugInInterface)
+@@ -758,7 +758,7 @@
+ 
+ /* argument to handle multiple parameters to rw_completed */
+ struct rw_complete_arg {
+-  UInt32        io_size;
++  unsigned long io_size;
+   IOReturn      result;
+   CFRunLoopRef  cf_loop;
+ };
+@@ -769,9 +769,9 @@
+ 
+   if (usb_debug > 2)
+     fprintf(stderr, "io async operation completed: %s, size=%lu, result=0x%08x\n", darwin_error_str(result),
+-          (UInt32)io_size, result);
++          (unsigned long)io_size, result);
+ 
+-  rw_arg->io_size = (UInt32)io_size;
++  rw_arg->io_size = (unsigned long)io_size;
+   rw_arg->result  = result;
+ 
+   CFRunLoopStop(rw_arg->cf_loop);