gentoo auto-resync : 09:11:2024 - 03:03:12

4 files changed, 155 insertions, 3 deletions

diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index 9bcec1a92d4a..e5e4209abf14 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -1,4 +1,5 @@
 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-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
@@ -13,6 +14,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 11982 BLAKE2B 6cfb8f34ea28adf1f50eff43d7d7264bbb8ed20de2dbecfb73e19578b0d03937ddc40e28f878b1912f99dff2cc769747331f7e7425324f97800f8ba253cefbd6 SHA512 721cf1c22f7d65c82ffe76b95b08abc412217fd8513b76be550ad1060011ea2a6e3d3b6de3c4c032653a2b6653ae3744b9504f1c4bf11893daf467a8978b8a49
-EBUILD sunshine-9999.ebuild 12178 BLAKE2B a7801e47200d0467a3dd77b9414049ea8784d8917a1c28204b8094bcb78bade66a7f83bdf7e94663de0f554947c4c0054e9b770e375cca797732aba765f8b884 SHA512 c7de8c732efd6308b25e042d2f7b8ef8365ce94f5fe234945b704284f212281148925d06ade329ccddce29a4075796f8327cc5921db780d83547134c5f86e75b
+EBUILD sunshine-0.23.1.ebuild 12020 BLAKE2B 9fbb793d17af549643d66465df55ea4cabd5c8d109cb10bcac5929709c94e0c886e8c5c28cb1a348ec7f2396eab393b88681d5bc1a20e229f41d6b47171790f9 SHA512 70f5ca2d2b7360fb8583d86d4832f162eccf26c2fa943ce501f0a842a03bcefb73d36fa988f49a65267f9a09d66b3357ee13fdad74178f04756cffc55f80dfec
+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.86.patch b/net-misc/sunshine/files/sunshine-boost-1.86.patch
new file mode 100644
index 000000000000..374e8b5ab004
--- /dev/null
+++ b/net-misc/sunshine/files/sunshine-boost-1.86.patch
@@ -0,0 +1,150 @@
+diff --git a/src/platform/common.h b/src/platform/common.h
+index 007f7ece..e3827d33 100644
+--- a/src/platform/common.h
++++ b/src/platform/common.h
+@@ -23,6 +23,14 @@ extern "C" {
+ 
+ using namespace std::literals;
+ 
++#if BOOST_VERSION < 108600
++#include <boost/process.hpp>
++namespace bp = boost::process;
++#else
++#include <boost/process/v1.hpp>
++namespace bp = boost::process::v1;
++#endif
++
+ struct sockaddr;
+ struct AVFrame;
+ struct AVBufferRef;
+@@ -39,7 +47,11 @@ namespace boost {
+   namespace filesystem {
+     class path;
+   }
++#if BOOST_VERSION < 108600
+   namespace process {
++#else
++  namespace process::inline v1 {
++#endif
+     class child;
+     class group;
+     template <typename Char>
+@@ -585,8 +597,8 @@ namespace platf {
+   bool
+   needs_encoder_reenumeration();
+ 
+-  boost::process::child
+-  run_command(bool elevated, bool interactive, const std::string &cmd, boost::filesystem::path &working_dir, const boost::process::environment &env, FILE *file, std::error_code &ec, boost::process::group *group);
++  bp::child
++  run_command(bool elevated, bool interactive, const std::string &cmd, boost::filesystem::path &working_dir, const bp::environment &env, FILE *file, std::error_code &ec, bp::group *group);
+ 
+   enum class thread_priority_e : int {
+     low,
+diff --git a/src/platform/linux/misc.cpp b/src/platform/linux/misc.cpp
+index 980c0804..1eed6c76 100644
+--- a/src/platform/linux/misc.cpp
++++ b/src/platform/linux/misc.cpp
+@@ -15,7 +15,6 @@
+ // lib includes
+ #include <arpa/inet.h>
+ #include <boost/asio/ip/address.hpp>
+-#include <boost/process.hpp>
+ #include <dlfcn.h>
+ #include <fcntl.h>
+ #include <ifaddrs.h>
+@@ -40,7 +39,6 @@
+ 
+ using namespace std::literals;
+ namespace fs = std::filesystem;
+-namespace bp = boost::process;
+ 
+ window_system_e window_system;
+ 
+@@ -269,7 +267,7 @@ namespace platf {
+     auto working_dir = boost::filesystem::path(std::getenv("HOME"));
+     std::string cmd = R"(xdg-open ")" + url + R"(")";
+ 
+-    boost::process::environment _env = boost::this_process::environment();
++    bp::environment _env = boost::this_process::environment();
+     std::error_code ec;
+     auto child = run_command(false, false, cmd, working_dir, _env, nullptr, ec, nullptr);
+     if (ec) {
+diff --git a/src/process.cpp b/src/process.cpp
+index 89dc4dc5..678a48f6 100644
+--- a/src/process.cpp
++++ b/src/process.cpp
+@@ -40,7 +40,6 @@
+ 
+ namespace proc {
+   using namespace std::literals;
+-  namespace bp = boost::process;
+   namespace pt = boost::property_tree;
+ 
+   proc_t proc;
+@@ -131,7 +130,7 @@ namespace proc {
+     // If the cmd path is not an absolute path, resolve it using our PATH variable
+     boost::filesystem::path cmd_path(parts.at(0));
+     if (!cmd_path.is_absolute()) {
+-      cmd_path = boost::process::search_path(parts.at(0));
++      cmd_path = bp::search_path(parts.at(0));
+       if (cmd_path.empty()) {
+         BOOST_LOG(error) << "Unable to find executable ["sv << parts.at(0) << "]. Is it in your PATH?"sv;
+         return boost::filesystem::path();
+diff --git a/src/process.h b/src/process.h
+index c8754992..771af105 100644
+--- a/src/process.h
++++ b/src/process.h
+@@ -11,8 +11,6 @@
+ #include <optional>
+ #include <unordered_map>
+ 
+-#include <boost/process.hpp>
+-
+ #include "config.h"
+ #include "platform/common.h"
+ #include "rtsp.h"
+@@ -68,7 +66,7 @@ namespace proc {
+     KITTY_DEFAULT_CONSTR_MOVE_THROW(proc_t)
+ 
+     proc_t(
+-      boost::process::environment &&env,
++      bp::environment &&env,
+       std::vector<ctx_t> &&apps):
+         _app_id(0),
+         _env(std::move(env)),
+@@ -99,7 +97,7 @@ namespace proc {
+   private:
+     int _app_id;
+ 
+-    boost::process::environment _env;
++    bp::environment _env;
+     std::vector<ctx_t> _apps;
+     ctx_t _app;
+     std::chrono::steady_clock::time_point _app_launch_time;
+@@ -107,8 +105,8 @@ namespace proc {
+     // If no command associated with _app_id, yet it's still running
+     bool placebo {};
+ 
+-    boost::process::child _process;
+-    boost::process::group _process_group;
++    bp::child _process;
++    bp::group _process_group;
+ 
+     file_t _pipe;
+     std::vector<cmd_t>::const_iterator _app_prep_it;
+diff --git a/src/system_tray.cpp b/src/system_tray.cpp
+index c34c3d75..e684ec83 100644
+--- a/src/system_tray.cpp
++++ b/src/system_tray.cpp
+@@ -33,7 +33,11 @@
+   // lib includes
+   #include "tray/tray.h"
+   #include <boost/filesystem.hpp>
++#if BOOST_VERSION < 108600
+   #include <boost/process/environment.hpp>
++#else
++  #include <boost/process/v1/environment.hpp>
++#endif
+ 
+   // local includes
+   #include "confighttp.h"
diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild
index d3f22bd6db88..81552c090837 100644
--- a/net-misc/sunshine/sunshine-0.23.1.ebuild
+++ b/net-misc/sunshine/sunshine-0.23.1.ebuild
@@ -180,6 +180,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.22.0-nvcodec.patch
 	"${FILESDIR}"/${PN}-find-npm.patch
 	"${FILESDIR}"/${PN}-miniupnpc.patch
+	"${FILESDIR}"/${PN}-boost-1.86.patch
 )
 
 # Make this mess a bit simpler.
diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index 14c21c43170b..ea60b498ecf2 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.ebuild
@@ -126,7 +126,7 @@ REQUIRED_USE="
 "
 
 CDEPEND="
-	>=dev-libs/boost-1.85:=[nls]
+	>=dev-libs/boost-1.86:=[nls]
 	dev-libs/libevdev
 	dev-libs/openssl:=
 	media-libs/opus