[58266] trunk/dports/devel

[ryandesign at macports.org]

Revision: 58266
          http://trac.macports.org/changeset/58266
Author:   ryandesign at macports.org
Date:     2009-09-24 19:07:16 -0700 (Thu, 24 Sep 2009)
Log Message:
-----------
libusb: reconnect history that got lost in r54871 by re-copying the port directory from r54870 and reapplying the changes subsequently made in r56888 (update to 1.0.3), r57444 (add license info) and r57618 (fix homepage and livecheck)

Revision Links:
--------------
    http://trac.macports.org/changeset/54871
    http://trac.macports.org/changeset/54870
    http://trac.macports.org/changeset/56888
    http://trac.macports.org/changeset/57444
    http://trac.macports.org/changeset/57618

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

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

Modified: trunk/dports/devel/libusb/Portfile
===================================================================
--- trunk/dports/devel/libusb/Portfile	2009-08-03 12:08:54 UTC (rev 54870)
+++ trunk/dports/devel/libusb/Portfile	2009-09-25 02:07:16 UTC (rev 58266)
@@ -3,26 +3,27 @@
 PortSystem 1.0
 
 name            libusb
-version         1.0.2
+version         1.0.3
 categories      devel
 
 description     library for USB device access
 long_description \
     library for use by user level applications to \
     access USB devices regardless of OS
-homepage        http://libusb.wiki.sourceforge.net/
+homepage        http://www.libusb.org/
 
 platforms       darwin
-#license         lgpl2.1+
+license         LGPLv2.1
 maintainers     wilcoxd.com:rwilcox toby brett
 
 master_sites    sourceforge
-checksums       md5 dc8865eaff167aabe78e5799762b8067 \
-                sha1 704a964bbdf5173a9eaedba2ccc486184652c2de \
-                rmd160 5756917a3294822b3d6153930daa05fd593af5d6
+checksums       md5 03af26d0c49705fa46c1f732e1018e73 \
+                sha1 d492c7f1c3f2cffcfc5d55f282a3899692662485 \
+                rmd160 ebf4eabf6a0e0e3865f617fda8d3ca2f7d11631d
 
 use_bzip2       yes
 
-patchfiles      patch-libusb__os__darwin_usb.c
+patchfiles      patch-libusb__io.c patch-libusb__os__darwin_usb.c
 
-livecheck.regex ${name}-(\[0-9\]\[^ \]+) released
+livecheck.url   http://sourceforge.net/projects/libusb/files/libusb-1.0/
+livecheck.regex /${name}-(\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)\\.tar\\.bz2'

Added: trunk/dports/devel/libusb/files/patch-libusb__io.c
===================================================================
--- trunk/dports/devel/libusb/files/patch-libusb__io.c	                        (rev 0)
+++ trunk/dports/devel/libusb/files/patch-libusb__io.c	2009-09-25 02:07:16 UTC (rev 58266)
@@ -0,0 +1,18 @@
+--- libusb/io.c.orig	2009-09-02 17:20:20.000000000 -0700
++++ libusb/io.c	2009-09-02 17:21:01.000000000 -0700
+@@ -1468,6 +1468,7 @@
+ 	return (r == ETIMEDOUT);
+ }
+ 
++#ifndef USBI_OS_HANDLES_TIMEOUT
+ static void handle_timeout(struct usbi_transfer *itransfer)
+ {
+ 	struct libusb_transfer *transfer =
+@@ -1480,6 +1481,7 @@
+ 		usbi_warn(TRANSFER_CTX(transfer),
+ 			"async cancel failed %d errno=%d", r, errno);
+ }
++#endif
+ 
+ static int handle_timeouts(struct libusb_context *ctx)
+ {

Modified: trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c
===================================================================
--- trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c	2009-08-03 12:08:54 UTC (rev 54870)
+++ trunk/dports/devel/libusb/files/patch-libusb__os__darwin_usb.c	2009-09-25 02:07:16 UTC (rev 58266)
@@ -1,16 +1,6 @@
---- 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 @@
+--- libusb/os/darwin_usb.c.orig	2009-09-02 17:18:57.000000000 -0700
++++ libusb/os/darwin_usb.c	2009-09-02 17:19:24.000000000 -0700
+@@ -279,7 +279,7 @@
    if (kresult != kIOReturnSuccess) {
      _usbi_log (ctx, LOG_LEVEL_ERROR, "could not add hotplug event source: %s", darwin_error_str (kresult));
  
@@ -19,12 +9,3 @@
    }
  
    /* 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/20090924/5fee38f2/attachment.html>