Date: Sun, 28 Jun 2015 10:47:12 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390778 - in head/multimedia/spook: . files Message-ID: <201506281047.t5SAlCLA027048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Sun Jun 28 10:47:11 2015 New Revision: 390778 URL: https://svnweb.freebsd.org/changeset/ports/390778 Log: - Fix V4L support - Add LICENSE - Pass maintainership to submitter PR: 201162 Submitted by: mizhka@gmail.com Modified: head/multimedia/spook/Makefile head/multimedia/spook/files/patch-bswap.h head/multimedia/spook/files/patch-configure.ac head/multimedia/spook/files/patch-input-oss.c head/multimedia/spook/files/patch-md5.c head/multimedia/spook/files/patch-tcp.c Modified: head/multimedia/spook/Makefile ============================================================================== --- head/multimedia/spook/Makefile Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/Makefile Sun Jun 28 10:47:11 2015 (r390778) @@ -3,18 +3,19 @@ PORTNAME= spook PORTVERSION= 20050207 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://www.litech.org/spook/dist/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mizhka@gmail.com COMMENT= Embedded RTP/RTSP/HTTP video streamer +LICENSE= GPLv2 + # TODO: FireWire IIDC support (needs libraw1394, libdc1394). # TODO: Test with Luigi-ified V4L input drivers e.g. pwc, etc. - OPTIONS_DEFINE= JPEG MPEG4 V4L DOCS -OPTIONS_DEFAULT= JPEG V4L +OPTIONS_DEFAULT= MPEG4 V4L MPEG4_DESC= MPEG4 encoding support V4L_DESC= V4L input support @@ -34,7 +35,7 @@ PORTDOCS= * .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJPEG} -USES+= jpeg +USES+= jpeg CONFIGURE_ARGS+= --enable-encoder-jpeg .endif @@ -44,8 +45,9 @@ CONFIGURE_ARGS+= --enable-encoder-mpeg4 .endif .if ${PORT_OPTIONS:MV4L} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -CONFIGURE_ARGS+= --enable-input-v4l +LIB_DEPENDS+= libv4l1.so:${PORTSDIR}/multimedia/libv4l +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +CONFIGURE_ARGS+= --enable-input-v4l2 --enable-input-v4l .endif do-install: Modified: head/multimedia/spook/files/patch-bswap.h ============================================================================== --- head/multimedia/spook/files/patch-bswap.h Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/files/patch-bswap.h Sun Jun 28 10:47:11 2015 (r390778) @@ -1,5 +1,5 @@ ---- bswap.h.orig 2008-09-02 14:40:15.000000000 +0100 -+++ bswap.h 2008-09-02 14:41:51.000000000 +0100 +--- bswap.h.orig 2005-02-08 02:20:14 UTC ++++ bswap.h @@ -6,7 +6,11 @@ #ifndef __BSWAP_H__ #define __BSWAP_H__ Modified: head/multimedia/spook/files/patch-configure.ac ============================================================================== --- head/multimedia/spook/files/patch-configure.ac Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/files/patch-configure.ac Sun Jun 28 10:47:11 2015 (r390778) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2008-09-02 14:40:15.000000000 +0100 -+++ configure.ac 2008-09-02 14:41:51.000000000 +0100 -@@ -55,7 +55,7 @@ +--- configure.ac.orig 2005-02-08 02:23:54 UTC ++++ configure.ac +@@ -55,7 +55,7 @@ AC_ARG_ENABLE(encoder-jpeg, [enable_encoder_jpeg=auto]) case $host in @@ -9,3 +9,11 @@ if test x$enable_input_vdig = xyes; then AC_MSG_ERROR([QuickTime digitizer support is only available on Mac OS X]) fi +@@ -116,6 +116,7 @@ if test x$enable_input_v4l != xno; then + ]]), + [ + AC_MSG_RESULT(yes) ++ LIBS="-lv4l1 $LIBS" + build_input_v4l=true + AC_MSG_CHECKING([for pwc-ioctl.h in the kernel source tree]) + if test -d $linux_source/drivers/usb/media; then Modified: head/multimedia/spook/files/patch-input-oss.c ============================================================================== --- head/multimedia/spook/files/patch-input-oss.c Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/files/patch-input-oss.c Sun Jun 28 10:47:11 2015 (r390778) @@ -1,5 +1,5 @@ ---- input-oss.c.orig 2008-09-02 14:40:15.000000000 +0100 -+++ input-oss.c 2008-09-02 14:41:52.000000000 +0100 +--- input-oss.c.orig 2004-12-06 05:58:04 UTC ++++ input-oss.c @@ -28,7 +28,11 @@ #include <errno.h> #include <pthread.h> Modified: head/multimedia/spook/files/patch-md5.c ============================================================================== --- head/multimedia/spook/files/patch-md5.c Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/files/patch-md5.c Sun Jun 28 10:47:11 2015 (r390778) @@ -1,5 +1,5 @@ ---- md5.c.orig 2008-09-02 14:40:15.000000000 +0100 -+++ md5.c 2008-09-02 14:41:52.000000000 +0100 +--- md5.c.orig 2004-12-09 18:09:09 UTC ++++ md5.c @@ -21,7 +21,11 @@ #include <string.h> #include <sys/types.h> Modified: head/multimedia/spook/files/patch-tcp.c ============================================================================== --- head/multimedia/spook/files/patch-tcp.c Sun Jun 28 09:53:18 2015 (r390777) +++ head/multimedia/spook/files/patch-tcp.c Sun Jun 28 10:47:11 2015 (r390778) @@ -1,6 +1,6 @@ ---- tcp.c.orig 2008-09-02 14:40:15.000000000 +0100 -+++ tcp.c 2008-09-02 14:41:53.000000000 +0100 -@@ -454,7 +454,7 @@ +--- tcp.c.orig 2004-12-29 02:33:21 UTC ++++ tcp.c +@@ -454,7 +454,7 @@ static void do_accept( struct event_info strerror( errno ) ); i = 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506281047.t5SAlCLA027048>