svn commit: r457690 - head/games/pokerth/files
Guido Falsi
madpilot at FreeBSD.org
Sun Dec 31 13:28:38 UTC 2017
Author: madpilot
Date: Sun Dec 31 13:28:37 2017
New Revision: 457690
URL: https://svnweb.freebsd.org/changeset/ports/457690
Log:
Add patches to fix pokerth build with upcoming boost 1.66.
This is a NOP with the current boost version.
PR: 224123
Submitted by: jbeich@
Obtained from: https://github.com/pokerth/pokerth/issues/338
Added:
head/games/pokerth/files/patch-src_net_common_clientthread.cpp (contents, props changed)
head/games/pokerth/files/patch-src_net_serveraccepthelper.h (contents, props changed)
Added: head/games/pokerth/files/patch-src_net_common_clientthread.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/pokerth/files/patch-src_net_common_clientthread.cpp Sun Dec 31 13:28:37 2017 (r457690)
@@ -0,0 +1,15 @@
+--- src/net/common/clientthread.cpp.orig 2017-08-16 12:24:03 UTC
++++ src/net/common/clientthread.cpp
+@@ -993,8 +993,12 @@ ClientThread::CreateContextSession()
+ newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
+ else
+ newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
++#if BOOST_VERSION < 106600
+ boost::asio::socket_base::non_blocking_io command(true);
+ newSock->io_control(command);
++#else
++ newSock->non_blocking(true);
++#endif
+ newSock->set_option(tcp::no_delay(true));
+ newSock->set_option(boost::asio::socket_base::keep_alive(true));
+
Added: head/games/pokerth/files/patch-src_net_serveraccepthelper.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/pokerth/files/patch-src_net_serveraccepthelper.h Sun Dec 31 13:28:37 2017 (r457690)
@@ -0,0 +1,15 @@
+--- src/net/serveraccepthelper.h.orig 2017-08-16 12:24:03 UTC
++++ src/net/serveraccepthelper.h
+@@ -122,8 +122,12 @@ class ServerAcceptHelper : public ServerAcceptInterfac
+ const boost::system::error_code &error)
+ {
+ if (!error) {
++#if BOOST_VERSION < 106600
+ boost::asio::socket_base::non_blocking_io command(true);
+ acceptedSocket->io_control(command);
++#else
++ acceptedSocket->non_blocking(true);
++#endif
+ acceptedSocket->set_option(typename P::no_delay(true));
+ acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
+ boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
More information about the svn-ports-all
mailing list