git: 721fead075b6 - main - emulators/yuzu: unbreak after a4245a4c6ce1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Feb 2025 00:03:44 UTC
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=721fead075b614847b10c71cf8fff8d98814648b commit 721fead075b614847b10c71cf8fff8d98814648b Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2025-02-15 21:23:30 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2025-02-15 23:54:02 +0000 emulators/yuzu: unbreak after a4245a4c6ce1 src/input_common/drivers/udp_client.cpp:116:18: error: no type named 'io_service' in namespace 'boost::asio' 116 | boost::asio::io_service io_service; | ~~~~~~~~~~~~~^ Reported by: pkg-fallout --- emulators/yuzu/Makefile | 2 +- emulators/yuzu/files/patch-boost-1.86 | 13 ------------- emulators/yuzu/files/patch-boost-1.87 | 29 +++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 44961a14c1ea..2d3b21bafd6a 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= yuzu PORTVERSION= s20240301 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb diff --git a/emulators/yuzu/files/patch-boost-1.86 b/emulators/yuzu/files/patch-boost-1.86 deleted file mode 100644 index 3bfa48206734..000000000000 --- a/emulators/yuzu/files/patch-boost-1.86 +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/boostorg/asio/issues/437 -https://github.com/boostorg/asio/commit/6ca7c4726e05 - ---- CMakeLists.txt.orig 2024-03-01 07:57:00 UTC -+++ CMakeLists.txt -@@ -275,6 +275,7 @@ add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) - - # boost asio's concept usage doesn't play nicely with some compilers yet. - add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) -+add_definitions(-Dasync_operation=typename) # XXX Remove after Boost 1.87 upgrade - if (MSVC) - add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++20>) - diff --git a/emulators/yuzu/files/patch-boost-1.87 b/emulators/yuzu/files/patch-boost-1.87 new file mode 100644 index 000000000000..375000360b4f --- /dev/null +++ b/emulators/yuzu/files/patch-boost-1.87 @@ -0,0 +1,29 @@ +src/input_common/drivers/udp_client.cpp:116:18: error: no type named 'io_service' in namespace 'boost::asio' + 116 | boost::asio::io_service io_service; + | ~~~~~~~~~~~~~^ +src/tests/input_common/calibration_configuration_job.cpp:85:18: error: no type named 'io_service' in namespace 'boost::asio' + 85 | boost::asio::io_service io_service; + | ~~~~~~~~~~~~~^ + +--- src/input_common/drivers/udp_client.cpp.orig 2024-03-01 07:57:00 UTC ++++ src/input_common/drivers/udp_client.cpp +@@ -113,7 +113,7 @@ class Socket { (private) + } + + SocketCallback callback; +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + boost::asio::basic_waitable_timer<clock> timer; + udp::socket socket; + +--- src/tests/input_common/calibration_configuration_job.cpp.orig 2024-03-01 07:57:00 UTC ++++ src/tests/input_common/calibration_configuration_job.cpp +@@ -82,7 +82,7 @@ class FakeCemuhookServer { (private) + } + + private: +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + boost::asio::ip::udp::socket socket; + std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> send_buffer; + std::array<u8, InputCommon::CemuhookUDP::MAX_PACKET_SIZE> receive_buffer;