From owner-svn-ports-branches@freebsd.org Sun Jan 22 08:14:17 2017 Return-Path: Delivered-To: svn-ports-branches@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 1A06ACBCE7E; Sun, 22 Jan 2017 08:14:17 +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 C53DDEB2; Sun, 22 Jan 2017 08:14:16 +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 v0M8EFKU006208; Sun, 22 Jan 2017 08:14:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0M8EFZm006205; Sun, 22 Jan 2017 08:14:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701220814.v0M8EFZm006205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 22 Jan 2017 08:14:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432097 - in branches/2017Q1/devel/ptlib: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 08:14:17 -0000 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.