From acddc753c8e3e1b6b5b67db608d035f8d51c9afc Mon Sep 17 00:00:00 2001
From: miosakuma <mio.sakuma.gml@gmail.com>
Date: Fri, 29 Mar 2024 19:10:03 +0900
Subject: [PATCH 1/3] =?UTF-8?q?Sora=20CPP=20SDK=202024.5.0=20=E3=81=B8?=
 =?UTF-8?q?=E3=81=82=E3=81=92=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 50f044b..9f2f431 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 ZAKURO_VERSION=2023.1.0
-SORA_CPP_SDK_VERSION=2024.3.1
-WEBRTC_BUILD_VERSION=m121.6167.3.0
+SORA_CPP_SDK_VERSION=2024.5.0
+WEBRTC_BUILD_VERSION=m122.6261.1.0
 BOOST_VERSION=1.84.0
 CLI11_VERSION=v2.4.1
 CMAKE_VERSION=3.28.1

From 866f33bafa5da3fbca020e1182fc72281a023ba8 Mon Sep 17 00:00:00 2001
From: miosakuma <mio.sakuma.gml@gmail.com>
Date: Fri, 29 Mar 2024 19:43:17 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=5F=5Fassertion=5Fhandler=20=E3=82=92?=
 =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=BC=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/run.py b/run.py
index 283d8bb..d45effd 100644
--- a/run.py
+++ b/run.py
@@ -477,6 +477,16 @@ def install_llvm(
             os.path.join(llvm_dir, "libcxx", "include", "__config_site"),
         )
 
+        # __assertion_handler をコピーする
+        # 背景: https://source.chromium.org/chromium/_/chromium/external/github.com/llvm/llvm-project/libcxx.git/+/1e5bda0d1ce8e346955aa4a85eaab258785f11f7
+        shutil.copyfile(
+            # NOTE(enm10k): 最初は default_assertion_handler.in をコピーしていたが、 buildtools 以下に
+            # default_assertion_handler.in から生成されたと思われる __assertion_handler が存在するため、それをコピーする
+            # os.path.join(llvm_dir, "libcxx", "vendor", "llvm", "default_assertion_handler.in"),
+            os.path.join(llvm_dir, "buildtools", "third_party", "libc++", "__assertion_handler"),
+            os.path.join(llvm_dir, "libcxx", "include", "__assertion_handler"),
+        )
+
 
 @versioned
 def install_boost(version, source_dir, install_dir, sora_version, platform: str):

From 6c826f0f184c6499a157703aba1c79f463667361 Mon Sep 17 00:00:00 2001
From: miosakuma <mio.sakuma.gml@gmail.com>
Date: Fri, 29 Mar 2024 19:51:20 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?=
 =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a1d48d7..1cdbf5c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,9 +23,10 @@
   - @melpon
 - [ADD] run.py に `--sora-dir` と `--sora-args` オプションを追加
   - @melpon
-- [UPDATE] Sora C++ SDK を 2024.3.1 に上げる
+- [UPDATE] Sora C++ SDK を 2024.5.0 に上げる
   - それに伴って以下のライブラリのバージョンも上げる
-  - WebRTC を m121.6167.3.0 に上げる
+  - WebRTC を m122.6261.1.0 に上げる
+    - Ubuntu のビルドを通すために、 __assertion_handler というファイルをコピーする処理を追加した
   - Boost を 1.84.0 に上げる
   - @torikizi @voluntas @melpon
 - [UPDATE] asmjit と blend2d を最新版に上げる