From owner-freebsd-gnome@FreeBSD.ORG Wed Sep 1 21:08:22 2010 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DD0C10656AA; Wed, 1 Sep 2010 21:08:22 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe04.swip.net [212.247.154.97]) by mx1.freebsd.org (Postfix) with ESMTP id E949F8FC0C; Wed, 1 Sep 2010 21:08:20 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=bqAX4Es/FymT96iuQFWdNJXS7SazJpmZM5WIJFHIREc= c=1 sm=1 a=gFZFNxR00aAA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=DDJ941IIOSnLeK3J4KEA:9 a=QMMzQZlSWBddAHguyR70AVWR2yUA:4 a=PUjeQqilurYA:10 a=ndaoGXS1AAAA:8 a=3j_npBZx3eNP3_sAtSEA:9 a=2-UCU8V-o7x3_Ykrz44A:7 a=2lojoW0sZmsN7PFaG5qkZy0Yc8kA:4 a=MnI1ikcADjEx7bvsp0jZvQ==:117 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe04.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 15232308; Wed, 01 Sep 2010 22:58:05 +0200 From: Hans Petter Selasky To: freebsd-multimedia@freebsd.org Date: Wed, 1 Sep 2010 22:54:10 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.4.5; amd64; ; ) References: <4C66C4BC.4040504@janh.de> <20100901175422.GA12485@triton8.kn-bremen.de> <201009012213.03859.hselasky@freebsd.org> In-Reply-To: <201009012213.03859.hselasky@freebsd.org> 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=_y1rfM1mnJpBAJAd" Message-Id: <201009012254.10691.hselasky@c2i.net> Cc: me@janh.de, kwm@freebsd.org, kde@freebsd.org, Juergen Lock , Joe Marcus Clarke , gnome@freebsd.org Subject: Re: New version of webcamd and cuse4bsd available X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Sep 2010 21:08:22 -0000 --Boundary-00=_y1rfM1mnJpBAJAd Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit On Wednesday 01 September 2010 22:13:03 Hans Petter Selasky wrote: > 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 Please find attached new webcamd.diff, fixing a minor problem with HAL registration during bootup. --HPS --Boundary-00=_y1rfM1mnJpBAJAd Content-Type: text/x-patch; charset="iso-8859-15"; 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 22:31:24.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= webcamd -PORTVERSION= 0.1.14 -PORTREVISION= 1 +PORTVERSION= 0.1.16 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 22:46:46.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.16.tar.bz2) = 2e48673e4f729ac4ebfcbddf9985c18e +SHA256 (webcamd-0.1.16.tar.bz2) = ab5e5b7253414c822ce434317e5a0b0c82827765433bf4d115812d6e5ad8b192 +SIZE (webcamd-0.1.16.tar.bz2) = 3543806 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 Only in webcamd: work --Boundary-00=_y1rfM1mnJpBAJAd--