[54143] trunk/dports/devel/libusb/files

[toby at macports.org]

Revision: 54143
          http://trac.macports.org/changeset/54143
Author:   toby at macports.org
Date:     2009-07-21 16:31:14 -0700 (Tue, 21 Jul 2009)
Log Message:
-----------
clean up patches

Added Paths:
-----------
    trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c

Removed Paths:
-------------
    trunk/dports/devel/libusb/files/patch-Makefile.in
    trunk/dports/devel/libusb/files/patch-darwin.c.diff

Deleted: trunk/dports/devel/libusb/files/patch-Makefile.in
===================================================================
--- trunk/dports/devel/libusb/files/patch-Makefile.in	2009-07-21 23:29:33 UTC (rev 54142)
+++ trunk/dports/devel/libusb/files/patch-Makefile.in	2009-07-21 23:31:14 UTC (rev 54143)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-07-01 14:51:39.000000000 -0700
-+++ Makefile.in	2009-07-01 14:51:45.000000000 -0700
-@@ -257,7 +257,7 @@
- # gnu strictness chokes on README being autogenerated
- AUTOMAKE_OPTIONS = 1.4 foreign
- SUBDIRS = . tests doc
--AM_CFLAGS = -Werror $(AM_CFLAGS_EXT)
-+AM_CFLAGS = $(AM_CFLAGS_EXT)
- configincludedir = $(pkglibdir)/include
- bin_SCRIPTS = libusb-config
- EXTRA_DIST = LICENSE libusb.spec.in libusb.spec libusb-config.in README.in README \

Deleted: trunk/dports/devel/libusb/files/patch-darwin.c.diff
===================================================================
--- trunk/dports/devel/libusb/files/patch-darwin.c.diff	2009-07-21 23:29:33 UTC (rev 54142)
+++ trunk/dports/devel/libusb/files/patch-darwin.c.diff	2009-07-21 23:31:14 UTC (rev 54143)
@@ -1,41 +0,0 @@
---- darwin.c.orig	2006-02-25 19:40:17.000000000 +0100
-+++ darwin.c	2006-04-27 22:15:22.000000000 +0200
-@@ -189,6 +189,8 @@
-     return "invalid argument";
-   case kIOReturnAborted:
-     return "transaction aborted";
-+  case kIOReturnNotResponding:
-+    return "the device is not responding";
-   default:
-     return "unknown error";
-   }
-@@ -207,6 +209,7 @@
-   case kIOUSBNoAsyncPortErr:
-     return ENXIO;
-   case kIOReturnExclusiveAccess:
-+  case kIOReturnNotResponding:
-     return EBUSY;
-   case kIOUSBPipeStalled:
-     return LUSBDARWINSTALL;
-@@ -838,19 +841,13 @@
- 
-   if (result == kIOReturnSuccess) {
-     /* wait for write to complete */
--    if (CFRunLoopRunInMode(kCFRunLoopDefaultMode, (timeout+999)/1000, true) == kCFRunLoopRunTimedOut) {
--      (*(device->interface))->AbortPipe(device->interface, pipeRef);
--      CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); /* Pick up aborted callback */
--      if (usb_debug)
--	fprintf(stderr, "usb_bulk_read: input timed out\n");
--    }
-+    CFRunLoopRun();
-   }
- 
-   CFRunLoopRemoveSource(CFRunLoopGetCurrent(), cfSource, kCFRunLoopDefaultMode);
-   
-   /* Check the return code of both the write and completion functions. */
--  if (result != kIOReturnSuccess || (rw_arg.result != kIOReturnSuccess && 
--      rw_arg.result != kIOReturnAborted) ) {
-+  if (result != kIOReturnSuccess || rw_arg.result != kIOReturnSuccess) {
-     int error_code;
-     char *error_str;
- 

Added: trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c
===================================================================
--- trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c	                        (rev 0)
+++ trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c	2009-07-21 23:31:14 UTC (rev 54143)
@@ -0,0 +1,30 @@
+--- libusb/os/darwin_usb.c.orig	2009-07-21 14:39:55.000000000 -0700
++++ libusb/os/darwin_usb.c	2009-07-21 14:42:39.000000000 -0700
+@@ -150,7 +150,8 @@
+   io_cf_plugin_ref_t *plugInInterface = NULL;
+   usb_device_t **device;
+   io_service_t usbDevice;
+-  long result, score;
++  long result;
++  SInt32 score;
+ 
+   if (!IOIteratorIsValid (deviceIterator) || !(usbDevice = IOIteratorNext(deviceIterator)))
+     return NULL;
+@@ -278,7 +279,7 @@
+   if (kresult != kIOReturnSuccess) {
+     _usbi_log (ctx, LOG_LEVEL_ERROR, "could not add hotplug event source: %s", darwin_error_str (kresult));
+ 
+-    pthread_exit ((void *)kresult);
++    pthread_exit ((void *)(intptr_t)kresult);
+   }
+ 
+   /* arm notifiers */
+@@ -767,7 +768,7 @@
+   io_service_t          usbInterface = IO_OBJECT_NULL;
+   IOReturn kresult;
+   IOCFPlugInInterface **plugInInterface = NULL;
+-  long                  score;
++  SInt32                score;
+   uint8_t               new_config;
+ 
+   /* current interface */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090721/931f15c6/attachment.html>