Attachment #52178 for bug #79084

View | Details | Raw Unified | Return to bug 79084
Collapse All | Expand All

Lines 6-13 Link Here

(-)libusb/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libusb	8	PORTNAME= libusb
9	PORTVERSION= 0.1.7	9	PORTVERSION= 0.1.10a
10	PORTREVISION= 1	10	#PORTREVISION= 1
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}

Lines 1-2 Link Here

(-)libusb/distinfo (-2 / +2 lines)
1	MD5 (libusb-0.1.7.tar.gz) = 4c7abee86d8715bccb43428a500d2170	1	MD5 (libusb-0.1.10a.tar.gz) = c6062b29acd2cef414bcc34e0decbdd1
2	SIZE (libusb-0.1.7.tar.gz) = 193075	2	SIZE (libusb-0.1.10a.tar.gz) = 375144




--- bsd.c.orig	Mon Nov 11 19:04:16 2002
+++ bsd.c	Sun Nov 23 15:51:49 2003
@@ -276,7 +276,7 @@
 int usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size,
                    int timeout)
 {
-  int fd, ret, sent = 0;
+  int fd, ret;
 
   /* Ensure the endpoint address is correct */
   ep &= ~USB_ENDPOINT_IN;
@@ -298,8 +298,7 @@
     USB_ERROR_STR(ret, "error setting timeout: %s",
                   strerror(errno));
 
-  do {
-    ret = write(fd, bytes+sent, size-sent);
+    ret = write(fd, bytes, size);
     if (ret < 0)
 #if __FreeBSD__
       USB_ERROR_STR(ret, "error writing to bulk endpoint %s.%d: %s",
@@ -309,16 +308,13 @@
                   dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
 #endif
 
-    sent += ret;
-  } while(ret > 0 && sent < size);
-
-  return sent;
+  return ret;
 }
 
 int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size,
                   int timeout)
 {
-  int fd, ret, retrieved = 0, one = 1;
+  int fd, ret, one = 1;
 
   /* Ensure the endpoint address is correct */
   ep |= USB_ENDPOINT_IN;
@@ -345,8 +341,7 @@
     USB_ERROR_STR(ret, "error setting short xfer: %s",
                   strerror(errno));
 
-  do {
-    ret = read(fd, bytes+retrieved, size-retrieved);
+    ret = read(fd, bytes, size);
     if (ret < 0)
 #if __FreeBSD__
       USB_ERROR_STR(ret, "error reading from bulk endpoint %s.%d: %s",
@@ -355,10 +350,8 @@
       USB_ERROR_STR(ret, "error reading from bulk endpoint %s.%02d: %s",
                   dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
 #endif
-    retrieved += ret;
-  } while (ret > 0 && retrieved < size);
 
-  return retrieved;
+  return ret;
 }
 
 int usb_control_msg(usb_dev_handle *dev, int requesttype, int request,




--- configure.orig	Fri Feb 25 23:04:35 2005
+++ configure	Fri Feb 25 23:05:03 2005
@@ -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




--- ltmain.sh.orig	Fri Feb 25 21:55:10 2005
+++ ltmain.sh	Fri Feb 25 21:55:38 2005
@@ -5550,10 +5550,12 @@
 	  *-*-openbsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
+	  *-*-freebsd*)
+	    # FreeBSD doesn't need this...
+	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test $build_libtool_need_lc = "yes"; then
@@ -4210,10 +4213,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.

Lines 1-6 Link Here

(-)libusb/pkg-plist (-1 / +5 lines)
1	bin/libusb-config	1	bin/libusb-config
2	include/usb.h	2	include/usb.h
3	lib/libusb-0.1.so.7	3	lib/libusb-0.1.so.8
4	lib/libusb-0.1.so	4	lib/libusb-0.1.so
5	lib/libusb.so	5	lib/libusb.so
6	lib/libusb.a	6	lib/libusb.a
		7	lib/libusbpp-0.1.so.8
		8	lib/libusbpp-0.1.so
		9	lib/libusbpp.so
		10	lib/libusbpp.a

Return to bug 79084

Lines 1-62 Link Here

(-)libusb/files/patch-bsd.c (-62 lines)
1	--- bsd.c.orig Mon Nov 11 19:04:16 2002
2	+++ bsd.c Sun Nov 23 15:51:49 2003
3	@@ -276,7 +276,7 @@
4	int usb_bulk_write(usb_dev_handle dev, int ep, char bytes, int size,
5	int timeout)
6	{
7	- int fd, ret, sent = 0;
8	+ int fd, ret;
9
10	/* Ensure the endpoint address is correct */
11	ep &= ~USB_ENDPOINT_IN;
12	@@ -298,8 +298,7 @@
13	USB_ERROR_STR(ret, "error setting timeout: %s",
14	strerror(errno));
15
16	- do {
17	- ret = write(fd, bytes+sent, size-sent);
18	+ ret = write(fd, bytes, size);
19	if (ret < 0)
20	#if __FreeBSD__
21	USB_ERROR_STR(ret, "error writing to bulk endpoint %s.%d: %s",
22	@@ -309,16 +308,13 @@
23	dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
24	#endif
25
26	- sent += ret;
27	- } while(ret > 0 && sent < size);
28	-
29	- return sent;
30	+ return ret;
31	}
32
33	int usb_bulk_read(usb_dev_handle dev, int ep, char bytes, int size,
34	int timeout)
35	{
36	- int fd, ret, retrieved = 0, one = 1;
37	+ int fd, ret, one = 1;
38
39	/* Ensure the endpoint address is correct */
40	ep \|= USB_ENDPOINT_IN;
41	@@ -345,8 +341,7 @@
42	USB_ERROR_STR(ret, "error setting short xfer: %s",
43	strerror(errno));
44
45	- do {
46	- ret = read(fd, bytes+retrieved, size-retrieved);
47	+ ret = read(fd, bytes, size);
48	if (ret < 0)
49	#if __FreeBSD__
50	USB_ERROR_STR(ret, "error reading from bulk endpoint %s.%d: %s",
51	@@ -355,10 +350,8 @@
52	USB_ERROR_STR(ret, "error reading from bulk endpoint %s.%02d: %s",
53	dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
54	#endif
55	- retrieved += ret;
56	- } while (ret > 0 && retrieved < size);
57
58	- return retrieved;
59	+ return ret;
60	}
61
62	int usb_control_msg(usb_dev_handle *dev, int requesttype, int request,

Line 0 Link Here

(-)libusb/files/patch-configure (+20 lines)
	1	--- configure.orig Fri Feb 25 23:04:35 2005
	2	+++ configure Fri Feb 25 23:05:03 2005
	3	@@ -21635,17 +21635,11 @@
	4	cat >>conftest.$ac_ext <<_ACEOF
	5	/* end confdefs.h. */
	6	#include <dev/usb/usb.h>
	7	-int
	8	-main ()
	9	-{
	10	int main(void)
	11	{
	12	int a = ((struct usb_ctl_request *)0L)->ucr_addr;
	13	return 0;
	14	}
	15	- ;
	16	- return 0;
	17	-}
	18	_ACEOF
	19	rm -f conftest.$ac_objext
	20	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

Lines 1-16 Link Here

(-)libusb/files/patch-ltmain.sh (-13 / +3 lines)
1	--- ltmain.sh.orig Sat Sep 22 20:10:52 2001	1	--- ltmain.sh.orig Fri Feb 25 21:55:10 2005
2	+++ ltmain.sh Tue Nov 20 21:14:55 2001	2	+++ ltmain.sh Fri Feb 25 21:55:38 2005
3	@@ -2444,6 +2444,9 @@	3	@@ -5550,10 +5550,12 @@
4	--openbsd*)
5	# Do not include libc due to us having libc/libc_r.
6	;;
7	+ --freebsd*)
8	+ # FreeBSD doesn't need this...
9	+ ;;
10	*)
11	# Add libc to deplibs on all other systems if necessary.
12	if test $build_libtool_need_lc = "yes"; then
13	@@ -4210,10 +4213,12 @@
14	fi	4	fi
15		5
16	# Install the pseudo-library for information purposes.	6	# Install the pseudo-library for information purposes.