From owner-svn-ports-all@FreeBSD.ORG Sat Aug 30 07:47:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C4DB994; Sat, 30 Aug 2014 07:47:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E035619FD; Sat, 30 Aug 2014 07:47:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U7lWJL075413; Sat, 30 Aug 2014 07:47:32 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U7lWmO075411; Sat, 30 Aug 2014 07:47:32 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201408300747.s7U7lWmO075411@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 30 Aug 2014 07:47:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366591 - in head/multimedia/ffmpeg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Aug 2014 07:47:33 -0000 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