diff options
| author | Luigi Rizzo <luigi@FreeBSD.org> | 2007-02-12 17:26:57 +0000 |
|---|---|---|
| committer | Luigi Rizzo <luigi@FreeBSD.org> | 2007-02-12 17:26:57 +0000 |
| commit | 64b2589784b497eacf19330d32ec4f86c0c0a444 (patch) | |
| tree | 8bbf4b26def60655ed27dc27fe3c95012327c25c /mbone/vic/files/patch-configure.in | |
| parent | - Update to 1.0.5 (diff) | |
Add support for video4linux devices by:
- adding a build dependency on v4l_compat;
- fixing the paths to locate videodev.h in configure.in,
and disabling the (incorrect) check for V4L2;
- correct the paths in grabber-video4linux.cpp, and also add
support for the read() method in addition to mmap.
On the mailing list there was a suggestion to remove the
hardwired path in favour of a variable ( %%LOCALBASE%% or so)
based one. But this configure.in is full of hardwired paths,
so fixing one doesn't help at all, and the full fix would take
more time and knowledge that i have.
Notes
Notes:
svn path=/head/; revision=185021
Diffstat (limited to 'mbone/vic/files/patch-configure.in')
| -rw-r--r-- | mbone/vic/files/patch-configure.in | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/mbone/vic/files/patch-configure.in b/mbone/vic/files/patch-configure.in index 4d687b5fd931..aac7387cf554 100644 --- a/mbone/vic/files/patch-configure.in +++ b/mbone/vic/files/patch-configure.in @@ -1,19 +1,29 @@ --- configure.in.orig Thu Jul 10 16:55:43 2003 -+++ configure.in Sat Jan 27 01:57:23 2007 -@@ -76,12 +76,6 @@ - V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o" - fi ++++ configure.in Mon Feb 12 17:58:29 2007 +@@ -69,18 +69,11 @@ + if test -r /usr/include/machine/ioctl_meteor.h ; then + V_OBJ_GRABBER="video/grabber-meteor.o $V_OBJ_GRABBER" fi +-if test -r /usr/include/linux/videodev.h ; then +- if grep V4L2 /usr/include/linux/videodev.h >/dev/null 2>&1 ; then +- V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o" +- else +- V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o" +- fi +-fi -#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then -if test -r /usr/local/lib/libspigot.a ; then - V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER" - V_LIB_GRABBER="$V_LIB_GRABBER -lspigot" -- V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include" --fi ++if test -r /usr/local/include/linux/videodev.h ; then + V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include" ++ V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o" ++ # no V4L2 support yet. ++ # V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o" + fi if test "$qcamdir" != "" ; then V_OBJ_GRABBER="video/grabber-qcam.o $V_OBJ_GRABBER" - V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I$qcamdir" -@@ -254,6 +248,7 @@ +@@ -254,6 +247,7 @@ else V_DEFINE="$V_DEFINE -DFreeBSD" fi |