From owner-freebsd-multimedia@FreeBSD.ORG Wed Sep 1 20:17:14 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 A8B7510656AA; Wed, 1 Sep 2010 20:17:14 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe07.swip.net [212.247.154.193]) by mx1.freebsd.org (Postfix) with ESMTP id 51CB68FC13; Wed, 1 Sep 2010 20:17:12 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=8nVFKzxAJNCZJh2yHDOpnep+nZeeqVU+af0AVP5CZ7Y= c=1 sm=1 a=1WFq_yoiUcEA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=NzO03xj1007V8k534y0A:9 a=uExydJmUV58Az-TQ6wOU0CF-zxcA:4 a=wPNLvfGTeEIA:10 a=ndaoGXS1AAAA:8 a=CiMSBHh-DkIk7CVusWQA:9 a=Chf0PF5U4sWZ4sDHhuF_b9EO7cAA:4 a=3j_npBZx3eNP3_sAtSEA:9 a=4Ri-jnecF7k7C_jDDnQA:7 a=meC3T-9zBvtw5PYPeCTKhaLIoFoA:4 a=MnI1ikcADjEx7bvsp0jZvQ==:117 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe07.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 14468258; Wed, 01 Sep 2010 22:16:57 +0200 Received-SPF: softfail receiver=mailfe07.swip.net; client-ip=188.126.201.140; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: freebsd-multimedia@freebsd.org Date: Wed, 1 Sep 2010 22:13:03 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.4.5; amd64; ; ) References: <4C66C4BC.4040504@janh.de> <201008312058.16445.hselasky@freebsd.org> <20100901175422.GA12485@triton8.kn-bremen.de> In-Reply-To: <20100901175422.GA12485@triton8.kn-bremen.de> 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=_PPrfMviu67kflU7" Message-Id: <201009012213.03859.hselasky@freebsd.org> Cc: me@janh.de, kwm@freebsd.org, kde@freebsd.org, Juergen Lock , Joe Marcus Clarke , gnome@freebsd.org Subject: New version of webcamd and cuse4bsd available 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: Wed, 01 Sep 2010 20:17:14 -0000 --Boundary-00=_PPrfMviu67kflU7 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi, Please find ports patches attached for cuse4bsd and webcamd ports. Please test and report any bugs. News: - Add support for GNU/kFreeBSD - Add support for DBUS/HAL registration - Add support for more DVB tuner frontends - Add support for multi-antenna DVB adapters - Update to latest version of Linux DVB code --HPS --Boundary-00=_PPrfMviu67kflU7 Content-Type: text/x-patch; charset="iso-8859-1"; name="cuse4bsd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cuse4bsd.diff" diff -u -r cuse4bsd-kmod.orig/Makefile cuse4bsd-kmod/Makefile --- cuse4bsd-kmod.orig/Makefile 2010-09-01 21:55:46.000000000 +0200 +++ cuse4bsd-kmod/Makefile 2010-09-01 21:57:15.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= cuse4bsd-kmod -PORTVERSION= 0.1.12 +PORTVERSION= 0.1.13 CATEGORIES= multimedia kld MASTER_SITES= http://www.selasky.org/hans_petter/cuse4bsd/releases/ diff -u -r cuse4bsd-kmod.orig/distinfo cuse4bsd-kmod/distinfo --- cuse4bsd-kmod.orig/distinfo 2010-09-01 21:55:46.000000000 +0200 +++ cuse4bsd-kmod/distinfo 2010-09-01 21:57:28.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (cuse4bsd-kmod-0.1.12.tar.bz2) = dde330df068374610b6633853b67191f -SHA256 (cuse4bsd-kmod-0.1.12.tar.bz2) = 5c8196375e2e97338106a823f2131463426b10fb2f2a3b1a05db131db04be7a5 -SIZE (cuse4bsd-kmod-0.1.12.tar.bz2) = 12656 +MD5 (cuse4bsd-kmod-0.1.13.tar.bz2) = b4f4744cea02702519f0dc99fad9c55d +SHA256 (cuse4bsd-kmod-0.1.13.tar.bz2) = fb22b7bbc87e01d4815dcd2e73230df1c27c94f1efb2d86641b6e118ccf524c7 +SIZE (cuse4bsd-kmod-0.1.13.tar.bz2) = 12677 --Boundary-00=_PPrfMviu67kflU7 Content-Type: text/x-patch; charset="iso-8859-1"; name="webcamd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="webcamd.diff" diff -u -r webcamd.orig/Makefile webcamd/Makefile --- webcamd.orig/Makefile 2010-09-01 20:21:32.000000000 +0200 +++ webcamd/Makefile 2010-09-01 21:45:58.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= webcamd -PORTVERSION= 0.1.14 -PORTREVISION= 1 +PORTVERSION= 0.1.15 CATEGORIES= multimedia MASTER_SITES= http://www.selasky.org/hans_petter/video4bsd/releases/ @@ -25,8 +24,23 @@ LIBDIR= ${PREFIX}/lib +OPTIONS= HAL "Build with HAL and DBUS support" On + .include +MAKE_ARGS+="-j2" + +LIBCUSE=${LIBDIR}/libcuse4bsd.so + +.if defined(WITH_HAL) +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 +.else +LIBHAL= +.endif + .if ${OSVERSION} < 800000 IGNORE= requires FreeBSD 8.0-RELEASE or later .endif @@ -38,6 +52,8 @@ post-install: @${MKDIR} ${PREFIX}/etc/devd @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ + -e "s|%%LIBHAL%%|${LIBHAL}|g" \ + -e "s|%%LIBCUSE%%|${LIBCUSE}|g" \ < ${FILESDIR}/webcamd.conf.in > ${WRKDIR}/webcamd.conf ${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${PREFIX}/etc/devd @${CAT} ${PKGMESSAGE} diff -u -r webcamd.orig/distinfo webcamd/distinfo --- webcamd.orig/distinfo 2010-09-01 20:21:32.000000000 +0200 +++ webcamd/distinfo 2010-09-01 21:49:14.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (webcamd-0.1.14.tar.bz2) = e20b5946ef7e7b4c519303625709b46b -SHA256 (webcamd-0.1.14.tar.bz2) = eedb054dcaa4aced9ef680ab909e3f44d67687495eb264daceccaead8ca87826 -SIZE (webcamd-0.1.14.tar.bz2) = 3583100 +MD5 (webcamd-0.1.15.tar.bz2) = 2a5cd14fb1e6587f6cc2e0aabcb6cc7d +SHA256 (webcamd-0.1.15.tar.bz2) = f9459ec4dac097f5c948a55fb8e34413d42a6f2cda72df21f1a604a7e2d3c6d0 +SIZE (webcamd-0.1.15.tar.bz2) = 3542238 diff -u -r webcamd.orig/files/webcamd.conf.in webcamd/files/webcamd.conf.in --- webcamd.orig/files/webcamd.conf.in 2010-09-01 20:21:32.000000000 +0200 +++ webcamd/files/webcamd.conf.in 2010-09-01 20:45:23.000000000 +0200 @@ -3,5 +3,5 @@ match "subsystem" "INTERFACE"; match "type" "ATTACH"; match "intclass" "(0x0e|0xff)"; - action "env LD_PRELOAD=%%PREFIX%%/lib/libcuse4bsd.so %%PREFIX%%/etc/rc.d/webcamd start $cdev"; + action "env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/etc/rc.d/webcamd start $cdev"; }; diff -u -r webcamd.orig/files/webcamd.in webcamd/files/webcamd.in --- webcamd.orig/files/webcamd.in 2010-09-01 20:21:32.000000000 +0200 +++ webcamd/files/webcamd.in 2010-09-01 21:20:03.000000000 +0200 @@ -10,6 +10,7 @@ # webcamd_enable=${webcamd_enable-"NO"} +hald_enable=${hald_enable-"NO"} . /etc/rc.subr @@ -17,6 +18,11 @@ rcvar=`set_rcvar` command=%%PREFIX%%/sbin/webcamd command_args="-B" + +if [ -n "$hald_enable" ]; then + command_args="$command_args -H" +fi + pidfile="/var/run/webcamd.$cdev.0.pid" load_rc_config $name --Boundary-00=_PPrfMviu67kflU7--