pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/alephone
Module Name: pkgsrc
Committed By: adam
Date: Thu Oct 2 11:19:51 UTC 2025
Modified Files:
pkgsrc/games/alephone: Makefile distinfo
pkgsrc/games/alephone/patches:
patch-Source__Files_RenderOther_screen.cpp patch-configure
Added Files:
pkgsrc/games/alephone/patches:
patch-Source__Files_Network_NetworkInterface.cpp
patch-Source__Files_Network_NetworkInterface.h
Log Message:
alephone: updated to 20250829
Aleph One 1.11
This release is not network compatible with the previous release, and films saved with this release cannot be played back with older releases.
Highlights:
Native Steam Linux support
Audio improvements
Additional sprite rendering option for 3D perspective
Replay films for saved games
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/games/alephone/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/alephone/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.cpp \
pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.h
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp \
pkgsrc/games/alephone/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/alephone/Makefile
diff -u pkgsrc/games/alephone/Makefile:1.41 pkgsrc/games/alephone/Makefile:1.42
--- pkgsrc/games/alephone/Makefile:1.41 Sat Sep 27 09:57:17 2025
+++ pkgsrc/games/alephone/Makefile Thu Oct 2 11:19:51 2025
@@ -1,31 +1,29 @@
-# $NetBSD: Makefile,v 1.41 2025/09/27 09:57:17 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2025/10/02 11:19:51 adam Exp $
-DISTNAME= AlephOne-20230119
+DISTNAME= AlephOne-20250829
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 11
CATEGORIES= games
MASTER_SITES+= ${MASTER_SITE_GITHUB:=Aleph-One-Marathon/}
-EXTRACT_SUFX= .tar.bz2
GITHUB_PROJECT= alephone
-GITHUB_RELEASE= release-20230119
+GITHUB_RELEASE= ${DISTNAME:S/AlephOne/release/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= christtrekker%users.sourceforge.net@localhost
HOMEPAGE= https://alephone.lhowon.org/
COMMENT= Classic 2.5D FPS game engine, updated to use SDL
LICENSE= gnu-gpl-v2
+USE_CXX_FEATURES= c++17
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config gmake
GNU_CONFIGURE= yes
-
-USE_CXX_FEATURES+= c++17
-
CONFIGURE_ARGS+= --with-boost=${PREFIX}
.include "../../archivers/zziplib/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
.include "../../devel/SDL2/buildlink3.mk"
.include "../../fonts/SDL2_ttf/buildlink3.mk"
@@ -33,10 +31,12 @@ BUILDLINK_API_DEPENDS.boost-headers+= bo
.include "../../devel/boost-headers/buildlink3.mk"
BUILDLINK_API_DEPENDS.boost-libs+= boost-libs>=1.53
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/SDL2_image/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/libmatroska/buildlink3.mk"
+.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../net/SDL2_net/buildlink3.mk"
-
+.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/alephone/distinfo
diff -u pkgsrc/games/alephone/distinfo:1.12 pkgsrc/games/alephone/distinfo:1.13
--- pkgsrc/games/alephone/distinfo:1.12 Thu Apr 27 13:33:47 2023
+++ pkgsrc/games/alephone/distinfo Thu Oct 2 11:19:51 2025
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.12 2023/04/27 13:33:47 yhardy Exp $
+$NetBSD: distinfo,v 1.13 2025/10/02 11:19:51 adam Exp $
-BLAKE2s (AlephOne-20230119.tar.bz2) = c21e491f9bd0192f2601dc203eebb8345d727cc036cd44879044219a9106038f
-SHA512 (AlephOne-20230119.tar.bz2) = bb9a47d09e7732051088e255314b489cf8a0185d2d1da094be66b902dbe269f6dabd211f8278e5981ec0b93ab364ac2d2d2a85002d8cb346392398f9c40670c5
-Size (AlephOne-20230119.tar.bz2) = 6109704 bytes
+BLAKE2s (AlephOne-20250829.tar.bz2) = 27fe5d34615fded9aab7b813881a969087419efdf81d7a2e054311f8fae40a92
+SHA512 (AlephOne-20250829.tar.bz2) = 6f4d859c39a026a088123676dbe79f63c808c97937ff8b661ea557cd9a61f73678e85b321e392abf62d310bf122e03c964fc408d2e93c645394703eff370a4f3
+Size (AlephOne-20250829.tar.bz2) = 6055610 bytes
+SHA1 (patch-Source__Files_Network_NetworkInterface.cpp) = 1ffd8adc0fb6f0ea77279eae33460a1218017549
+SHA1 (patch-Source__Files_Network_NetworkInterface.h) = 66a3a6b0495955e4429f45b1f6261d13230e97a7
SHA1 (patch-Source__Files_RenderMain_OGL__Headers.h) = 814a90cc8b4998385eba04fb07d5c5a5bf98f158
SHA1 (patch-Source__Files_RenderMain_OGL__Render.cpp) = 79249e5a1756a71d214b0c54501868155dfa6d80
SHA1 (patch-Source__Files_RenderMain_OGL__Setup.cpp) = e6feda9aa47ce52b9d46a31a1a96364f8a0ad540
-SHA1 (patch-Source__Files_RenderOther_screen.cpp) = 356bc6a8a52e96cd44cadc038f6dee5ef28afe59
-SHA1 (patch-configure) = e667f16efe23256717d8136d08410f3d89fa51b5
+SHA1 (patch-Source__Files_RenderOther_screen.cpp) = aed5d2d222729d182f2e4dece08b5420beaa1229
+SHA1 (patch-configure) = b2bf45d4f97b3b2226ba458a006762357e859e6e
Index: pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp
diff -u pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp:1.1 pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp:1.2
--- pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp:1.1 Thu Apr 27 13:33:47 2023
+++ pkgsrc/games/alephone/patches/patch-Source__Files_RenderOther_screen.cpp Thu Oct 2 11:19:51 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source__Files_RenderOther_screen.cpp,v 1.1 2023/04/27 13:33:47 yhardy Exp $
+$NetBSD: patch-Source__Files_RenderOther_screen.cpp,v 1.2 2025/10/02 11:19:51 adam Exp $
Use GLEW for GL extensions, works around a linking problem on NetBSD.
---- Source_Files/RenderOther/screen.cpp.orig 2021-10-31 00:46:41.000000000 +0000
+--- Source_Files/RenderOther/screen.cpp.orig 2025-08-29 15:31:33.000000000 +0000
+++ Source_Files/RenderOther/screen.cpp
-@@ -963,7 +963,7 @@ static void change_screen_mode(int width
+@@ -967,7 +967,7 @@ static void change_screen_mode(int width
SDL_GL_CreateContext(main_screen);
context_created = true;
}
--#ifdef __WIN32__
-+#if 1
+-#if defined (__WIN32__) && (HAVE_OPENGL)
++#if HAVE_OPENGL
glewInit();
#endif
if (!OGL_CheckExtension("GL_ARB_vertex_shader") || !OGL_CheckExtension("GL_ARB_fragment_shader") || !OGL_CheckExtension("GL_ARB_shader_objects") ||
!OGL_CheckExtension("GL_ARB_shading_language_100"))
Index: pkgsrc/games/alephone/patches/patch-configure
diff -u pkgsrc/games/alephone/patches/patch-configure:1.1 pkgsrc/games/alephone/patches/patch-configure:1.2
--- pkgsrc/games/alephone/patches/patch-configure:1.1 Thu Apr 27 13:33:47 2023
+++ pkgsrc/games/alephone/patches/patch-configure Thu Oct 2 11:19:51 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2023/04/27 13:33:47 yhardy Exp $
+$NetBSD: patch-configure,v 1.2 2025/10/02 11:19:51 adam Exp $
+Detect asio.hpp from boost.
Use GLEW for GL extensions, works around a linking problem on NetBSD.
---- configure.orig 2022-01-15 21:25:37.000000000 +0000
+--- configure.orig 2025-08-29 15:32:48.000000000 +0000
+++ configure
-@@ -8784,9 +8784,9 @@ $as_echo_n "checking for OpenGL support.
+@@ -9927,7 +9927,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+-ac_fn_cxx_check_header_compile "$LINENO" "asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
++ac_fn_cxx_check_header_compile "$LINENO" "boost/asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
+ if test "x$ac_cv_header_asio_hpp" = xyes
+ then :
+
+@@ -10670,9 +10670,9 @@ printf %s "checking for OpenGL support..
SYS_GL_LIBS="-F/System/Library/Frameworks -framework AGL -framework OpenGL"
CPPFLAGS="$CPPFLAGS -D__DARWIN__ -F/System/Library/Frameworks -I/System/Library/Frameworks/OpenGL.framework/Headers" ;; #(
*-*-linux*) :
Added files:
Index: pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.cpp
diff -u /dev/null pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.cpp:1.1
--- /dev/null Thu Oct 2 11:19:51 2025
+++ pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.cpp Thu Oct 2 11:19:51 2025
@@ -0,0 +1,203 @@
+$NetBSD: patch-Source__Files_Network_NetworkInterface.cpp,v 1.1 2025/10/02 11:19:51 adam Exp $
+
+Use boost::asio.
+
+--- Source_Files/Network/NetworkInterface.cpp.orig 2025-10-02 11:04:06.613566458 +0000
++++ Source_Files/Network/NetworkInterface.cpp
+@@ -18,13 +18,13 @@
+
+ #include "NetworkInterface.h"
+
+-IPaddress::IPaddress(const asio::ip::tcp::endpoint& endpoint)
++IPaddress::IPaddress(const boost::asio::ip::tcp::endpoint& endpoint)
+ {
+ _address = endpoint.address();
+ set_port(endpoint.port());
+ }
+
+-IPaddress::IPaddress(const asio::ip::udp::endpoint& endpoint)
++IPaddress::IPaddress(const boost::asio::ip::udp::endpoint& endpoint)
+ {
+ _address = endpoint.address();
+ set_port(endpoint.port());
+@@ -49,13 +49,13 @@ void IPaddress::set_port(uint16_t port)
+
+ void IPaddress::set_address(const std::string& host)
+ {
+- _address = asio::ip::make_address(host);
++ _address = boost::asio::ip::make_address(host);
+ }
+
+ void IPaddress::set_address(const uint8_t ip[4])
+ {
+ std::array<unsigned char, 4> bytes = { ip[0], ip[1], ip[2], ip[3] };
+- _address = asio::ip::make_address_v4(bytes);
++ _address = boost::asio::ip::make_address_v4(bytes);
+ }
+
+ bool IPaddress::operator==(const IPaddress& other) const
+@@ -68,29 +68,29 @@ bool IPaddress::operator!=(const IPaddre
+ return !(*(this) == other);
+ }
+
+-UDPsocket::UDPsocket(asio::io_context& io_context, asio::ip::udp::socket&& socket) : _io_context(io_context), _socket(std::move(socket)) {}
++UDPsocket::UDPsocket(boost::asio::io_context& io_context, boost::asio::ip::udp::socket&& socket) : _io_context(io_context), _socket(std::move(socket)) {}
+
+ int64_t UDPsocket::send(const UDPpacket& packet)
+ {
+- asio::error_code error_code;
+- asio::ip::udp::endpoint destination(packet.address._address, packet.address.port());
+- auto result = _socket.send_to(asio::buffer(packet.buffer, packet.data_size), destination, 0, error_code);
++ boost::system::error_code error_code;
++ boost::asio::ip::udp::endpoint destination(packet.address._address, packet.address.port());
++ auto result = _socket.send_to(boost::asio::buffer(packet.buffer, packet.data_size), destination, 0, error_code);
+ return error_code ? -1 : result;
+ }
+
+ int64_t UDPsocket::broadcast_send(const UDPpacket& packet)
+ {
+- asio::error_code error_code;
+- asio::ip::udp::endpoint broadcast_endpoint(asio::ip::address_v4::broadcast(), packet.address.port());
+- auto result = _socket.send_to(asio::buffer(packet.buffer, packet.data_size), broadcast_endpoint, 0, error_code);
++ boost::system::error_code error_code;
++ boost::asio::ip::udp::endpoint broadcast_endpoint(boost::asio::ip::address_v4::broadcast(), packet.address.port());
++ auto result = _socket.send_to(boost::asio::buffer(packet.buffer, packet.data_size), broadcast_endpoint, 0, error_code);
+ return error_code ? -1 : result;
+ }
+
+ int64_t UDPsocket::receive(UDPpacket& packet)
+ {
+- asio::error_code error_code;
+- asio::ip::udp::endpoint endpoint;
+- auto result = _socket.receive_from(asio::buffer(packet.buffer), endpoint, 0, error_code);
++ boost::system::error_code error_code;
++ boost::asio::ip::udp::endpoint endpoint;
++ auto result = _socket.receive_from(boost::asio::buffer(packet.buffer), endpoint, 0, error_code);
+ if (error_code) return -1;
+ packet.address = endpoint;
+ packet.data_size = result;
+@@ -100,8 +100,8 @@ int64_t UDPsocket::receive(UDPpacket& pa
+ void UDPsocket::register_receive_async(UDPpacket& packet)
+ {
+ _receive_async_return_value = 0;
+- _socket.async_receive_from(asio::buffer(packet.buffer), _receive_async_endpoint,
+- [&packet, this](const asio::error_code& error, std::size_t bytes_transferred) {
++ _socket.async_receive_from(boost::asio::buffer(packet.buffer), _receive_async_endpoint,
++ [&packet, this](const boost::system::error_code& error, std::size_t bytes_transferred) {
+ _receive_async_return_value = error ? -1 : bytes_transferred;
+ if (error) return;
+ packet.data_size = bytes_transferred;
+@@ -124,50 +124,50 @@ int64_t UDPsocket::check_receive() const
+
+ bool UDPsocket::broadcast(bool enable)
+ {
+- asio::error_code error_code;
+- _socket.set_option(asio::socket_base::broadcast(enable), error_code);
++ boost::system::error_code error_code;
++ _socket.set_option(boost::asio::socket_base::broadcast(enable), error_code);
+ return !error_code;
+ }
+
+-TCPsocket::TCPsocket(asio::io_context& io_context, asio::ip::tcp::socket&& socket) : _io_context(io_context), _socket(std::move(socket)) {}
++TCPsocket::TCPsocket(boost::asio::io_context& io_context, boost::asio::ip::tcp::socket&& socket) : _io_context(io_context), _socket(std::move(socket)) {}
+
+ int64_t TCPsocket::send(uint8_t* buffer, size_t size)
+ {
+- asio::error_code error_code;
+- auto result = _socket.send(asio::buffer(buffer, size), 0, error_code);
+- return !error_code || error_code == asio::error::would_block ? result : -1;
++ boost::system::error_code error_code;
++ auto result = _socket.send(boost::asio::buffer(buffer, size), 0, error_code);
++ return !error_code || error_code == boost::asio::error::would_block ? result : -1;
+ }
+
+ int64_t TCPsocket::receive(uint8_t* buffer, size_t size)
+ {
+- asio::error_code error_code;
+- auto result = _socket.read_some(asio::buffer(buffer, size), error_code);
+- return !error_code || error_code == asio::error::would_block ? result : -1;
++ boost::system::error_code error_code;
++ auto result = _socket.read_some(boost::asio::buffer(buffer, size), error_code);
++ return !error_code || error_code == boost::asio::error::would_block ? result : -1;
+ }
+
+ bool TCPsocket::set_non_blocking(bool enable)
+ {
+- asio::error_code error_code;
++ boost::system::error_code error_code;
+ _socket.non_blocking(enable, error_code);
+ return !error_code;
+ }
+
+-TCPlistener::TCPlistener(asio::io_context& io_context, const asio::ip::tcp::endpoint& endpoint) : _io_context(io_context), _socket(io_context), _acceptor(io_context, endpoint) {}
++TCPlistener::TCPlistener(boost::asio::io_context& io_context, const boost::asio::ip::tcp::endpoint& endpoint) : _io_context(io_context), _socket(io_context), _acceptor(io_context, endpoint) {}
+
+ std::unique_ptr<TCPsocket> TCPlistener::accept_connection()
+ {
+- asio::error_code error_code;
++ boost::system::error_code error_code;
+ _acceptor.accept(_socket, error_code);
+ if (error_code) return nullptr;
+
+ auto connection = std::unique_ptr<TCPsocket>(new TCPsocket(_io_context, std::move(_socket)));
+- _socket = asio::ip::tcp::socket(_io_context);
++ _socket = boost::asio::ip::tcp::socket(_io_context);
+ return connection;
+ }
+
+ bool TCPlistener::set_non_blocking(bool enable)
+ {
+- asio::error_code error_code;
++ boost::system::error_code error_code;
+ _acceptor.non_blocking(enable, error_code);
+ return !error_code;
+ }
+@@ -176,9 +176,9 @@ NetworkInterface::NetworkInterface() : _
+
+ std::unique_ptr<UDPsocket> NetworkInterface::udp_open_socket(uint16_t port)
+ {
+- asio::error_code error_code;
+- auto socket = asio::ip::udp::socket(_io_context);
+- auto endpoint = asio::ip::udp::endpoint(asio::ip::udp::v4(), port);
++ boost::system::error_code error_code;
++ auto socket = boost::asio::ip::udp::socket(_io_context);
++ auto endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), port);
+
+ socket.open(endpoint.protocol(), error_code);
+ if (error_code) return nullptr;
+@@ -191,22 +191,22 @@ std::unique_ptr<UDPsocket> NetworkInterf
+
+ std::unique_ptr<TCPlistener> NetworkInterface::tcp_open_listener(uint16_t port)
+ {
+- return std::unique_ptr<TCPlistener>(new TCPlistener(_io_context, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), port)));
++ return std::unique_ptr<TCPlistener>(new TCPlistener(_io_context, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)));
+ }
+
+ std::unique_ptr<TCPsocket> NetworkInterface::tcp_connect_socket(const IPaddress& address)
+ {
+- auto socket = asio::ip::tcp::socket(_io_context);
+- asio::error_code error_code;
+- socket.connect(asio::ip::tcp::endpoint(address._address, address.port()), error_code);
++ auto socket = boost::asio::ip::tcp::socket(_io_context);
++ boost::system::error_code error_code;
++ socket.connect(boost::asio::ip::tcp::endpoint(address._address, address.port()), error_code);
+ if (error_code) return nullptr;
+ return std::unique_ptr<TCPsocket>(new TCPsocket(_io_context, std::move(socket)));
+ }
+
+ std::optional<IPaddress> NetworkInterface::resolve_address(const std::string& host, uint16_t port)
+ {
+- asio::error_code error_code;
+- asio::ip::tcp::resolver::results_type endpoints = _resolver.resolve(host, std::to_string(port), error_code);
++ boost::system::error_code error_code;
++ boost::asio::ip::tcp::resolver::results_type endpoints = _resolver.resolve(host, std::to_string(port), error_code);
+ if (error_code) return std::nullopt;
+
+ for (const auto& endpoint : endpoints)
+@@ -218,4 +218,4 @@ std::optional<IPaddress> NetworkInterfac
+ }
+
+ return std::nullopt;
+-}
+\ No newline at end of file
++}
Index: pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.h
diff -u /dev/null pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.h:1.1
--- /dev/null Thu Oct 2 11:19:51 2025
+++ pkgsrc/games/alephone/patches/patch-Source__Files_Network_NetworkInterface.h Thu Oct 2 11:19:51 2025
@@ -0,0 +1,85 @@
+$NetBSD: patch-Source__Files_Network_NetworkInterface.h,v 1.1 2025/10/02 11:19:51 adam Exp $
+
+Use boost::asio.
+
+--- Source_Files/Network/NetworkInterface.h.orig 2025-10-02 10:58:39.161085374 +0000
++++ Source_Files/Network/NetworkInterface.h
+@@ -19,7 +19,7 @@
+ #ifndef NETWORK_INTERFACE_H
+ #define NETWORK_INTERFACE_H
+
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <string>
+ #include <optional>
+
+@@ -29,11 +29,11 @@ private:
+ friend class UDPsocket;
+ friend class TCPsocket;
+
+- asio::ip::address _address;
++ boost::asio::ip::address _address;
+ uint16_t _port = 0;
+
+- IPaddress(const asio::ip::tcp::endpoint& endpoint);
+- IPaddress(const asio::ip::udp::endpoint& endpoint);
++ IPaddress(const boost::asio::ip::tcp::endpoint& endpoint);
++ IPaddress(const boost::asio::ip::udp::endpoint& endpoint);
+
+ public:
+ IPaddress(const std::string& host, uint16_t port);
+@@ -66,11 +66,11 @@ struct UDPpacket
+
+ class UDPsocket {
+ private:
+- asio::io_context& _io_context;
+- asio::ip::udp::socket _socket;
+- asio::ip::udp::endpoint _receive_async_endpoint;
++ boost::asio::io_context& _io_context;
++ boost::asio::ip::udp::socket _socket;
++ boost::asio::ip::udp::endpoint _receive_async_endpoint;
+ int64_t _receive_async_return_value = 0;
+- UDPsocket(asio::io_context& io_context, asio::ip::udp::socket&& socket);
++ UDPsocket(boost::asio::io_context& io_context, boost::asio::ip::udp::socket&& socket);
+ friend class NetworkInterface;
+ public:
+ int64_t broadcast_send(const UDPpacket& packet);
+@@ -84,9 +84,9 @@ public:
+
+ class TCPsocket {
+ private:
+- asio::io_context& _io_context;
+- asio::ip::tcp::socket _socket;
+- TCPsocket(asio::io_context& io_context, asio::ip::tcp::socket&& socket);
++ boost::asio::io_context& _io_context;
++ boost::asio::ip::tcp::socket _socket;
++ TCPsocket(boost::asio::io_context& io_context, boost::asio::ip::tcp::socket&& socket);
+ friend class NetworkInterface;
+ friend class TCPlistener;
+ public:
+@@ -98,10 +98,10 @@ public:
+
+ class TCPlistener {
+ private:
+- asio::io_context& _io_context;
+- asio::ip::tcp::acceptor _acceptor;
+- asio::ip::tcp::socket _socket;
+- TCPlistener(asio::io_context& io_context, const asio::ip::tcp::endpoint& endpoint);
++ boost::asio::io_context& _io_context;
++ boost::asio::ip::tcp::acceptor _acceptor;
++ boost::asio::ip::tcp::socket _socket;
++ TCPlistener(boost::asio::io_context& io_context, const boost::asio::ip::tcp::endpoint& endpoint);
+ friend class NetworkInterface;
+ public:
+ std::unique_ptr<TCPsocket> accept_connection();
+@@ -110,8 +110,8 @@ public:
+
+ class NetworkInterface {
+ private:
+- asio::io_context _io_context;
+- asio::ip::tcp::resolver _resolver;
++ boost::asio::io_context _io_context;
++ boost::asio::ip::tcp::resolver _resolver;
+ public:
+ NetworkInterface();
+ std::unique_ptr<UDPsocket> udp_open_socket(uint16_t port);
Home |
Main Index |
Thread Index |
Old Index