diff options
| -rw-r--r-- | multimedia/webcamd/Makefile | 29 | ||||
| -rw-r--r-- | multimedia/webcamd/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/webcamd/files/webcamd.in | 12 | ||||
| -rw-r--r-- | multimedia/webcamd/pkg-message | 6 |
4 files changed, 36 insertions, 15 deletions
diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile index 85e1a0be93c8..becb3fdc5202 100644 --- a/multimedia/webcamd/Makefile +++ b/multimedia/webcamd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webcamd -PORTVERSION= 3.10.0.7 +PORTVERSION= 3.11.0.2 CATEGORIES= multimedia MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \ http://home.selasky.org:8192/distfiles/ @@ -36,13 +36,18 @@ MAN8= webcamd.8 LIBDIR= ${PREFIX}/lib -OPTIONS_DEFINE= HAL DEBUG VT_CLIENT VT_SERVER -OPTIONS_DEFAULT=HAL +OPTIONS_DEFINE= DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT RADIO WEBCAM +OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM HAL_DESC= Build with HAL and DBUS support DEBUG_DESC= Build with debugging support VT_CLIENT_DESC= Build with vTuner client support VT_SERVER_DESC= Build with vTuner server support +DVB_DESC= Build with USB DVB support (DVB-X, analog TV, ...) +INPUT_DESC= Build with USB input support (tablet, joystick, IR, ...) +RADIO_DESC= Build with USB radio support +WEBCAM_DESC= Build with USB webcam support (UVC, gspca, ...) + USERS= webcamd GROUPS= webcamd @@ -53,6 +58,22 @@ LIBCUSE=${LIBDIR}/libcuse4bsd.so MAKE_ARGS+=" HAVE_MAN=YES" MAKE_ARGS+=" PTHREAD_LIBS=${PTHREAD_LIBS}" +.if ${PORT_OPTIONS:MDVB} +MAKE_ARGS+=" HAVE_DVB_DRV=YES" +.endif + +.if ${PORT_OPTIONS:MINPUT} +MAKE_ARGS+=" HAVE_INPUT_DRV=YES" +.endif + +.if ${PORT_OPTIONS:MRADIO} +MAKE_ARGS+=" HAVE_RADIO_DRV=YES" +.endif + +.if ${PORT_OPTIONS:MWEBCAM} +MAKE_ARGS+=" HAVE_WEBCAM_DRV=YES" +.endif + .if ${PORT_OPTIONS:MHAL} MAKE_ARGS+=" HAVE_HAL=YES" LIBHAL=${LIBDIR}/libhal.so:${LIBDIR}/libdbus-1.so: @@ -83,7 +104,7 @@ IGNORE= requires FreeBSD 8.0-RELEASE or later # do-configure: ${MAKE} -C${WRKSRC}/tools/linux_make - ${MAKE} configure -C${WRKSRC} + ${MAKE} ${MAKE_ARGS} configure -C${WRKSRC} post-patch: @cd ${WRKSRC}/patches; ${SH} ./do_patch.sh diff --git a/multimedia/webcamd/distinfo b/multimedia/webcamd/distinfo index f5f46ac99167..a23b95ee050a 100644 --- a/multimedia/webcamd/distinfo +++ b/multimedia/webcamd/distinfo @@ -1,2 +1,2 @@ -SHA256 (webcamd-3.10.0.7.tar.bz2) = cb038ae7eadfd36f238212b4267c2f99698b2f028738910123b9cd84ebfdace1 -SIZE (webcamd-3.10.0.7.tar.bz2) = 9130543 +SHA256 (webcamd-3.11.0.2.tar.bz2) = f8a6bb8b031b62e3a0506c119ea70bd4674cddec11dae742eecad5024b3ba138 +SIZE (webcamd-3.11.0.2.tar.bz2) = 9317774 diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in index 46a41e075668..c2fd83b4d1ae 100644 --- a/multimedia/webcamd/files/webcamd.in +++ b/multimedia/webcamd/files/webcamd.in @@ -8,6 +8,10 @@ # # webcamd_enable="YES" # +# Optional: +# webcamd_flags="-m v4l2.vflip=1" +# webcamd_flags="-m v4l2.hflip=1" +# webcamd_enable=${webcamd_enable-"NO"} hald_enable=${hald_enable-"NO"} @@ -33,14 +37,6 @@ pidfile="/var/run/webcamd.*.$iface.pid" load_rc_config $name -if [ "$2" = "vflip" ] || [ "$3" = "vflip" ]; then - command_args="$command_args -m v4l2.vflip=1" -fi - -if [ "$2" = "hflip" ] || [ "$3" = "hflip" ]; then - command_args="$command_args -m v4l2.hflip=1" -fi - if [ $# -gt 1 ]; then pidfile="webcamd.dummy" command_args="$command_args -d $2 -i $iface" diff --git a/multimedia/webcamd/pkg-message b/multimedia/webcamd/pkg-message index 529b2272e57d..af2a7894bc99 100644 --- a/multimedia/webcamd/pkg-message +++ b/multimedia/webcamd/pkg-message @@ -10,7 +10,11 @@ or adding to your /boot/loader.conf. -2) Please restart devd as the configuration changed +2) add webcamd_enable="YES" + +to your /etc/rc.conf + +3) Please restart devd as the configuration changed # service devd restart |