Date: Thu, 28 Jan 2010 21:41:58 +0300 From: Andrey V. Elsukov <bu7cher@yandex.ru> To: Thomas Zander <thomas.e.zander@googlemail.com> Cc: freebsd-multimedia@freebsd.org Subject: Re: Re: [RFC/RFT][patch] multimedia/mplayer with TV-V4L support Message-ID: <24531264704118@webmail104.yandex.ru> In-Reply-To: <786602c61001271322n2020ebcraa9023768788b629@mail.gmail.com> References: <201001101437.37269.hselasky@c2i.net> <4B602067.4030702@yandex.ru> <4B6022B2.8030900@yandex.ru> <786602c61001271322n2020ebcraa9023768788b629@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 28.01.10, 17:57, "Thomas Zander" <thomas.e.zander@googlemail.com>: > We are actually in the process of getting a very recent mplayer > snapshot into the ports tree. You might want to have a look at my > posting to ports@ on 17 January. You can find the new port for testing > at this location: > http://www.rrr.de/~riggs/mplayer/m20100117.tar.bz2 > > I'd appreciate if you sent me a patch that gets your v4l working > against the files in this tarball. I'll make sure it'll be part of the > next big mplayer update to hit the ports tree soonish. I updated patch. It works for me. -- WBR, Andrey V. Elsukov [-- Attachment #2 --] diff -burNp mplayer.orig/Makefile mplayer/Makefile --- mplayer.orig/Makefile 2010-01-17 18:18:38.000000000 +0300 +++ mplayer/Makefile 2010-01-28 18:38:56.614951484 +0300 @@ -60,6 +60,7 @@ OPTIONS+= LIBCDIO "Enable libcdio suppor OPTIONS+= CDPARANOIA "Enable cdparanoia support" off OPTIONS+= LIBLZO "Enable external liblzo library" off OPTIONS+= JOYSTICK "Enable joystick support" off +OPTIONS+= V4L "Enable Video4Linux TV support" off MAN1= mplayer.1 MANCOMPRESSED= no diff -burNp mplayer.orig/Makefile.options mplayer/Makefile.options --- mplayer.orig/Makefile.options 2010-01-17 04:36:58.000000000 +0300 +++ mplayer/Makefile.options 2010-01-28 20:07:06.481424736 +0300 @@ -217,3 +217,18 @@ LIB_DEPENDS+= opencore-amrwb.0:${PORTSD CONFIGURE_ARGS+= --disable-libopencore_amrnb \ --disable-libopencore_amrwb .endif + +.if defined(WITH_V4L) +LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l +CONFIGURE_ARGS+= --enable-tv-v4l1 \ + --enable-tv-v4l2 +EXTRA_LIBS+= -lv4l1 -lv4l2 +.else +CONFIGURE_ARGS+= --disable-tv-v4l1 \ + --disable-tv-v4l2 +.endif + +.if defined(EXTRA_LIBS) +CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}" +.endif + diff -burNp mplayer.orig/Makefile.shared mplayer/Makefile.shared --- mplayer.orig/Makefile.shared 2010-01-17 15:24:45.000000000 +0300 +++ mplayer/Makefile.shared 2010-01-28 18:58:52.122438329 +0300 @@ -22,9 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ TMPDIR="${WRKSRC}" -CONFIGURE_ARGS= --disable-tv-v4l1 \ - --disable-tv-v4l2 \ - --disable-bitmap-font +CONFIGURE_ARGS= --disable-bitmap-font CONFIGURE_LOG= configure.log diff -burNp mplayer.orig/files/patch-stream-tvi_v4lx mplayer/files/patch-stream-tvi_v4lx --- mplayer.orig/files/patch-stream-tvi_v4lx 1970-01-01 03:00:00.000000000 +0300 +++ mplayer/files/patch-stream-tvi_v4lx 2010-01-28 19:05:51.000000000 +0300 @@ -0,0 +1,42 @@ +--- stream/tvi_v4l.c 2007-10-07 23:49:26.000000000 +0400 ++++ stream/tvi_v4l.c 2010-01-27 13:42:17.781746063 +0300 +@@ -48,6 +48,14 @@ + + #include "audio_in.h" + ++#include <libv4l1.h> ++#define open v4l1_open ++#define close v4l1_close ++#define dup v4l1_dup ++#define ioctl v4l1_ioctl ++#define mmap v4l1_mmap ++#define munmap v4l1_munmap ++ + static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param); + + tvi_info_t tvi_info_v4l = { +--- stream/tvi_v4l2.c 2007-10-07 23:49:26.000000000 +0400 ++++ stream/tvi_v4l2.c 2010-01-27 13:25:47.000000000 +0300 +@@ -38,7 +38,6 @@ known issues: + #ifdef HAVE_SYS_SYSINFO_H + #include <sys/sysinfo.h> + #endif +-#include <linux/types.h> + #include <linux/videodev2.h> + #include "mp_msg.h" + #include "libmpcodecs/img_format.h" +@@ -46,6 +46,14 @@ known issues: + #include "tv.h" + #include "audio_in.h" + ++#include <libv4l2.h> ++#define open v4l2_open ++#define close v4l2_close ++#define dup v4l2_dup ++#define ioctl v4l2_ioctl ++#define mmap v4l2_mmap ++#define munmap v4l2_munmap ++ + #define info tvi_info_v4l2 + static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param); + /* information about this file */ diff -burNp mencoder.orig/Makefile mencoder/Makefile --- mencoder.orig/Makefile 2010-01-17 04:37:15.000000000 +0300 +++ mencoder/Makefile 2010-01-28 19:46:05.223402558 +0300 @@ -43,6 +43,7 @@ OPTIONS+= FRIBIDI "Enable FriBiDi suppor OPTIONS+= LIBCDIO "Enable libcdio support" off OPTIONS+= CDPARANOIA "Enable cdparanoia support" off OPTIONS+= LIBLZO "Enable external liblzo library" off +OPTIONS+= V4L "Enable Video4Linux TV support" off MLINKS= mplayer.1 mencoder.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?24531264704118>