From d68307db4f5c1a80d898e3c5aad29814f281e6fc Mon Sep 17 00:00:00 2001 From: wjyLearn <93930815+wjyLearn@users.noreply.github.com> Date: Sat, 20 Dec 2025 16:15:38 +0800 Subject: [PATCH] update deps of mac --- ...IX-OBS-cannot-start-streaming-on-MAC.patch | 127 ++++++++++++++++++ deps/Boost/Boost.cmake | 1 + 2 files changed, 128 insertions(+) create mode 100644 deps/Boost/0001-FIX-OBS-cannot-start-streaming-on-MAC.patch diff --git a/deps/Boost/0001-FIX-OBS-cannot-start-streaming-on-MAC.patch b/deps/Boost/0001-FIX-OBS-cannot-start-streaming-on-MAC.patch new file mode 100644 index 0000000..2d412ec --- /dev/null +++ b/deps/Boost/0001-FIX-OBS-cannot-start-streaming-on-MAC.patch @@ -0,0 +1,127 @@ +From 45d9cd6bdba9b829fcfe40ff7c5f3f786afd41e1 Mon Sep 17 00:00:00 2001 +From: "changyu.chen" +Date: Fri, 7 Nov 2025 10:15:47 +0800 +Subject: [PATCH] FIX: OBS cannot start streaming on MAC + +jira: [STUDIO-14205] + +Change-Id: I3f7c7982737b3b52729df856bc0cf69d89d1820d +--- + .../include/boost/process/detail/posix/executor.hpp | 3 ++- + .../include/boost/process/detail/posix/pipe_out.hpp | 13 +++++++++++-- + .../include/boost/process/detail/used_handles.hpp | 3 +++ + .../boost/process/detail/windows/handles.hpp | 10 +++++++--- + 4 files changed, 23 insertions(+), 6 deletions(-) + +diff --git a/usr/local/include/boost/process/detail/posix/executor.hpp b/usr/local/include/boost/process/detail/posix/executor.hpp +index c4d99906..4d9b47ba 100644 +--- a/usr/local/include/boost/process/detail/posix/executor.hpp ++++ b/usr/local/include/boost/process/detail/posix/executor.hpp +@@ -328,6 +328,7 @@ public: + } + void set_error(const std::error_code &ec, const std::string &msg) {set_error(ec, msg.c_str());}; + ++ int error_sink() const {return _pipe_sink;} + std::vector get_used_handles() const + { + if (_pipe_sink == -1) +@@ -398,6 +399,7 @@ child executor::invoke(boost::mpl::false_, boost::mpl::false_) + set_error(err, "fcntl(2) failed");//this might throw, so we need to be sure our pipe is safe. + return child(); + } ++ _pipe_sink = p.p[1]; + _ec.clear(); + boost::fusion::for_each(seq, call_on_setup(*this)); + +@@ -421,7 +423,6 @@ child executor::invoke(boost::mpl::false_, boost::mpl::false_) + } + else if (pid == 0) + { +- _pipe_sink = p.p[1]; + ::close(p.p[0]); + + boost::fusion::for_each(seq, call_on_exec_setup(*this)); +diff --git a/usr/local/include/boost/process/detail/posix/pipe_out.hpp b/usr/local/include/boost/process/detail/posix/pipe_out.hpp +index d54cca4e..7a711983 100644 +--- a/usr/local/include/boost/process/detail/posix/pipe_out.hpp ++++ b/usr/local/include/boost/process/detail/posix/pipe_out.hpp +@@ -18,7 +18,7 @@ + namespace boost { namespace process { namespace detail { namespace posix { + + template +-struct pipe_out : handler_base_ext ++struct pipe_out : handler_base_ext, ::boost::process::detail::uses_handles + { + int sink; + int source; //opposite end +@@ -31,6 +31,14 @@ struct pipe_out : handler_base_ext + p.assign_sink(-1); + } + ++ std::array get_used_handles() ++ { ++ const auto pp1 = p1 != -1 ? p1 : p2; ++ const auto pp2 = p2 != -1 ? p2 : p1; ++ ++ return {sink, source, pp1, pp2}; ++ } ++ + template + void on_error(Executor &, const std::error_code &) const + { +@@ -66,7 +74,7 @@ void pipe_out<2,-1>::on_exec_setup(Executor &e) const + if (::dup2(sink, STDERR_FILENO) == -1) + e.set_error(::boost::process::detail::get_last_error(), "dup2() failed"); + +- if (sink != STDOUT_FILENO) ++ if (sink != STDERR_FILENO) + ::close(sink); + ::close(source); + } +@@ -81,6 +89,7 @@ void pipe_out<1,2>::on_exec_setup(Executor &e) const + e.set_error(::boost::process::detail::get_last_error(), "dup2() failed"); + if ((sink != STDOUT_FILENO) && (sink != STDERR_FILENO)) + ::close(sink); ++ ::close(source); + } + + class async_pipe; +diff --git a/usr/local/include/boost/process/detail/used_handles.hpp b/usr/local/include/boost/process/detail/used_handles.hpp +index 8db226d4..b7dc13d0 100644 +--- a/usr/local/include/boost/process/detail/used_handles.hpp ++++ b/usr/local/include/boost/process/detail/used_handles.hpp +@@ -61,6 +61,9 @@ struct foreach_handle_invocator + template + void foreach_used_handle(Executor &exec, Function &&func) + { ++#if defined(BOOST_POSIX_API) ++ func(exec.error_sink()); ++#endif + boost::fusion::for_each(boost::fusion::filter_if>(exec.seq), + foreach_handle_invocator(func)); + } +diff --git a/usr/local/include/boost/process/detail/windows/handles.hpp b/usr/local/include/boost/process/detail/windows/handles.hpp +index 901b339a..da78b1ce 100644 +--- a/usr/local/include/boost/process/detail/windows/handles.hpp ++++ b/usr/local/include/boost/process/detail/windows/handles.hpp +@@ -141,10 +141,14 @@ struct limit_handles_ : handler_base_ext + ::boost::winapi::DWORD_ flags = 0u; + if (itr != all_handles.end()) + *itr = ::boost::winapi::INVALID_HANDLE_VALUE_; +- else if ((::boost::winapi::GetHandleInformation(*itr, &flags) != 0) +- &&((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too +- *itr = ::boost::winapi::INVALID_HANDLE_VALUE_; + }); ++ for (auto& h : all_handles) { ++ ::boost::winapi::DWORD_ flags = 0u; ++ if ((h != ::boost::winapi::INVALID_HANDLE_VALUE_) ++ && (::boost::winapi::GetHandleInformation(h, &flags) != 0) ++ && ((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too ++ h = ::boost::winapi::INVALID_HANDLE_VALUE_; ++ } + + auto part_itr = std::partition(all_handles.begin(), all_handles.end(), + [](::boost::winapi::HANDLE_ handle) {return handle != ::boost::winapi::INVALID_HANDLE_VALUE_;}); +-- +2.51.2.windows.1 + diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake index e4abb66..b205bbc 100644 --- a/deps/Boost/Boost.cmake +++ b/deps/Boost/Boost.cmake @@ -15,6 +15,7 @@ qidistudio_add_cmake_project(Boost URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz" URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95 LIST_SEPARATOR | + PATCH_COMMAND git apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-FIX-OBS-cannot-start-streaming-on-MAC.patch CMAKE_ARGS -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|wave|test -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros