From owner-svn-ports-head@freebsd.org  Sat Jan 21 04:40:07 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0C6DCBA344;
 Sat, 21 Jan 2017 04:40:07 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A7BDE165E;
 Sat, 21 Jan 2017 04:40:07 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0L4e6hC024619;
 Sat, 21 Jan 2017 04:40:06 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L4e6EX024616;
 Sat, 21 Jan 2017 04:40:06 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201701210440.v0L4e6EX024616@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 21 Jan 2017 04:40:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r432013 - in head/devel/ptlib: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Jan 2017 04:40:08 -0000

Author: jbeich
Date: Sat Jan 21 04:40:06 2017
New Revision: 432013
URL: https://svnweb.freebsd.org/changeset/ports/432013

Log:
  devel/ptlib: properly detect mmap(2) failure
  
  PR:		216019
  MFH:		2017Q1

Added:
  head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx   (contents, props changed)
  head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx   (contents, props changed)
Modified:
  head/devel/ptlib/Makefile   (contents, props changed)

Modified: head/devel/ptlib/Makefile
==============================================================================
--- head/devel/ptlib/Makefile	Sat Jan 21 04:39:52 2017	(r432012)
+++ head/devel/ptlib/Makefile	Sat Jan 21 04:40:06 2017	(r432013)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ptlib
 PORTVERSION=	2.10.11
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 

Added: head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx	Sat Jan 21 04:40:06 2017	(r432013)
@@ -0,0 +1,11 @@
+--- plugins/vidinput_bsd/vidinput_bsd.cxx.orig	2013-08-14 23:20:28 UTC
++++ plugins/vidinput_bsd/vidinput_bsd.cxx
+@@ -308,7 +308,7 @@ PBoolean PVideoInputDevice_BSDCAPTURE::G
+ 
+     mmap_size = frameBytes;
+     videoBuffer = (BYTE *)::mmap(0, mmap_size, PROT_READ, 0, videoFd, 0);
+-    if (videoBuffer < 0) {
++    if (videoBuffer == MAP_FAILED) {
+       return PFalse;
+     } else {
+       canMap = 1;

Added: head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx	Sat Jan 21 04:40:06 2017	(r432013)
@@ -0,0 +1,11 @@
+--- plugins/vidinput_v4l/vidinput_v4l.cxx.orig	2013-08-14 23:20:28 UTC
++++ plugins/vidinput_v4l/vidinput_v4l.cxx
+@@ -978,7 +978,7 @@ PBoolean PVideoInputDevice_V4L::GetFrame
+     } else {
+       videoBuffer = (BYTE *)::mmap(0, frame.size, PROT_READ|PROT_WRITE, MAP_SHARED, videoFd, 0);
+      
+-      if (videoBuffer < 0) {
++      if (videoBuffer == MAP_FAILED) {
+         canMap = 0;
+         PTRACE(3, "VideoGrabber " << deviceName << " cannot do memory mapping - ::mmap failed.");
+         //This video device cannot do memory mapping.