Date: Sat, 6 Sep 2014 15:44:10 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367444 - in head/multimedia/libv4l: . files Message-ID: <201409061544.s86FiAZc065666@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sat Sep 6 15:44:09 2014 New Revision: 367444 URL: http://svnweb.freebsd.org/changeset/ports/367444 QAT: https://qat.redports.org/buildarchive/r367444/ Log: - Integrate libv4l with webcamd regarding Webcam quirks. - Bump PORTREVISION. Submitted by: hselasky (maintainer) Modified: head/multimedia/libv4l/Makefile head/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c Modified: head/multimedia/libv4l/Makefile ============================================================================== --- head/multimedia/libv4l/Makefile Sat Sep 6 15:15:45 2014 (r367443) +++ head/multimedia/libv4l/Makefile Sat Sep 6 15:44:09 2014 (r367444) @@ -3,7 +3,7 @@ PORTNAME= libv4l PORTVERSION= 0.8.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://linuxtv.org/downloads/v4l-utils/ DISTNAME= v4l-utils-${PORTVERSION} Modified: head/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c ============================================================================== --- head/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c Sat Sep 6 15:15:45 2014 (r367443) +++ head/multimedia/libv4l/files/patch-libv4lconvert_control_libv4lcontrol.c Sat Sep 6 15:44:09 2014 (r367444) @@ -1,5 +1,30 @@ --- libv4lconvert/control/libv4lcontrol.c.orig 2012-05-02 21:17:37.000000000 +0200 +++ libv4lconvert/control/libv4lcontrol.c 2012-05-06 08:52:42.000000000 +0200 +@@ -345,6 +345,16 @@ + unsigned short *vendor_id, unsigned short *product_id, + int *speed) + { ++#ifdef __FreeBSD__ ++#define WEBCAMD_IOCTL_GET_USB_VENDOR_ID _IOR('q', 250, unsigned short) ++#define WEBCAMD_IOCTL_GET_USB_PRODUCT_ID _IOR('q', 251, unsigned short) ++#define WEBCAMD_IOCTL_GET_USB_SPEED _IOR('q', 252, unsigned int) ++ if (ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_VENDOR_ID, vendor_id) == 0 && ++ ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_PRODUCT_ID, product_id) == 0 && ++ ioctl(data->fd, WEBCAMD_IOCTL_GET_USB_SPEED, speed) == 0) ++ return (1); ++ return (0); ++#else + FILE *f; + int i, minor; + struct stat st; +@@ -434,6 +444,7 @@ + return 0; /* Should never happen */ + + return 1; ++#endif + } + + /* @@ -456,7 +456,12 @@ while (isspace(*start)) start++; n = strlen(start);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409061544.s86FiAZc065666>