Date: Sat, 30 Aug 2014 07:47:32 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366591 - in head/multimedia/ffmpeg: . files Message-ID: <201408300747.s7U7lWmO075411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Aug 30 07:47:31 2014 New Revision: 366591 URL: http://svnweb.freebsd.org/changeset/ports/366591 QAT: https://qat.redports.org/buildarchive/r366591/ Log: - Restore V4L2 interface PR: 192579 Submitted by: hselasky@FreeBSD.org Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg/files/patch-configure Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sat Aug 30 07:14:37 2014 (r366590) +++ head/multimedia/ffmpeg/Makefile Sat Aug 30 07:47:31 2014 (r366591) @@ -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/ Modified: head/multimedia/ffmpeg/files/patch-configure ============================================================================== --- head/multimedia/ffmpeg/files/patch-configure Sat Aug 30 07:14:37 2014 (r366590) +++ head/multimedia/ffmpeg/files/patch-configure Sat Aug 30 07:47:31 2014 (r366591) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408300747.s7U7lWmO075411>