diff options
| author | riggs <riggs@FreeBSD.org> | 2014-08-30 15:47:31 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2014-08-30 15:47:31 +0800 |
| commit | d47b146a552226965bb8012d0cf7c28075f426df (patch) | |
| tree | 8c5101936c62e4af70c6bc946d49be5210a4b25b /multimedia/ffmpeg | |
| parent | d31e10aec49f191d58d71a42a74255f24dfa282c (diff) | |
| download | freebsd-ports-gnome-d47b146a552226965bb8012d0cf7c28075f426df.tar.gz freebsd-ports-gnome-d47b146a552226965bb8012d0cf7c28075f426df.tar.zst freebsd-ports-gnome-d47b146a552226965bb8012d0cf7c28075f426df.zip | |
- Restore V4L2 interface
PR: 192579
Submitted by: hselasky@FreeBSD.org
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-configure | 26 |
2 files changed, 12 insertions, 16 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index ca6f86cd7d94..b322d15f5014 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.2.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index e827011a9af8..c0348238280f 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -1,5 +1,16 @@ --- configure.orig +++ configure +@@ -1961,8 +1961,8 @@ + sndio_indev_deps="sndio_h" + sndio_outdev_deps="sndio_h" + v4l_indev_deps="linux_videodev_h" +-v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" +-v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" ++v4l2_indev_deps_any="linux_videodev2_h" ++v4l2_outdev_deps_any="linux_videodev2_h" + vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" + vfwcap_indev_extralibs="-lavicap32" + xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" @@ -2147,7 +2147,7 @@ yasmexe_default="yasm" nogas=":" @@ -9,21 +20,6 @@ cpu="generic" # OS -@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl - pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man - rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout - --check_header linux/fb.h --check_header linux/videodev.h --check_header linux/videodev2.h --check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete -+#check_header linux/fb.h -+#check_header linux/videodev.h -+#check_header linux/videodev2.h -+#check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete - - check_header sys/videoio.h - @@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE SRC_PATH:=\$(SRC_PATH:.%=..%) endif |