From owner-svn-ports-all@freebsd.org Sun Dec 31 13:28:38 2017 Return-Path: Delivered-To: svn-ports-all@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 70F0CEB579F; Sun, 31 Dec 2017 13:28:38 +0000 (UTC) (envelope-from madpilot@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 3B08C73002; Sun, 31 Dec 2017 13:28:38 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBVDSbDX047714; Sun, 31 Dec 2017 13:28:37 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBVDSbsa047712; Sun, 31 Dec 2017 13:28:37 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201712311328.vBVDSbsa047712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 31 Dec 2017 13:28:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457690 - head/games/pokerth/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/games/pokerth/files X-SVN-Commit-Revision: 457690 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Dec 2017 13:28:38 -0000 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(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));