svn commit: r473824 - in head/devel/jrtplib: . files

[Rodrigo Osorio]

Author: rodrigo
Date: Tue Jul  3 13:00:33 2018
New Revision: 473824
URL: https://svnweb.freebsd.org/changeset/ports/473824

Log:
  Fix buil for 12.0
  
  - Fix c++ source code
  - Redo existing patch (make makepatch)
  - Bump PORTREVISION

Added:
  head/devel/jrtplib/files/patch-src_rtpudpv4transmitter.cpp   (contents, props changed)
Modified:
  head/devel/jrtplib/Makefile
  head/devel/jrtplib/files/patch-src-rtperrors.h

Modified: head/devel/jrtplib/Makefile
==============================================================================
--- head/devel/jrtplib/Makefile	Tue Jul  3 12:57:24 2018	(r473823)
+++ head/devel/jrtplib/Makefile	Tue Jul  3 13:00:33 2018	(r473824)
@@ -3,6 +3,7 @@
 
 PORTNAME=	jrtplib
 PORTVERSION=	3.11.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://research.edm.uhasselt.be/jori/jrtplib/
 

Modified: head/devel/jrtplib/files/patch-src-rtperrors.h
==============================================================================
--- head/devel/jrtplib/files/patch-src-rtperrors.h	Tue Jul  3 12:57:24 2018	(r473823)
+++ head/devel/jrtplib/files/patch-src-rtperrors.h	Tue Jul  3 13:00:33 2018	(r473824)
@@ -1,5 +1,5 @@
---- src/rtperrors.h.orig	2011-08-29 22:43:27.000000000 +0900
-+++ src/rtperrors.h	2012-09-24 22:25:22.000000000 +0900
+--- src/rtperrors.h.orig	2017-03-28 16:59:02 UTC
++++ src/rtperrors.h
 @@ -39,6 +39,7 @@
  #define RTPERRORS_H
  

Added: head/devel/jrtplib/files/patch-src_rtpudpv4transmitter.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/jrtplib/files/patch-src_rtpudpv4transmitter.cpp	Tue Jul  3 13:00:33 2018	(r473824)
@@ -0,0 +1,38 @@
+--- src/rtpudpv4transmitter.cpp.orig	2017-03-28 16:59:02 UTC
++++ src/rtpudpv4transmitter.cpp
+@@ -188,7 +188,7 @@ int GetAutoSockets(uint32_t bindIP, bool
+ 		addr.sin_family = AF_INET;
+ 		addr.sin_port = 0;
+ 		addr.sin_addr.s_addr = htonl(bindIP);
+-		if (bind(sock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
++		if (::bind(sock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
+ 		{
+ 			RTPCLOSE(sock);
+ 			for (size_t i = 0 ; i < toClose.size() ; i++)
+@@ -255,7 +255,7 @@ int GetAutoSockets(uint32_t bindIP, bool
+ 				addr.sin_family = AF_INET;
+ 				addr.sin_port = htons(secondPort);
+ 				addr.sin_addr.s_addr = htonl(bindIP);
+-				if (bind(sock2,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) == 0)
++				if (::bind(sock2,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) == 0)
+ 				{
+ 					// In this case, we have two consecutive port numbers, the lower of
+ 					// which is even
+@@ -399,7 +399,7 @@ int RTPUDPv4Transmitter::Create(size_t m
+ 			addr.sin_family = AF_INET;
+ 			addr.sin_port = htons(params->GetPortbase());
+ 			addr.sin_addr.s_addr = htonl(bindIP);
+-			if (bind(rtpsock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
++			if (::bind(rtpsock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
+ 			{
+ 				CLOSESOCKETS;
+ 				MAINMUTEX_UNLOCK
+@@ -422,7 +422,7 @@ int RTPUDPv4Transmitter::Create(size_t m
+ 				addr.sin_family = AF_INET;
+ 				addr.sin_port = htons(rtcpport);
+ 				addr.sin_addr.s_addr = htonl(bindIP);
+-				if (bind(rtcpsock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
++				if (::bind(rtcpsock,(struct sockaddr *)&addr,sizeof(struct sockaddr_in)) != 0)
+ 				{
+ 					CLOSESOCKETS;
+ 					MAINMUTEX_UNLOCK