svn commit: r432097 - in branches/2017Q1/devel/ptlib: . files

[Jan Beich]

Author: jbeich
Date: Sun Jan 22 08:14:15 2017
New Revision: 432097
URL: https://svnweb.freebsd.org/changeset/ports/432097

Log:
  MFH: r432013
  
  devel/ptlib: properly detect mmap(2) failure
  
  PR:		216019
  Approved by:	ports-secteam (junovitch)

Added:
  branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx
     - copied unchanged from r432013, head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx
  branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx
     - copied unchanged from r432013, head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx
Modified:
  branches/2017Q1/devel/ptlib/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/devel/ptlib/Makefile
==============================================================================
--- branches/2017Q1/devel/ptlib/Makefile	Sun Jan 22 07:50:39 2017	(r432096)
+++ branches/2017Q1/devel/ptlib/Makefile	Sun Jan 22 08:14:15 2017	(r432097)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ptlib
 PORTVERSION=	2.10.11
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 

Copied: branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx (from r432013, head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx	Sun Jan 22 08:14:15 2017	(r432097, copy of r432013, head/devel/ptlib/files/patch-plugins_vidinput__bsd_vidinput__bsd.cxx)
@@ -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;

Copied: branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx (from r432013, head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx	Sun Jan 22 08:14:15 2017	(r432097, copy of r432013, head/devel/ptlib/files/patch-plugins_vidinput__v4l_vidinput__v4l.cxx)
@@ -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.