kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[svxlink] make this compile / run on FreeBSD-HEAD again.

Browse source 
I've also submitted the patches upstream.

Approved by:	db
Differential Revision:	https://reviews.freebsd.org/D12680
This commit is contained in:
Adrian Chadd 2017-10-16 19:28:11 +00:00
parent ac14aac525
commit b632376f44
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=452246
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
comms/svxlink/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME?= svxlink
PORTVERSION= 15.11
PORTREVISION= 1
CATEGORIES= comms hamradio
MAINTAINER= hamradio@FreeBSD.org
@ -10,10 +11,6 @@ COMMENT?= General purpose ham radio voice services
LICENSE= GPLv2
BROKEN= does not build since newer libsigc++20
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2017-11-09
LIB_DEPENDS?= libgsm.so:audio/gsm \
libspeex.so:audio/speex \
libgpg-error.so:security/libgpg-error \

11
comms/svxlink/files/patch-src_async_core_AsyncTcpServer.cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/async/core/AsyncTcpServer.cpp.orig 2015-11-22 16:03:59 UTC
+++ src/async/core/AsyncTcpServer.cpp
@@ -198,7 +198,7 @@ TcpServer::TcpServer(const string& port_str, const Asy
{
addr.sin_addr = bind_ip.ip4Addr();
}
- if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0)
+ if (::bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) != 0)
{
perror("bind");
cleanup();

11
comms/svxlink/files/patch-src_async_core_AsyncUdpSocket.cpp Normal file
View file

@ -0,0 +1,11 @@
--- src/async/core/AsyncUdpSocket.cpp.orig 2015-11-22 16:03:59 UTC
+++ src/async/core/AsyncUdpSocket.cpp
@@ -189,7 +189,7 @@ UdpSocket::UdpSocket(uint16_t local_port, const IpAddr
{
addr.sin_addr = bind_ip.ip4Addr();
}
- if(bind(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))
+ if(::bind(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr))
== -1)
{
perror("bind");