diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-06-08 02:33:41 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-06-08 02:33:41 +0000 |
| commit | 83d5b351ba62e7cfbc649f6e3a9ce6a863ee765d (patch) | |
| tree | bd2848b1d14ed0380220d437e28609509f2cab1d /multimedia/ffmpeg-devel/Makefile | |
| parent | 8532428a7f060e94edf556ed9f56588b336bfa2f (diff) | |
I) Update to snapshot 20050607
II) Improve the bktr(4) device grab code [1] in sync with
multimedia/ffmpeg/files/grab_bsdbktr.c revision 1.9
1) Add support for DragonFly
2) Use proper castings
3) Test file descriptors before using them
4) Improve frame capture
5) Fix some errors
6) Clean up the signals on bktr(4) when closing the device
III) Re-enable video capture WITH_VIDEO_CAPTURE due to (II)
Submitted by: Steve O'Hara-Smith <steve@sohara.org> et al [1]
Notes
Notes:
svn path=/head/; revision=137022
Diffstat (limited to 'multimedia/ffmpeg-devel/Makefile')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index da6c7f99a26c..9d824e89f2b1 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -55,7 +55,7 @@ INSTALLS_SHLIB= yes NO_LATEST_LINK= yes CONFLICTS= ffmpeg-[0-9]*-* -RELEASE_DATE= 20050605 +RELEASE_DATE= 20050607 SHLIB_VERSION= 1 MAN1= ffmpeg.1 @@ -83,9 +83,6 @@ LIB_FILES= libavcodec/libavcodec.a libavformat/libavformat.a ## GPLLIBS=yes WITHOUT_LIBA52=yes -# video captuure is not working as of yet -WITH_VIDEO_CAPTURE=no -CONFIGURE_ARGS+=--disable-v4l ## ## support detection @@ -99,6 +96,8 @@ WITH_IPV6= yes ## .if ${ARCH} != "i386" WITHOUT_MMX= yes +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-bktr-patch-libavformat::Makefile .endif ## @@ -415,6 +414,11 @@ pre-everything:: @${ECHO_MSG} .endif .if ${ARCH} == "i386" +. ifndef(WITH_VIDEO_CAPTURE) + @${ECHO_MSG} 'Define WITH_VIDEO_CAPTURE to enable bktr(4) driver' + @${ECHO_MSG} 'video capture' + @${ECHO_MSG} +. else .if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV)) @${ECHO_MSG} @${ECHO_MSG} 'If you want to capture from a bktr(4) supported card' @@ -426,6 +430,7 @@ pre-everything:: @${ECHO_MSG} 'Warning: invalid settings will probably dump cores' @${ECHO_MSG} .endif +. endif # WITH_VIDEO_CAPTURE .endif # ${ARCH} == i386 post-extract: |