Date: Sun, 12 Dec 2010 22:45:34 +0100 From: Hans Petter Selasky <hselasky@c2i.net> To: kwm@freebsd.org Cc: freebsd-multimedia@freebsd.org, Dru Lavigne <drulavigne@sympatico.ca> Subject: Webcamd v0.1.18 ready for testing [was: v0.1.17] Message-ID: <201012122245.34561.hselasky@c2i.net>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_+JUBNhF8kdGdPfP Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Please find attached a patch which upgrades the webcamd port to version 0.1.17. List of changes: - Added man-pages for all drivers including webcamd itself. Big thanks to Dru Lavigne! - Fixed deadlock/hang issue with hald during plug of USB device after boot. - Added patch from Luigi Rizzo to use "checkyesno" in webcamd rc startup file to detect presence of hald. - Upgraded drivers to latest version from the respective V4L repositories - Added new debug option to the port config system. - Added License keyword. - Fixed problem with -B option. - Improved startup script. Please test and report any issues! Tested: i386 + amd64 + USB video + USB DVB. --HPS --Boundary-00=_+JUBNhF8kdGdPfP Content-Type: text/x-patch; charset="us-ascii"; name="webcamd-0.1.18.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="webcamd-0.1.18.patch" diff -u -r webcamd.orig/Makefile webcamd/Makefile --- webcamd.orig/Makefile 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/Makefile 2010-12-12 22:22:42.000000000 +0100 @@ -6,17 +6,19 @@ # PORTNAME= webcamd -PORTVERSION= 0.1.16 +PORTVERSION= 0.1.18 CATEGORIES= multimedia MASTER_SITES= http://www.selasky.org/hans_petter/video4bsd/releases/ MAINTAINER= hselasky@FreeBSD.org COMMENT= A port of Linux USB webcam and DVB drivers into userspace -BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \ - cuse4bsd-kmod>=0.1.8:${PORTSDIR}/multimedia/cuse4bsd-kmod +BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= v4l1.0:${PORTSDIR}/multimedia/libv4l +LIB_DEPENDS= v4l1.0:${PORTSDIR}/multimedia/libv4l \ + cuse4bsd.1:${PORTSDIR}/multimedia/cuse4bsd-kmod + +LICENSE= GPLv2 USE_RC_SUBR= webcamd USE_BZIP2= yes @@ -26,13 +28,15 @@ LIBDIR= ${PREFIX}/lib OPTIONS= HAL "Build with HAL and DBUS support" On +OPTIONS+= DBG "Build with debugging support" Off +OPTIONS+= MAN "Install manual pages" On .include <bsd.port.pre.mk> LIBCUSE=${LIBDIR}/libcuse4bsd.so .if defined(WITH_HAL) -MAKE_ARGS+="HAVE_HAL=YES" +MAKE_ARGS+=" HAVE_HAL=YES" LIBHAL=${LIBDIR}/libhal.so:${LIBDIR}/libdbus-1.so: LIB_DEPENDS+=hal.1:${PORTSDIR}/sysutils/hal LIB_DEPENDS+=dbus-1:${PORTSDIR}/devel/dbus @@ -40,6 +44,17 @@ LIBHAL= .endif +.if defined(WITH_DBG) +MAKE_ARGS+=" HAVE_DEBUG=YES" +.endif + +.if defined(WITH_MAN) +MAKE_ARGS+=" HAVE_MAN=YES" +PLIST_SUB+= MANPAGES="" +.else +PLIST_SUB+= MANPAGES="@comment " +.endif + .if ${OSVERSION} < 800000 IGNORE= requires FreeBSD 8.0-RELEASE or later .endif diff -u -r webcamd.orig/distinfo webcamd/distinfo --- webcamd.orig/distinfo 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/distinfo 2010-12-12 22:04:57.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (webcamd-0.1.16.tar.bz2) = 2e48673e4f729ac4ebfcbddf9985c18e -SHA256 (webcamd-0.1.16.tar.bz2) = ab5e5b7253414c822ce434317e5a0b0c82827765433bf4d115812d6e5ad8b192 -SIZE (webcamd-0.1.16.tar.bz2) = 3543806 +SHA256 (webcamd-0.1.18.tar.bz2) = 5ebb5b5347ddf6f3552141fa43036e330ece54133a66e7f2832de9770eb96aeb +SIZE (webcamd-0.1.18.tar.bz2) = 3545356 diff -u -r webcamd.orig/files/webcamd.in webcamd/files/webcamd.in --- webcamd.orig/files/webcamd.in 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/files/webcamd.in 2010-12-12 22:03:07.000000000 +0100 @@ -19,7 +19,7 @@ command=%%PREFIX%%/sbin/webcamd command_args="-B" -if [ -n "$hald_enable" ]; then +if checkyesno hald_enable ; then command_args="$command_args -H" fi @@ -29,5 +29,11 @@ if [ $# -gt 1 ]; then pidfile="webcamd.dummy" command_args="$command_args -d $2 -i 0" + # + # Only run the rc command if + # the appropriate arguments + # are specified: + # + run_rc_command $1 fi -run_rc_command $1 + diff -u -r webcamd.orig/pkg-descr webcamd/pkg-descr --- webcamd.orig/pkg-descr 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/pkg-descr 2010-12-10 22:34:45.000000000 +0100 @@ -5,4 +5,6 @@ currently depends on libc, pthreads, libusb and the CUSE4BSD kernel module. +LICENSE: GPLv2 + WWW: http://www.selasky.org/hans_petter/video4bsd/ diff -u -r webcamd.orig/pkg-plist webcamd/pkg-plist --- webcamd.orig/pkg-plist 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/pkg-plist 2010-12-12 22:23:16.000000000 +0100 @@ -1,2 +1,48 @@ etc/devd/webcamd.conf sbin/webcamd +%%MANPAGES%%man/man4/au0828.4.gz +%%MANPAGES%%man/man4/benq.4.gz +%%MANPAGES%%man/man4/bttv.4.gz +%%MANPAGES%%man/man4/conex.4.gz +%%MANPAGES%%man/man4/cpiax.4.gz +%%MANPAGES%%man/man4/cx23885.4.gz +%%MANPAGES%%man/man4/cx88.4.gz +%%MANPAGES%%man/man4/em28xx.4.gz +%%MANPAGES%%man/man4/et61x251.4.gz +%%MANPAGES%%man/man4/finepix.4.gz +%%MANPAGES%%man/man4/gl860.4.gz +%%MANPAGES%%man/man4/ibmcam.4.gz +%%MANPAGES%%man/man4/ivtv.4.gz +%%MANPAGES%%man/man4/jeilinj.4.gz +%%MANPAGES%%man/man4/m5602.4.gz +%%MANPAGES%%man/man4/mars.4.gz +%%MANPAGES%%man/man4/meye.4.gz +%%MANPAGES%%man/man4/mr97310a.4.gz +%%MANPAGES%%man/man4/ov519.4.gz +%%MANPAGES%%man/man4/ov534.4.gz +%%MANPAGES%%man/man4/pacxxx.4.gz +%%MANPAGES%%man/man4/pvrusb2.4.gz +%%MANPAGES%%man/man4/pwc.4.gz +%%MANPAGES%%man/man4/saa7134.4.gz +%%MANPAGES%%man/man4/saa7164.4.gz +%%MANPAGES%%man/man4/se401.4.gz +%%MANPAGES%%man/man4/si470x.4.gz +%%MANPAGES%%man/man4/sn9c102.4.gz +%%MANPAGES%%man/man4/sn9c20x.4.gz +%%MANPAGES%%man/man4/sonixj.4.gz +%%MANPAGES%%man/man4/spca5xx.4.gz +%%MANPAGES%%man/man4/sq905c.4.gz +%%MANPAGES%%man/man4/stk014.4.gz +%%MANPAGES%%man/man4/stv06xx.4.gz +%%MANPAGES%%man/man4/sunplus.4.gz +%%MANPAGES%%man/man4/t613.4.gz +%%MANPAGES%%man/man4/tv8532.4.gz +%%MANPAGES%%man/man4/usbvision.4.gz +%%MANPAGES%%man/man4/vc032x.4.gz +%%MANPAGES%%man/man4/w9966.4.gz +%%MANPAGES%%man/man4/w996x.4.gz +%%MANPAGES%%man/man4/zc0301.4.gz +%%MANPAGES%%man/man4/zc3xx.4.gz +%%MANPAGES%%man/man4/zoran.4.gz +%%MANPAGES%%man/man4/zr364xx.4.gz +%%MANPAGES%%man/man8/webcamd.8.gz --Boundary-00=_+JUBNhF8kdGdPfP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012122245.34561.hselasky>