Re: [kde-freebsd] New version of webcamd and cuse4bsd available

2010-09-02 Thread Hans Petter Selasky 
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
diff -u -r webcamd.orig/Makefile webcamd/Makefile
--- webcamd.orig/Makefile	2010-09-01 20:21:32.0 +0200
+++ webcamd/Makefile	2010-09-01 22:31:24.0 +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 bsd.port.pre.mk
 
+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}  80
 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.0 +0200
+++ webcamd/distinfo	2010-09-01 22:46:46.0 +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.0 +0200
+++ webcamd/files/webcamd.conf.in	2010-09-01 20:45:23.0 +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=%%LIBHALLIBCUSE%% %%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.0 +0200
+++ webcamd/files/webcamd.in	2010-09-01 21:20:03.0 +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
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] New version of webcamd and cuse4bsd available

2010-09-02 Thread Hans Petter Selasky 
On Thursday 02 September 2010 00:29:55 Jan Henrik Sylvester wrote:
 About the patches themselves: When I tried to apply the patches from 
 /usr/ports/multimedia/, the cuse4bsd one tried to patch 
 /usr/ports/multimedia/Makefile. I applied them from the subdirectories, 
 but had to specify the location of files/*. Eventually, all hunks applied.

cd /usr/ports/multimedia/cuse4bsd
cat cuse4bsd.diff | patch -p1

cd /usr/ports/multimedia/webcamd
cat webcamd.diff | patch -p1

--HPS
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

[kde-freebsd] New version of webcamd and cuse4bsd available

2010-09-01 Thread Hans Petter Selasky 
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
diff -u -r cuse4bsd-kmod.orig/Makefile cuse4bsd-kmod/Makefile
--- cuse4bsd-kmod.orig/Makefile	2010-09-01 21:55:46.0 +0200
+++ cuse4bsd-kmod/Makefile	2010-09-01 21:57:15.0 +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.0 +0200
+++ cuse4bsd-kmod/distinfo	2010-09-01 21:57:28.0 +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
diff -u -r webcamd.orig/Makefile webcamd/Makefile
--- webcamd.orig/Makefile	2010-09-01 20:21:32.0 +0200
+++ webcamd/Makefile	2010-09-01 21:45:58.0 +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 bsd.port.pre.mk
 
+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}  80
 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.0 +0200
+++ webcamd/distinfo	2010-09-01 21:49:14.0 +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.0 +0200
+++ webcamd/files/webcamd.conf.in	2010-09-01 20:45:23.0 +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=%%LIBHALLIBCUSE%% %%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.0 +0200
+++ webcamd/files/webcamd.in	2010-09-01 21:20:03.0 +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
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] kaffeine-1.0 and webcamd based DVB-T?

2010-08-31 Thread Hans Petter Selasky 
On Tuesday 31 August 2010 20:48:15 Juergen Lock wrote:
 On Mon, Aug 30, 2010 at 11:22:20PM +0200, Hans Petter Selasky wrote:
  Hi,
 
 Hi!
 
  I've committed to the HAL stuff to webcamd in the I4B SVN as of r1628. To
  enable HAL support build like this:
  
  make -j3 HAVE_HAL=YES LIBDIR=/usr/local/lib
  
  Run like this:
  
  ./webcamd -H
 
  There's an initialization missing so the code did nothing...
 (works now for dvb, v4l untested due to lack of device.)
 
  Cheers,
   Juergen
 
 Index: webcamd_hal.c
 ===
 --- webcamd_hal.c (revision 1628)
 +++ webcamd_hal.c (working copy)
 @@ -69,6 +69,8 @@
   char **ppdev;
   int n;
 
 + if (!(hal_conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL)))
 + return;
   hal_ctx = libhal_ctx_new();
   if (hal_ctx == NULL)
   return;

Committed to r1629.

Thanks!

--HPS
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] kaffeine-1.0 and webcamd based DVB-T?

2010-08-30 Thread Hans Petter Selasky 
Hi,

I've committed to the HAL stuff to webcamd in the I4B SVN as of r1628. To 
enable HAL support build like this:

make -j3 HAVE_HAL=YES LIBDIR=/usr/local/lib

Run like this:

./webcamd -H

--HPS
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] kaffeine-1.0 and webcamd based DVB-T?

2010-08-25 Thread Hans Petter Selasky 
On Tuesday 24 August 2010 23:50:41 Joe Marcus Clarke wrote:
 On 8/24/10 5:17 PM, Hans Petter Selasky wrote:
  On Tuesday 24 August 2010 23:13:02 Joe Marcus Clarke wrote:
  Oh, and webcamd's rc.d script will need to be updated to depend on hald.
  
  That's a problem, because then we need to make devd rc-script depend on
  hald too.
 
 That can't happen as hald requires devd for device hotplug updates.  If
 webcamd is calling hal-device, why does devd need to depend on hald?
 

I didn't know that. Then it should be Ok.

--HPS
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] kaffeine-1.0 and webcamd based DVB-T?

2010-08-24 Thread Hans Petter Selasky 
On Tuesday 24 August 2010 23:13:02 Joe Marcus Clarke wrote:
 Oh, and webcamd's rc.d script will need to be updated to depend on hald.

That's a problem, because then we need to make devd rc-script depend on hald 
too.

--HPS
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] [patch] USB video support in KDE4 + sane + more under FreeBSD

2009-11-15 Thread Hans Petter Selasky 
On Sunday 15 November 2009 00:07:38 Raphael Kubo da Costa wrote:
 On Sunday 11 October 2009 06:58:11 Hans Petter Selasky wrote:
  Hi,
 
  I was compiling the latest version of KDE4 on my box and I noticed it
   picked up my installed libv4l2. The only problem is that you need some
   patches before everything is compiling :-)
 
  About libv4lX on FreeBSD, please see:
 
  http://lists.freebsd.org/pipermail/freebsd-emulation/2009-June/006231.htm
 l
 
  Only USB webcams supported yet.
 
  After installation manually add -lv4lxdrivers to all the libv4l*.pc
  files! I will try to get this included into my ulinux distribution soon.
 
  Before:
  Libs: -L${libdir} -lv4lconvert
  After:
  Libs: -L${libdir} -lv4lconvert -lv4lxdrivers
 
  /usr/local/lib/pkgconfig/libv4lconvert.pc
  /usr/local/lib/pkgconfig/libv4l2.pc
  /usr/local/lib/pkgconfig/libv4l1.pc
 
  Then patch KDE4 like this:
 
  ---
  
  /usr/ports/net/kdenetwork4/work/kdenetwork-4.3.1/kopete/libkopete/avdevic
 e /videodevice.h.orig   2009-10-11 11:41:54.0 +0200 +++
  /usr/ports/net/kdenetwork4/work/kdenetwork-4.3.1/kopete/libkopete/avdevic
 e /videodevice.h2009-10-11 11:44:34.0 +0200 @@ -62,6 +62,13 @@
 
   #endif // __linux__
 
  +#if defined(__FreeBSD__)  defined(ENABLE_AV)
  +#include linux/videodev.h
  +#ifdef HAVE_LIBV4L2
  +#include libv4l2.h
  +#endif // HAVE_V4L2
  +#endif
  +
   #include qstring.h
   #include qfile.h
   #include qimage.h
 
  And don't forget to chown /dev/usb/X.Y.* [webcam USB device] to the user
   running the webcam application.
 
  --HPS

 Hi there,

 I was thinking of committing the KDE part upstream. Is it OK to commit it
 like this (is it expected to work with 7.x too, for example)?

 Cheers,
 Raphael

Hi,

If libv4l2 is not present in the system, then adding those includes is not 
harmful, I think. Though I have not tried on FreeBSD 7.

BTW: The last:

  +#endif // HAVE_V4L2

Should be:

  +#endif // HAVE_LIBV4L2

--HPS

___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information