gentoo auto-resync : 29:12:2024 - 06:30:44

3 files changed, 103 insertions, 1 deletions

diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index e5e4209abf14..2587f5eb6685 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -1,5 +1,6 @@
 AUX sunshine-0.22.0-nvcodec.patch 1009 BLAKE2B 4a2fd3dbd98b64fd6e259c94d218f9853404a4096448ace8153c86717524b7cde5295a00aed972eca73c4a4c3bf6101349e8e61ebcb5e657d59426f903fc8efd SHA512 77ba0e67da4a3c252c5a19041bf0822651de9670ffe7e5732298cc00c6ac8cced97d2a0e0487af0ddc035fdb74fee2593ef91c446bb1125525ba4103b7b95fa2
 AUX sunshine-boost-1.86.patch 4552 BLAKE2B 776e429a13586a1ed8f32d33a9f5144c615784d874ada8da0516c875e8c8bbd84a9410c2f3375da62f412d35ad4c7e6db780b902091a18087500c877455a29e1 SHA512 e546433459663de0542da644775f9adbb78485674629c211c5ff4dea493b766f85bbfc3e13a601e15a31427db476242cbfe00ca05acf2de0dd4d29ccc012cdf5
+AUX sunshine-boost-1.87.patch 3402 BLAKE2B f471770c2f8799b66116ffdce223d7438ac8042f39589a4a1464e2f7323e3442d08a75bdf8e62648fd20936d817fc68883d8abc371600db06501aa25c4bdbea1 SHA512 e2f433372dcd8b92a49388f250461dc122592193ea6143295943acae65545d2b7a45abc4e0a9c3068bdfda38591781f5b006986209de43d6dbffbee3afc1782f
 AUX sunshine-cross-cbs.patch 2020 BLAKE2B b57c6fe66707a86b35a70945ca9b9da9c4e8bb0bba8bd0d66e9ec9e3d15121cc4a193b56ea376ff3e244d652c18ac7504d687cefd54876afcf3cb54d8024c71b SHA512 95710af147509f8c93c875513c01a596fd62fe421495395dfeef41a6230d031e779277a9a2604c4d5dce788d6ecf77e667942d3ae2d6e675ef29db86e6519734
 AUX sunshine-custom-ffmpeg.patch 7668 BLAKE2B 2fa8adf912791e8abf73f0ea173228318edb804584c1efbe15077d6b6e08f7e6cfaa4dacf5e02115325ebe9a0ef09b9e49d3e021d6220dff0b364c1bbcd0b7e4 SHA512 ace6b855edf21a91958d843bff730634c585a96c1f728c304e7b79ddacc96fdb767936fd5d8dd8f2df3347d12a25519e9d1511ada3828404b9440d8333bfc013
 AUX sunshine-find-npm.patch 3778 BLAKE2B 9862cb4f8926438a588275446d02a84e0341dcafacf7037338151eb0e3020a89aa8f583d52efcebca032fd8f87b12ff6f6545f288ae1431f84efd9bc6b381d18 SHA512 4ed7da0be9d8608e71fd17b8af7ef159920d9313278c0f7f21390144b510dbfa0b2a4433bca5664e507c6210e1f032c5c014448e85a44eba891df71fc316c2b9
@@ -14,6 +15,6 @@ DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd
 DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16
 DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa
 DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb
-EBUILD sunshine-0.23.1.ebuild 12020 BLAKE2B 9fbb793d17af549643d66465df55ea4cabd5c8d109cb10bcac5929709c94e0c886e8c5c28cb1a348ec7f2396eab393b88681d5bc1a20e229f41d6b47171790f9 SHA512 70f5ca2d2b7360fb8583d86d4832f162eccf26c2fa943ce501f0a842a03bcefb73d36fa988f49a65267f9a09d66b3357ee13fdad74178f04756cffc55f80dfec
+EBUILD sunshine-0.23.1.ebuild 12058 BLAKE2B d7594d59f831bfbf470cd0d1307a790423203cadc1027f27230a5c0b237b807d4cb829e09fc0a5dc48ca1839b18d3b99e0f1661869198fb5fe7193542a6530f8 SHA512 ad0bc07615f6d1b59aa9758ff89a5d6c1a1e91d6a29d50111362064d3bb0e2022c7b03e91bb8e68e6202e9146af7f8b7a35bd7ad8a1873e1b108695a0ff4c576
 EBUILD sunshine-9999.ebuild 12178 BLAKE2B 28891233f8e0e23a36fca10bfb66cc28826a8f312817c5e5617191df17e7299d50bbadd6fd1b66602940db4193545292e8aacb5ab611bdc299f73921a4f6e8bc SHA512 ec982e0369d7bdb241b035202414d0a41ce82da255a1a23b4918daa419ddd768ef9f663c8fc790ddc06e7b7e20ceec2bbb7ce7003c256e69d436d461e4e4ea35
 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
