[Glibc-bsd-commits] r3173 - in trunk/freebsd-libs/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-08-25 22:17:42 +0000 (Wed, 25 Aug 2010)
New Revision: 3173

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/12_usb.diff
Log:
  * libusb2: fix USB devices detection. Closes: bug#594330.



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2010-08-23 15:48:40 UTC (rev 3172)
+++ trunk/freebsd-libs/debian/changelog	2010-08-25 22:17:42 UTC (rev 3173)
@@ -1,3 +1,9 @@
+freebsd-libs (8.1-5) UNRELEASED; urgency=low
+
+  * libusb2: fix USB devices detection. Closes: bug#594330.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 25 Aug 2010 22:49:59 +0200
+
 freebsd-libs (8.1-4) unstable; urgency=low
 
   * Add a libsbuf0-udeb package.

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2010-08-23 15:48:40 UTC (rev 3172)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2010-08-25 22:17:42 UTC (rev 3173)
@@ -21,3 +21,14 @@
  
  MLINKS+=	libusb.3 usb.3
  
+--- a/lib/libusb/libusb20.c
++++ b/lib/libusb/libusb20.c
+@@ -1166,7 +1166,7 @@ libusb20_be_alloc_ugen20(void)
+ {
+ 	struct libusb20_backend *pbe;
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ 	pbe = libusb20_be_alloc(&libusb20_ugen20_backend);
+ #else
+ 	pbe = NULL;