Changeset 97840

Timestamp:

Sep 17, 2012, 2:00:02 PM (12 years ago)

Author:

michaelld@…

Message:

libusb-legacy : disable compiling with clang since it does not play nicely with +universal; fixes ticket #36170. Also, tweak Darwin code to better use OSX-native typedefs and avoid warnings.

Location:

trunk/dports/devel/libusb-legacy

Files:

• Portfile (modified) (2 diffs)
• files/patch-darwin.c.diff (modified) (3 diffs)

trunk/dports/devel/libusb-legacy/Portfile

@@ -6 +6 @@
 name                libusb-legacy
 version             0.1.12
-revision            2
+revision            3
 categories          devel
 license             LGPL-2.1
@@ -64 +64 @@
 }
 
+# does not work with clang when +universal; just disable clang for now
+compiler.blacklist  clang
+
 configure.args      --disable-build-docs \
                     --libdir=${prefix}/lib/libusb-legacy \

trunk/dports/devel/libusb-legacy/files/patch-darwin.c.diff

@@ -1 @@
---- darwin.c.orig       2006-02-25 19:40:17.000000000 +0100
-+++ darwin.c    2006-04-27 22:15:22.000000000 +0200
+--- darwin.c.orig       2012-09-17 09:29:57.000000000 -0400
++++ darwin.c    2012-09-17 09:48:45.000000000 -0400
 @@ -189,6 +189,8 @@
      return "invalid argument";
@@ -18 +18 @@
    case kIOUSBPipeStalled:
      return LUSBDARWINSTALL;
-@@ -838,19 +841,13 @@
+@@ -247,7 +250,8 @@
+   io_cf_plugin_ref_t *plugInInterface = NULL;
+   usb_device_t **device;
+   io_service_t usbDevice;
+-  long result, score;
++  IOReturn result;
++  SInt32 score;
+ 
+   if (!IOIteratorIsValid (deviceIterator) || !(usbDevice = IOIteratorNext(deviceIterator)))
+     return NULL;
+@@ -447,7 +451,7 @@
+   IOUSBFindInterfaceRequest request;
+ 
+   struct darwin_dev_handle *device;
+-  long score;
++  SInt32 score;
+   int current_interface;
+ 
+   device = dev->impl_info;
+@@ -768,8 +772,8 @@
+   struct rw_complete_arg *rw_arg = (struct rw_complete_arg *)refcon;
+ 
+   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);
++    fprintf(stderr, "io async operation completed: %s, size=%llu, result=0x%08llx\n", darwin_error_str(result),
++           (UInt64)io_size, (SInt64) result);
+ 
+   rw_arg->io_size = (UInt32)io_size;
+   rw_arg->result  = result;
+@@ -838,19 +842,13 @@
  
    if (result == kIOReturnSuccess) {
@@ -40 +70 @@
      char *error_str;
  
+@@ -1064,7 +1062,7 @@
+     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%08llx\n", (UInt64) location);
+ 
+     /* first byte of location appears to be associated with the device's bus */
+     if (location >> 24 == bus_loc >> 24) {
+@@ -1091,8 +1089,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%08llx\n",
++               dev->filename, bus->dirname, (UInt64) location);
+     }
+ 
+     /* release the device now */