Changes 0.1.10:

* Fix various compile warnings
* Require newer autotools
* Switch from QT to STL for C++ extensions
* Linux:
  * Speed up small bulk and interrupt transfers to previous speeds
  * Fix case where bulk and interrupt transfers could block forever
  * Fix tree heirarchy building code (undocumented)

7 files changed, 71 insertions, 24 deletions

diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 593a716656e..9a274bdbc9c 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/02/14 09:50:18 adam Exp $
 
-DISTNAME=	libusb-0.1.8
-PKGREVISION=	2
+DISTNAME=	libusb-0.1.10
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 
@@ -9,10 +8,11 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://libusb.sourceforge.net/
 COMMENT=	USB access library
 
-USE_BUILDLINK3=		YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-build-docs
-USE_LIBTOOL=		YES
 
 ONLY_FOR_PLATFORM=	Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
 ONLY_FOR_PLATFORM+=	OpenBSD-*-*
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 159dd905702..288e86d465d 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/02/14 09:50:18 adam Exp $
 bin/libusb-config
 include/usb.h
 lib/libusb.la
+lib/libusbpp.la
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 93081f0778f..5da4007e0ca 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.12 2004/06/23 08:42:57 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2005/02/14 09:50:18 adam Exp $
 
-SHA1 (libusb-0.1.8.tar.gz) = 94f3ff525a12e82ac6944a28f0bed5c765921ffd
-Size (libusb-0.1.8.tar.gz) = 321295 bytes
-SHA1 (patch-aa) = e64f2686c079c6d48eff0e3eea53a63114322644
+SHA1 (libusb-0.1.10.tar.gz) = d8f737828b1d0e7829b8da1027d218e25929e2e4
+Size (libusb-0.1.10.tar.gz) = 377727 bytes
+SHA1 (patch-aa) = f9a4a5d48b11ccddcaba77b23d1b7f8c91778c7d
+SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
-SHA1 (patch-ad) = ed6a27a9e68ece7505f38c8ad6ad8cf7a0513f6b
+SHA1 (patch-ad) = a04dcc518d1e0c31e9f2431a88896b25ea4f4824
+SHA1 (patch-ae) = ba0d7d7602a27d3a27539305b5b3308d1ac385fc
diff --git a/devel/libusb/patches/patch-aa b/devel/libusb/patches/patch-aa
index 7a713044bae..bcdaaa039de 100644
--- a/devel/libusb/patches/patch-aa
+++ b/devel/libusb/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/05/03 08:45:44 adam Exp $
+$NetBSD: patch-aa,v 1.5 2005/02/14 09:50:18 adam Exp $
 
---- configure.orig	2004-02-11 16:27:31.000000000 +0000
+--- configure.orig	2005-02-11 01:51:06.000000000 +0000
 +++ configure
-@@ -18534,8 +18534,8 @@ _ACEOF
+@@ -19226,8 +19226,8 @@ _ACEOF
  
      BSD_API=1
      os_support=bsd
@@ -13,3 +13,21 @@ $NetBSD: patch-aa,v 1.4 2004/05/03 08:45:44 adam Exp $
      OSLIBS=""
      ;;
    *-darwin*)
+@@ -21635,17 +21635,11 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <dev/usb/usb.h>
+-int
+-main ()
+-{
+ int main(void)
+      {
+        int a = ((struct usb_ctl_request *)0L)->ucr_addr;
+        return 0;
+      }
+-  ;
+-  return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
diff --git a/devel/libusb/patches/patch-ab b/devel/libusb/patches/patch-ab
new file mode 100644
index 00000000000..364b87c727a
--- /dev/null
+++ b/devel/libusb/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2005/02/14 09:50:18 adam Exp $
+
+--- usbpp.h.orig	2005-02-14 10:21:58.000000000 +0000
++++ usbpp.h
+@@ -5,7 +5,7 @@
+ #include <string>
+ #include <list>
+ 
+-#include <usb.h>
++#include "usb.h"
+ 
+ /*
+  * The following usb.h function is not wrapped yet:
diff --git a/devel/libusb/patches/patch-ad b/devel/libusb/patches/patch-ad
index edeba91e064..1d4240882ee 100644
--- a/devel/libusb/patches/patch-ad
+++ b/devel/libusb/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.4 2004/06/23 08:42:57 mycroft Exp $
+$NetBSD: patch-ad,v 1.5 2005/02/14 09:50:18 adam Exp $
 
---- bsd.c.orig	2004-01-27 22:36:40.000000000 +0000
-+++ bsd.c	2004-06-23 08:40:16.000000000 +0000
-@@ -320,7 +320,7 @@
- int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size,
-                   int timeout)
+--- bsd.c.orig	2004-02-18 06:34:52.000000000 +0000
++++ bsd.c
+@@ -399,7 +399,7 @@ int usb_interrupt_write(usb_dev_handle *
+ int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size,
+                        int timeout)
  {
 -  int fd, ret, retrieved = 0, one = 1;
 +  int fd, ret, retrieved = 0, one = 1, requested;
  
    /* Ensure the endpoint address is correct */
    ep |= USB_ENDPOINT_IN;
-@@ -346,7 +346,8 @@
+@@ -425,7 +425,8 @@ int usb_interrupt_read(usb_dev_handle *d
      USB_ERROR_STR(-errno, "error setting short xfer: %s", strerror(errno));
  
    do {
@@ -20,8 +20,8 @@ $NetBSD: patch-ad,v 1.4 2004/06/23 08:42:57 mycroft Exp $
 +    ret = read(fd, bytes+retrieved, requested);
      if (ret < 0)
  #if __FreeBSD__
-       USB_ERROR_STR(-errno, "error reading from bulk endpoint %s.%d: %s",
-@@ -356,7 +357,7 @@
+       USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s",
+@@ -435,7 +436,7 @@ int usb_interrupt_read(usb_dev_handle *d
                    dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
  #endif
      retrieved += ret;
diff --git a/devel/libusb/patches/patch-ae b/devel/libusb/patches/patch-ae
new file mode 100644
index 00000000000..a6e6d429669
--- /dev/null
+++ b/devel/libusb/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/02/14 09:50:18 adam Exp $
+
+--- Makefile.in.orig	2005-02-14 10:46:11.000000000 +0000
++++ Makefile.in
+@@ -283,7 +283,7 @@ libusbpp_la_LDFLAGS = \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 	-release $(LT_RELEASE) \
+ 	-export-dynamic \
+-	$(LDADDS) -lusb $(QT_LDFLAGS)
++	$(LDADDS) libusb.la $(QT_LDFLAGS)
+ 
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive