diff options
| author | kent <kent@pkgsrc.org> | 2002-06-23 15:22:56 +0000 |
|---|---|---|
| committer | kent <kent@pkgsrc.org> | 2002-06-23 15:22:56 +0000 |
| commit | 979b0cb0816be51d6b2e990fd7b13ce075c9d853 (patch) | |
| tree | 47ab5a4d05c36a6d515add73599a8b4debc27c14 /graphics/vid | |
| parent | d7351c546345f61fe60224813d61a41db7738350 (diff) | |
| download | pkgsrc-979b0cb0816be51d6b2e990fd7b13ce075c9d853.tar.gz | |
Make it compile with old usb.h again.
Diffstat (limited to 'graphics/vid')
| -rw-r--r-- | graphics/vid/distinfo | 4 | ||||
| -rw-r--r-- | graphics/vid/patches/patch-ab | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/graphics/vid/distinfo b/graphics/vid/distinfo index bd50a04a1e8..ea742ae30b3 100644 --- a/graphics/vid/distinfo +++ b/graphics/vid/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/06/23 15:15:33 kent Exp $ +$NetBSD: distinfo,v 1.3 2002/06/23 15:22:56 kent Exp $ SHA1 (vid-1.0.1.tar.gz) = 4967f9d02429f9202ea879c051c736d112856063 Size (vid-1.0.1.tar.gz) = 13986 bytes SHA1 (patch-aa) = c3704b480290f030f1c72a7686e2d8738ee24806 -SHA1 (patch-ab) = c6f4e202ec4724ff3389f0885b186fe19c819b77 +SHA1 (patch-ab) = c36d321b9fdf018f0eed7158b3750c2152ee4e53 diff --git a/graphics/vid/patches/patch-ab b/graphics/vid/patches/patch-ab index cea3466bb9d..d4f7937a87a 100644 --- a/graphics/vid/patches/patch-ab +++ b/graphics/vid/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ +$NetBSD: patch-ab,v 1.3 2002/06/23 15:22:57 kent Exp $ --- vid.c.orig Mon May 8 13:59:03 2000 +++ vid.c @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ struct usb_ctl_request ur; unsigned char data[1024]; -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) + ur.request.bmRequestType = UT_READ_VENDOR_INTERFACE; ur.request.bRequest = 2; @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ data[0] = val; -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) + ur.request.bmRequestType = UT_WRITE_VENDOR_INTERFACE; ur.request.bRequest = 2; @@ -96,7 +96,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ - if(udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) { - fprintf(stderr, "device %s is not an OmniVision OV511\n", devname); -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) + + if(udi.vendorNo != 0x05A9 || udi.productNo != 0x0511 && udi.productNo != 0xa511) { +#else @@ -116,7 +116,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ +#endif if((fd = open(dev, O_RDWR)) < 0) continue; -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) if(ioctl(fd, USB_GET_DEVICEINFO, &udi) < 0 - || udi.vendorNo != 0x05A9 || udi.productNo != 0x0511) { + || udi.vendorNo != 0x05A9 || udi.productNo != 0x0511 && udi.productNo != 0xa511) { @@ -138,7 +138,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ devname = dev; } -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) + isplus = udi.productNo == 0xa511; +#else + isplus = udi.udi_productNo == 0xa511; @@ -231,7 +231,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/23 15:15:33 kent Exp $ exit(1); /* select the 993-byte alternative */ -+#if defined(USB_STACK_VERSION) && (USB_STACK_VERSION < 2) ++#if !defined(USB_STACK_VERSION) ||(USB_STACK_VERSION < 2) alt.interface_index = 0; - alt.alt_no = 1; + alt.alt_no = (isplus ? 7 : 1); |