From 0132f3984b5112fc9fe7e539d34f88dfc84e5d3a Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:42:10 +0900 Subject: [PATCH 1/6] =?UTF-8?q?BOOST=5FVERSION=20=E3=82=92=201.87.0=20?= =?UTF-8?q?=E3=81=AB=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2ca969c..800c366 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ SORA_CPP_SDK_VERSION=2024.8.0-canary.31 WEBRTC_BUILD_VERSION=m131.6778.4.0 -BOOST_VERSION=1.86.0 +BOOST_VERSION=1.87.0 CMAKE_VERSION=3.30.5 CUDA_VERSION=11.8.0-1 ANDROID_NDK_VERSION=r26b From d1abc1d84630eceba4f11580342aea7cc2895e8f Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:42:58 +0900 Subject: [PATCH 2/6] =?UTF-8?q?examples=20=E3=81=AE=20BOOST=5FVERSION=20?= =?UTF-8?q?=E3=82=82=E4=B8=8A=E3=81=92=E3=82=8B=20=20Please=20enter=20the?= =?UTF-8?q?=20commit=20message=20for=20your=20changes.=20Lines=20starting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/VERSION b/examples/VERSION index a9fd6d1..5987dbd 100644 --- a/examples/VERSION +++ b/examples/VERSION @@ -1,6 +1,6 @@ SORA_CPP_SDK_VERSION=2024.8.0-canary.31 WEBRTC_BUILD_VERSION=m131.6778.4.0 -BOOST_VERSION=1.86.0 +BOOST_VERSION=1.87.0 CMAKE_VERSION=3.30.5 SDL2_VERSION=2.30.10 CLI11_VERSION=v2.4.2 From b71e81155a0e5d23bdf27ab6902ab5ed91b98757 Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:53:26 +0900 Subject: [PATCH 3/6] =?UTF-8?q?websocket.h=20=E3=81=AB=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/sora/websocket.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/sora/websocket.h b/include/sora/websocket.h index 759e585..00b9425 100644 --- a/include/sora/websocket.h +++ b/include/sora/websocket.h @@ -6,6 +6,8 @@ #include // Boost +#include +#include #include #include #include @@ -15,6 +17,7 @@ #include #include #include +#include #include "url_parts.h" #include "version.h" From 84f8bca3d2395fa7fdc990c43c520e806faf671b Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:59:37 +0900 Subject: [PATCH 4/6] =?UTF-8?q?boost/asio.hpp=20=E3=81=AF=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E3=81=A0=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/sora/websocket.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/sora/websocket.h b/include/sora/websocket.h index 00b9425..5c0b4ed 100644 --- a/include/sora/websocket.h +++ b/include/sora/websocket.h @@ -6,7 +6,6 @@ #include // Boost -#include #include #include #include From 425aede389654e54e3be33632a554a714208bd6c Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:00:25 +0900 Subject: [PATCH 5/6] =?UTF-8?q?CHANGES=20=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 79f6d9b..b560c3e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,8 +17,11 @@ - @voluntas - [UPDATE] CMake を 3.30.5 にあげる - @voluntas -- [UPDATE] Boost を 1.86.0 にあげる - - @voluntas +- [UPDATE] Boost を 1.87.0 にあげる + - deadline_timer が非推奨になったため、websocket.h にインクルードを追加して利用可能にする + - boost/asio/deadline_timer.hpp + - boost/date_time/posix_time/posix_time.hpp + - @voluntas @torikizi - [UPDATE] libwebrtc を m131.6778.4.0 にあげる - H.265 Patch の修正に伴い、C++ SDK の H.265 に関する設定を変更 - examples と test に `rtc::CreateRandomString` のヘッダを追加 From 4861afdac384a27e4598976c9c454ba91a47476f Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 16 Dec 2024 19:47:23 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 7 +++---- .../src/messaging_recvonly_sample.cpp | 2 +- examples/sdl_sample/src/sdl_sample.cpp | 2 +- examples/sumomo/src/sumomo.cpp | 2 +- include/sora/websocket.h | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b560c3e..42e377b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,10 +18,9 @@ - [UPDATE] CMake を 3.30.5 にあげる - @voluntas - [UPDATE] Boost を 1.87.0 にあげる - - deadline_timer が非推奨になったため、websocket.h にインクルードを追加して利用可能にする - - boost/asio/deadline_timer.hpp - - boost/date_time/posix_time/posix_time.hpp - - @voluntas @torikizi + - boost::asio::deadline_timer が間接的にインクルードされなくなったので、websocket.h に boost/asio/deadline_timer.hpp のインクルードを追加して利用可能にする + - boost::json::error_code が削除されたので boost::system::error_code に置き換える + - @voluntas @torikizi @melpon - [UPDATE] libwebrtc を m131.6778.4.0 にあげる - H.265 Patch の修正に伴い、C++ SDK の H.265 に関する設定を変更 - examples と test に `rtc::CreateRandomString` のヘッダを追加 diff --git a/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp b/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp index 8cbbaee..259b7ce 100644 --- a/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp +++ b/examples/messaging_recvonly_sample/src/messaging_recvonly_sample.cpp @@ -140,7 +140,7 @@ int main(int argc, char* argv[]) { auto is_json = CLI::Validator( [](std::string input) -> std::string { - boost::json::error_code ec; + boost::system::error_code ec; boost::json::parse(input); if (ec) { return "Value " + input + " is not JSON Value"; diff --git a/examples/sdl_sample/src/sdl_sample.cpp b/examples/sdl_sample/src/sdl_sample.cpp index 02f34a2..4b647ad 100644 --- a/examples/sdl_sample/src/sdl_sample.cpp +++ b/examples/sdl_sample/src/sdl_sample.cpp @@ -184,7 +184,7 @@ int main(int argc, char* argv[]) { auto is_json = CLI::Validator( [](std::string input) -> std::string { - boost::json::error_code ec; + boost::system::error_code ec; boost::json::parse(input, ec); if (ec) { return "Value " + input + " is not JSON Value"; diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp index 603fcad..213e3b5 100644 --- a/examples/sumomo/src/sumomo.cpp +++ b/examples/sumomo/src/sumomo.cpp @@ -347,7 +347,7 @@ int main(int argc, char* argv[]) { auto is_json = CLI::Validator( [](std::string input) -> std::string { - boost::json::error_code ec; + boost::system::error_code ec; boost::json::parse(input, ec); if (ec) { return "Value " + input + " is not JSON Value"; diff --git a/include/sora/websocket.h b/include/sora/websocket.h index 5c0b4ed..9a3ef05 100644 --- a/include/sora/websocket.h +++ b/include/sora/websocket.h @@ -16,7 +16,6 @@ #include #include #include -#include #include "url_parts.h" #include "version.h"