diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-09-19 16:25:04 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-09-19 16:25:04 +0000 |
| commit | f239f09d39598d6639f34eb4c9c617673866ada3 (patch) | |
| tree | 4c2feba3f4d93f351e1da4f32ded1978d68dabd5 /app-laptop/prey/files/prey-0.5.3-mplayer-support.patch | |
| parent | Remove unneeded deps (diff) | |
| download | gentoo-2-f239f09d39598d6639f34eb4c9c617673866ada3.tar.gz gentoo-2-f239f09d39598d6639f34eb4c9c617673866ada3.tar.bz2 gentoo-2-f239f09d39598d6639f34eb4c9c617673866ada3.zip | |
Initial commit. Thanks to Travis Hansen and Thomas Kear for the ebuilds. Bug #305813
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'app-laptop/prey/files/prey-0.5.3-mplayer-support.patch')
| -rw-r--r-- | app-laptop/prey/files/prey-0.5.3-mplayer-support.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch b/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch new file mode 100644 index 000000000000..970f50d751d9 --- /dev/null +++ b/app-laptop/prey/files/prey-0.5.3-mplayer-support.patch @@ -0,0 +1,48 @@ +--- modules/webcam/platform/linux/functions.orig 2011-01-19 22:49:55.457000055 -0700 ++++ modules/webcam/platform/linux/functions 2011-01-20 18:19:11.046000085 -0700 +@@ -9,6 +9,7 @@ + + # do we have streamer installed ? + local streamer=`which streamer` ++ local mencoder=`which mencoder` + if [ -n "$streamer" ]; then + + # take four pictures every 0.5 seconds as JPEG +@@ -37,19 +38,32 @@ + fi + + fi +- ++ elif [ -n "${mencoder}" ]; then ++ # not sure how to do this same thing with mencoder ++ mplayer tv:// -tv driver=v4l2:noaudio:device=/dev/video0 -frames 10 -vo jpeg &> /dev/null ++ if [ $? == 0 ]; then ++ mv 00000010.jpg "${webcam__picture}" > /dev/null ++ rm 000000*.jpg > /dev/null ++ fi + fi + + } + + capture_video() { + +- # we should already know if we do have streamer ++ local frames=$(( $webcam__video_capture_time * $webcam__frames_per_second )) ++ ++ # do we have streamer installed ? ++ local streamer=`which streamer` ++ local mencoder=`which mencoder` ++ + if [ -n "$streamer" ]; then +- +- local frames=$(( $webcam__video_capture_time * $webcam__frames_per_second )) + $streamer -o "$webcam__video" -f yuv2 -F stereo -r $webcam__frames_per_second -t $frames +- ++ elif [ -n "${mencoder}" ]; then ++ ${mencoder} tv:// -tv driver=v4l2:noaudio:device=/dev/video0 -ovc lavc -ffourcc DX50 -ofps ${webcam__frames_per_second} -endpos ${webcam__video_capture_time} -o "${tmpdir}/prey-video.avi" &> /dev/null ++ if [ $? == 0 ]; then ++ webcam__video="${tmpdir}/prey-video.avi" ++ fi + fi + + } |