Date: Mon, 21 Mar 2005 06:28:02 -0700 (MST) From: John Reynolds <johnjen@reynoldsnet.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79084: MAINTAINER UPDATE: libusb updates to 0.1.10a Message-ID: <200503211328.j2LDS2rE076296@whale.home-net> Resent-Message-ID: <200503211330.j2LDU2NH050713@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79084
>Category: ports
>Synopsis: MAINTAINER UPDATE: libusb updates to 0.1.10a
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 21 13:30:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: John Reynolds
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD whale 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Tue Aug 19 23:10:49
MST 2003 root@dolphin:/usr/obj/usr/src/sys/WHALE i386
>Description:
At long last I'm sending in patches to upgrade libusb to 0.1.10a (latest).
>How-To-Repeat:
na/
>Fix:
Please use "-E" when applying this patch to the libusb directory. Following
that, please also do "cvs remove libusb/files/patch-bsd.c". This patch file is
no longer needed as the changes were found in the code itself. Additionally a
new file, libusb/files/patch-configure is added with this patch. There is a bug
in 0.1.10a's configure script which makes it mis-identify older FreeBSD
systems.
I have send out binary snapshots of this port as well as a "shar" to the ports
lists and have solicited breakage feedback and have received none, so I can
only assume things will work nicely on older versions of FreeBSD--I no longer
have any 4.x machines to compile with.
diff -urN libusb.orig/Makefile libusb/Makefile
--- libusb.orig/Makefile Fri Feb 25 21:26:05 2005
+++ libusb/Makefile Fri Feb 25 21:38:54 2005
@@ -6,8 +6,8 @@
#
PORTNAME= libusb
-PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTVERSION= 0.1.10a
+#PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -urN libusb.orig/distinfo libusb/distinfo
--- libusb.orig/distinfo Fri Feb 25 21:26:05 2005
+++ libusb/distinfo Fri Feb 25 21:38:09 2005
@@ -1,2 +1,2 @@
-MD5 (libusb-0.1.7.tar.gz) = 4c7abee86d8715bccb43428a500d2170
-SIZE (libusb-0.1.7.tar.gz) = 193075
+MD5 (libusb-0.1.10a.tar.gz) = c6062b29acd2cef414bcc34e0decbdd1
+SIZE (libusb-0.1.10a.tar.gz) = 375144
diff -urN libusb.orig/files/patch-bsd.c libusb/files/patch-bsd.c
--- libusb.orig/files/patch-bsd.c Fri Feb 25 21:26:05 2005
+++ libusb/files/patch-bsd.c Wed Dec 31 17:00:00 1969
@@ -1,62 +0,0 @@
---- 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,
diff -urN libusb.orig/files/patch-configure libusb/files/patch-configure
--- libusb.orig/files/patch-configure Wed Dec 31 17:00:00 1969
+++ libusb/files/patch-configure Fri Feb 25 23:06:35 2005
@@ -0,0 +1,20 @@
+--- 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
diff -urN libusb.orig/files/patch-ltmain.sh libusb/files/patch-ltmain.sh
--- libusb.orig/files/patch-ltmain.sh Fri Feb 25 21:26:05 2005
+++ libusb/files/patch-ltmain.sh Fri Feb 25 21:56:09 2005
@@ -1,16 +1,6 @@
---- ltmain.sh.orig Sat Sep 22 20:10:52 2001
-+++ ltmain.sh Tue Nov 20 21:14:55 2001
-@@ -2444,6 +2444,9 @@
- *-*-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 @@
+--- ltmain.sh.orig Fri Feb 25 21:55:10 2005
++++ ltmain.sh Fri Feb 25 21:55:38 2005
+@@ -5550,10 +5550,12 @@
fi
# Install the pseudo-library for information purposes.
diff -urN libusb.orig/pkg-plist libusb/pkg-plist
--- libusb.orig/pkg-plist Fri Feb 25 21:26:05 2005
+++ libusb/pkg-plist Sat Feb 26 16:45:53 2005
@@ -1,6 +1,10 @@
bin/libusb-config
include/usb.h
-lib/libusb-0.1.so.7
+lib/libusb-0.1.so.8
lib/libusb-0.1.so
lib/libusb.so
lib/libusb.a
+lib/libusbpp-0.1.so.8
+lib/libusbpp-0.1.so
+lib/libusbpp.so
+lib/libusbpp.a
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503211328.j2LDS2rE076296>