diff --git a/net-misc/sunshine/files/sunshine-boost-1.87.patch b/net-misc/sunshine/files/sunshine-boost-1.87.patch
new file mode 100644
index 000000000000..ba871fcab26b
--- /dev/null
+++ b/net-misc/sunshine/files/sunshine-boost-1.87.patch
@@ -0,0 +1,100 @@
+diff --git a/src/rtsp.cpp b/src/rtsp.cpp
+index 0180fbee..da20d134 100644
+--- a/src/rtsp.cpp
++++ b/src/rtsp.cpp
+@@ -90,8 +90,8 @@ namespace rtsp_stream {
+ 
+   class socket_t: public std::enable_shared_from_this<socket_t> {
+   public:
+-    socket_t(boost::asio::io_service &ios, std::function<void(tcp::socket &sock, launch_session_t &, msg_t &&)> &&handle_data_fn):
+-        handle_data_fn { std::move(handle_data_fn) }, sock { ios } {}
++    socket_t(boost::asio::io_context &io_context, std::function<void(tcp::socket &sock, launch_session_t &, msg_t &&)> &&handle_data_fn):
++        handle_data_fn { std::move(handle_data_fn) }, sock { io_context } {}
+ 
+     /**
+      * @brief Queues an asynchronous read to begin the next message.
+@@ -440,7 +440,7 @@ namespace rtsp_stream {
+         return -1;
+       }
+ 
+-      next_socket = std::make_shared<socket_t>(ios, [this](tcp::socket &sock, launch_session_t &session, msg_t &&msg) {
++      next_socket = std::make_shared<socket_t>(io_context, [this](tcp::socket &sock, launch_session_t &session, msg_t &&msg) {
+         handle_msg(sock, session, std::move(msg));
+       });
+ 
+@@ -454,7 +454,7 @@ namespace rtsp_stream {
+     template <class T, class X>
+     void
+     iterate(std::chrono::duration<T, X> timeout) {
+-      ios.run_one_for(timeout);
++      io_context.run_one_for(timeout);
+     }
+ 
+     void
+@@ -499,7 +499,7 @@ namespace rtsp_stream {
+       }
+ 
+       // Queue another asynchronous accept for the next incoming connection
+-      next_socket = std::make_shared<socket_t>(ios, [this](tcp::socket &sock, launch_session_t &session, msg_t &&msg) {
++      next_socket = std::make_shared<socket_t>(io_context, [this](tcp::socket &sock, launch_session_t &session, msg_t &&msg) {
+         handle_msg(sock, session, std::move(msg));
+       });
+       acceptor.async_accept(next_socket->sock, [this](const auto &ec) {
+@@ -591,8 +591,8 @@ namespace rtsp_stream {
+         }
+       }
+ 
+-      if (all && !ios.stopped()) {
+-        ios.stop();
++      if (all && !io_context.stopped()) {
++        io_context.stop();
+       }
+     }
+ 
+@@ -627,8 +627,8 @@ namespace rtsp_stream {
+     std::chrono::steady_clock::time_point raised_timeout;
+     int _slot_count;
+ 
+-    boost::asio::io_service ios;
+-    tcp::acceptor acceptor { ios };
++    boost::asio::io_context io_context;
++    tcp::acceptor acceptor { io_context };
+ 
+     std::shared_ptr<socket_t> next_socket;
+   };
+diff --git a/src/stream.cpp b/src/stream.cpp
+index df5b3d96..0b304e23 100644
+--- a/src/stream.cpp
++++ b/src/stream.cpp
+@@ -340,10 +340,10 @@ namespace stream {
+     std::thread audio_thread;
+     std::thread control_thread;
+ 
+-    asio::io_service io;
++    asio::io_context io_context;
+ 
+-    udp::socket video_sock { io };
+-    udp::socket audio_sock { io };
++    udp::socket video_sock { io_context };
++    udp::socket audio_sock { io_context };
+ 
+     control_server_t control_server;
+   };
+@@ -1159,7 +1159,7 @@ namespace stream {
+     auto &message_queue_queue = ctx.message_queue_queue;
+     auto broadcast_shutdown_event = mail::man->event<bool>(mail::broadcast_shutdown);
+ 
+-    auto &io = ctx.io;
++    auto &io = ctx.io_context;
+ 
+     udp::endpoint peer;
+ 
+@@ -1664,7 +1664,7 @@ namespace stream {
+     audio_packets->stop();
+ 
+     ctx.message_queue_queue->stop();
+-    ctx.io.stop();
++    ctx.io_context.stop();
+ 
+     ctx.video_sock.close();
+     ctx.audio_sock.close();
diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild
index 81552c090837..b3a422edf43c 100644
--- a/net-misc/sunshine/sunshine-0.23.1.ebuild
+++ b/net-misc/sunshine/sunshine-0.23.1.ebuild
@@ -181,6 +181,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-find-npm.patch
 	"${FILESDIR}"/${PN}-miniupnpc.patch
 	"${FILESDIR}"/${PN}-boost-1.86.patch
+	"${FILESDIR}"/${PN}-boost-1.87.patch
 )
 
 # Make this mess a bit simpler.