pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libusb Changes 0.1.12:
details: https://anonhg.NetBSD.org/pkgsrc/rev/c91b97198da4
branches: trunk
changeset: 509531:c91b97198da4
user: adam <adam%pkgsrc.org@localhost>
date: Sat Mar 11 08:34:12 2006 +0000
description:
Changes 0.1.12:
Fix structure padding issues on some architectures
Fix compile warnings with newer versions of gcc
Fix memory leak when continuously rescanning for devices
Check for device nodes in /dev/usb under Linux
Fix compile problem with Darwin/Mac OS X port
Add support for Darwin/Mac OS X 10.4
Fix error when transactions are aborted
Requery endpoints when switching alternate settings
Support more BSD based distributions
Fix problem with short control messages in BSD port
Various other minor fixes
diffstat:
devel/libusb/Makefile | 5 +++--
devel/libusb/PLIST | 3 ++-
devel/libusb/buildlink3.mk | 4 ++--
devel/libusb/distinfo | 14 +++++++-------
devel/libusb/patches/patch-aa | 32 +++++++-------------------------
devel/libusb/patches/patch-ad | 16 ++++++++--------
devel/libusb/patches/patch-ae | 10 +++++-----
7 files changed, 34 insertions(+), 50 deletions(-)
diffs (186 lines):
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/Makefile
--- a/devel/libusb/Makefile Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/Makefile Sat Mar 11 08:34:12 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:05 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/11 08:34:12 adam Exp $
-DISTNAME= libusb-0.1.10a
+DISTNAME= libusb-0.1.12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}
@@ -13,6 +13,7 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-build-docs
+PKGCONFIG_OVERRIDE+= libusb.pc.in
ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
ONLY_FOR_PLATFORM+= OpenBSD-*-* DragonFly-*-*
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/PLIST
--- a/devel/libusb/PLIST Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/PLIST Sat Mar 11 08:34:12 2006 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.11 2005/02/25 14:19:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/11 08:34:12 adam Exp $
bin/libusb-config
include/usb.h
include/usbpp.h
lib/libusb.la
lib/libusbpp.la
+lib/pkgconfig/libusb.pc
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/buildlink3.mk
--- a/devel/libusb/buildlink3.mk Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/buildlink3.mk Sat Mar 11 08:34:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/03/11 08:34:13 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@
BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
.endif # LIBUSB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/distinfo
--- a/devel/libusb/distinfo Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/distinfo Sat Mar 11 08:34:12 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2005/08/22 17:15:23 reed Exp $
+$NetBSD: distinfo,v 1.17 2006/03/11 08:34:13 adam Exp $
-SHA1 (libusb-0.1.10a.tar.gz) = 7e03a71f2cec39d96f58e22ea9289088eee617ef
-RMD160 (libusb-0.1.10a.tar.gz) = 18d50ac645440925bfa9f58d7a311d857e640882
-Size (libusb-0.1.10a.tar.gz) = 375144 bytes
-SHA1 (patch-aa) = 3c3832a07f197da37c619a1c27f27be6198d5d26
+SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
+RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
+Size (libusb-0.1.12.tar.gz) = 389343 bytes
+SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b
SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
-SHA1 (patch-ad) = 6a5ef6d90dd67769e384ddec0743aeee4b9a4ddd
-SHA1 (patch-ae) = ba0d7d7602a27d3a27539305b5b3308d1ac385fc
+SHA1 (patch-ad) = 8c5ef2da6646563add86312c081ed8ce47fdf7e7
+SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/patches/patch-aa
--- a/devel/libusb/patches/patch-aa Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/patches/patch-aa Sat Mar 11 08:34:12 2006 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2005/08/22 17:15:23 reed Exp $
+$NetBSD: patch-aa,v 1.7 2006/03/11 08:34:13 adam Exp $
---- configure.orig 2005-02-14 12:23:23.000000000 -0800
-+++ configure 2005-08-20 09:00:04.000000000 -0700
-@@ -19211,7 +19211,7 @@
+--- configure.orig 2006-03-04 03:54:28.000000000 +0100
++++ configure
+@@ -19212,7 +19212,7 @@ _ACEOF
echo "${ECHO_T}Linux" >&6
OSLIBS=""
;;
-- *-freebsd*|*-openbsd*|*-netbsd*)
-+ *-freebsd*|*-openbsd*|*-netbsd*|*-dragonfly*)
+- *-freebsd*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*)
++ *-freebsd*|*-kfreebsd*-gnu|*-openbsd*|*-netbsd*|*-dragonfly*)
cat >>confdefs.h <<\_ACEOF
#define BSD_API 1
_ACEOF
-@@ -19226,8 +19226,8 @@
+@@ -19227,8 +19227,8 @@ _ACEOF
BSD_API=1
os_support=bsd
@@ -22,21 +22,3 @@
OSLIBS=""
;;
*-darwin*)
-@@ -21635,17 +21635,11 @@
- 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 -r 2032c94a4b38 -r c91b97198da4 devel/libusb/patches/patch-ad
--- a/devel/libusb/patches/patch-ad Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/patches/patch-ad Sat Mar 11 08:34:12 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2005/08/22 17:15:23 reed Exp $
+$NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
---- bsd.c.orig 2004-02-17 22:34:52.000000000 -0800
-+++ bsd.c 2005-08-20 09:08:12.000000000 -0700
-@@ -35,14 +35,18 @@
+--- bsd.c.orig 2006-03-04 03:52:46.000000000 +0100
++++ bsd.c
+@@ -39,14 +39,18 @@
#include <sys/time.h>
#include <sys/ioctl.h>
@@ -22,7 +22,7 @@
/*
* It appears some of the BSD's (OpenBSD atleast) have switched over to a
* new naming convention, so we setup some macro's for backward
-@@ -399,7 +403,7 @@
+@@ -403,7 +407,7 @@ int usb_interrupt_write(usb_dev_handle *
int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size,
int timeout)
{
@@ -31,7 +31,7 @@
/* Ensure the endpoint address is correct */
ep |= USB_ENDPOINT_IN;
-@@ -425,7 +429,8 @@
+@@ -429,7 +433,8 @@ int usb_interrupt_read(usb_dev_handle *d
USB_ERROR_STR(-errno, "error setting short xfer: %s", strerror(errno));
do {
@@ -39,9 +39,9 @@
+ requested = size - retrieved;
+ ret = read(fd, bytes+retrieved, requested);
if (ret < 0)
- #if __FreeBSD__
+ #ifdef __FreeBSD_kernel__
USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s",
-@@ -435,7 +440,7 @@
+@@ -439,7 +444,7 @@ int usb_interrupt_read(usb_dev_handle *d
dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
#endif
retrieved += ret;
diff -r 2032c94a4b38 -r c91b97198da4 devel/libusb/patches/patch-ae
--- a/devel/libusb/patches/patch-ae Sat Mar 11 06:33:39 2006 +0000
+++ b/devel/libusb/patches/patch-ae Sat Mar 11 08:34:12 2006 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2005/02/14 09:50:18 adam Exp $
+$NetBSD: patch-ae,v 1.2 2006/03/11 08:34:13 adam Exp $
---- Makefile.in.orig 2005-02-14 10:46:11.000000000 +0000
+--- Makefile.in.orig 2006-03-04 03:54:03.000000000 +0100
+++ Makefile.in
-@@ -283,7 +283,7 @@ libusbpp_la_LDFLAGS = \
+@@ -295,7 +295,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)
+- $(LDADDS) -lusb $(PREBIND_FLAGSPP)
++ $(LDADDS) libusb.la $(PREBIND_FLAGSPP)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
Home |
Main Index |
Thread Index |
Old Index