From owner-freebsd-multimedia@FreeBSD.ORG Fri Dec 10 22:21:20 2010 Return-Path: Delivered-To: freebsd-multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A1671065679; Fri, 10 Dec 2010 22:21:20 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe05.c2i.net [212.247.154.130]) by mx1.freebsd.org (Postfix) with ESMTP id C25178FC15; Fri, 10 Dec 2010 22:21:19 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=5OBHFxb9I47YZ7HELXzI6cL6pwPTRnd5uxbD1DPQ4WY= c=1 sm=1 a=cce_PyCqe9wA:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=dVHeTxxsoWUP2djLzygA:9 a=mMx-29Eo8Vy1fCYe9ymWSi8oM5YA:4 a=CjuIK1q_8ugA:10 a=ndaoGXS1AAAA:8 a=LtXZ0I3sKb7-9NtmYP4A:9 a=OayrWeBeUIQf5FnuOkhzRZnKMSEA:4 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe05.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 59797356; Fri, 10 Dec 2010 23:21:17 +0100 From: Hans Petter Selasky To: kwm@freebsd.org Date: Fri, 10 Dec 2010 23:21:38 +0100 User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.4.5; amd64; ; ) X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_yfqANZ0N9TL653w" Message-Id: <201012102321.38864.hselasky@c2i.net> Cc: freebsd-multimedia@freebsd.org, Dru Lavigne Subject: Webcamd v0.1.17 ready for testing X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Dec 2010 22:21:20 -0000 --Boundary-00=_yfqANZ0N9TL653w 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. Please test and report any issues! NOTE: Have not test built on i386 yet. Only amd64. --HPS --Boundary-00=_yfqANZ0N9TL653w Content-Type: text/x-patch; charset="us-ascii"; name="webcamd-0.1.17.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="webcamd-0.1.17.diff" diff -u -r webcamd.orig/Makefile webcamd/Makefile --- webcamd.orig/Makefile 2010-12-10 22:20:02.000000000 +0100 +++ webcamd/Makefile 2010-12-10 22:52:17.000000000 +0100 @@ -6,7 +6,7 @@ # PORTNAME= webcamd -PORTVERSION= 0.1.16 +PORTVERSION= 0.1.17 CATEGORIES= multimedia MASTER_SITES= http://www.selasky.org/hans_petter/video4bsd/releases/ @@ -18,6 +18,8 @@ LIB_DEPENDS= v4l1.0:${PORTSDIR}/multimedia/libv4l +LICENSE= GPLv2 + USE_RC_SUBR= webcamd USE_BZIP2= yes USE_LDCONFIG= yes @@ -26,13 +28,14 @@ LIBDIR= ${PREFIX}/lib OPTIONS= HAL "Build with HAL and DBUS support" On +OPTIONS+= DBG "Build with debugging support" Off .include 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 +43,10 @@ LIBHAL= .endif +.if defined(WITH_DBG) +MAKE_ARGS+=" HAVE_DEBUG=YES" +.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-10 23:04:14.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.17.tar.bz2) = 41778871a929eab6d753e47b7f24348dfa4484a897ae9678e9b11825bc1c3485 +SIZE (webcamd-0.1.17.tar.bz2) = 3543330 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-10 22:31:37.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 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-10 22:29:05.000000000 +0100 @@ -1,2 +1,48 @@ etc/devd/webcamd.conf sbin/webcamd +man/man4/au0828.4.gz +man/man4/benq.4.gz +man/man4/bttv.4.gz +man/man4/conex.4.gz +man/man4/cpiax.4.gz +man/man4/cx23885.4.gz +man/man4/cx88.4.gz +man/man4/em28xx.4.gz +man/man4/et61x251.4.gz +man/man4/finepix.4.gz +man/man4/gl860.4.gz +man/man4/ibmcam.4.gz +man/man4/ivtv.4.gz +man/man4/jeilinj.4.gz +man/man4/m5602.4.gz +man/man4/mars.4.gz +man/man4/meye.4.gz +man/man4/mr97310a.4.gz +man/man4/ov519.4.gz +man/man4/ov534.4.gz +man/man4/pacxxx.4.gz +man/man4/pvrusb2.4.gz +man/man4/pwc.4.gz +man/man4/saa7134.4.gz +man/man4/saa7164.4.gz +man/man4/se401.4.gz +man/man4/si470x.4.gz +man/man4/sn9c102.4.gz +man/man4/sn9c20x.4.gz +man/man4/sonixj.4.gz +man/man4/spca5xx.4.gz +man/man4/sq905c.4.gz +man/man4/stk014.4.gz +man/man4/stv06xx.4.gz +man/man4/sunplus.4.gz +man/man4/t613.4.gz +man/man4/tv8532.4.gz +man/man4/usbvision.4.gz +man/man4/vc032x.4.gz +man/man4/w9966.4.gz +man/man4/w996x.4.gz +man/man4/zc0301.4.gz +man/man4/zc3xx.4.gz +man/man4/zoran.4.gz +man/man4/zr364xx.4.gz +man/man8/webcamd.8.gz --Boundary-00=_yfqANZ0N9TL653w--