From owner-svn-ports-head@FreeBSD.ORG  Fri Jan  9 17:58:47 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 68E4299D;
 Fri,  9 Jan 2015 17:58:47 +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 3B2CD7F2;
 Fri,  9 Jan 2015 17:58:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t09Hwlh8091432;
 Fri, 9 Jan 2015 17:58:47 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t09HwlPU091431;
 Fri, 9 Jan 2015 17:58:47 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201501091758.t09HwlPU091431@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 9 Jan 2015 17:58:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r376630 - head/multimedia/mjpegtools/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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2015 17:58:47 -0000

Author: antoine
Date: Fri Jan  9 17:58:46 2015
New Revision: 376630
URL: https://svnweb.freebsd.org/changeset/ports/376630
QAT: https://qat.redports.org/buildarchive/r376630/

Log:
  Allow building with libc++ r224926
  
  PR:		ports/196629
  Submitted by:	dim@

Added:
  head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc   (contents, props changed)

Added: head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mjpegtools/files/patch-yuvdeinterlace_yuvdeinterlace.cc	Fri Jan  9 17:58:46 2015	(r376630)
@@ -0,0 +1,33 @@
+--- yuvdeinterlace/yuvdeinterlace.cc.orig	2009-09-19 18:16:47 UTC
++++ yuvdeinterlace/yuvdeinterlace.cc
+@@ -918,7 +918,7 @@ int
+ main (int argc, char *argv[])
+ {
+   int frame = 0;
+-  int errno = 0;
++  int error = 0;
+   int ss_h, ss_v;
+ 
+   deinterlacer YUVdeint;
+@@ -1009,10 +1009,10 @@ main (int argc, char *argv[])
+   y4m_init_frame_info (&YUVdeint.Y4MStream.oframeinfo);
+ 
+ /* open input stream */
+-  if ((errno = y4m_read_stream_header (YUVdeint.Y4MStream.fd_in,
++  if ((error = y4m_read_stream_header (YUVdeint.Y4MStream.fd_in,
+ 				       &YUVdeint.Y4MStream.istreaminfo)) != Y4M_OK)
+     {
+-      mjpeg_error_exit1 ("Couldn't read YUV4MPEG header: %s!", y4m_strerr (errno));
++      mjpeg_error_exit1 ("Couldn't read YUV4MPEG header: %s!", y4m_strerr (error));
+     }
+ 
+   /* get format information */
+@@ -1089,7 +1089,7 @@ main (int argc, char *argv[])
+   y4m_write_stream_header (YUVdeint.Y4MStream.fd_out, &YUVdeint.Y4MStream.ostreaminfo);
+ 
+   /* read every frame until the end of the input stream and process it */
+-  while (Y4M_OK == (errno = y4m_read_frame (YUVdeint.Y4MStream.fd_in,
++  while (Y4M_OK == (error = y4m_read_frame (YUVdeint.Y4MStream.fd_in,
+ 					    &YUVdeint.Y4MStream.istreaminfo,
+ 					    &YUVdeint.Y4MStream.iframeinfo, YUVdeint.inframe)))
+     {