Merge branch 'release/2025.3.0'

Author: voluntas

.github/actions/download/action.yml

@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: ${{ inputs.platform }}.env
         path: ${{ inputs.platform }}.env
@@ -22,7 +22,7 @@ runs:
         echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
         echo "$PACKAGE_NAME/$PACKAGE_NAME" >> package_paths.env
       id: env
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: ${{ steps.env.outputs.package_name }}
         path: ${{ steps.env.outputs.package_name }}

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: build-workflow
+name: build
 
 on:
   push:
@@ -17,7 +17,7 @@ on:
     - 'NOTICE'
 
 jobs:
-  build-linux:
+  build_linux:
     strategy:
       fail-fast: false
       matrix:
@@ -27,11 +27,11 @@ jobs:
     name: Build zakuro for ${{ matrix.name }}
     runs-on: ${{ matrix.name == 'ubuntu-24.04_x86_64' && 'ubuntu-24.04' || 'ubuntu-22.04' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install deps
         run: |
           DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libx11-dev libxext-dev
-      - run: python3 run.py ${{ matrix.name }} --package
+      - run: python3 run.py build ${{ matrix.name }} --package
       - name: Get package name
         shell: bash
         run: |
@@ -48,20 +48,51 @@ jobs:
         with:
           name: ${{ matrix.name }}.env
           path: _package/${{ matrix.name }}/release/zakuro.env
-  create-release:
+  build_macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        name:
+          - macos_arm64
+    name: Build zakuro for ${{ matrix.name }}
+    runs-on: macos-15
+    steps:
+      - uses: actions/checkout@v5
+      - run: python3 run.py build ${{ matrix.name }} --package
+      - name: Get package name
+        shell: bash
+        run: |
+          source _package/${{ matrix.name }}/release/zakuro.env
+          echo "name=${PACKAGE_NAME}" >> $GITHUB_OUTPUT
+        id: package_name
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.package_name.outputs.name }}
+          path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
+      - name: Upload Environment
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.name }}.env
+          path: _package/${{ matrix.name }}/release/zakuro.env
+  create_release:
     name: Create Release
     if: contains(github.ref, 'tags/202')
     needs:
-      - build-linux
+      - build_linux
+      - build_macos
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/download
         with:
           platform: ubuntu-22.04_x86_64
       - uses: ./.github/actions/download
         with:
           platform: ubuntu-24.04_x86_64
+      - uses: ./.github/actions/download
+        with:
+          platform: macos_arm64
       - name: Env to output
         run: |
           echo "package_paths=$(cat package_paths.env | tr '\n' ' ')" >> $GITHUB_OUTPUT

.github/workflows/claude.yml

@@ -6,6 +6,12 @@ on:
   pull_request_review_comment:
     types: [created]
 
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+  actions: read
+
 env:
   ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY_SORA_OSS_SONNET }}
 
@@ -15,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: anthropics/claude-code-action@beta
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN_VOLUNTAS }}
@@ -25,17 +31,30 @@ jobs:
           timeout_minutes: 15
           disallowed_tools: "Bash(git:*)"
 
+  check-permission:
+    if: github.event.comment.user.login != 'voluntas'
+    runs-on: ubuntu-24.04
+    outputs:
+      has_permission: ${{ steps.check.outputs.has-permission }}
+    steps:
+      - uses: actions/checkout@v5
+      - id: check
+        uses: shiguredo/github-actions/.github/actions/check-write-permission@main
+        with:
+          username: ${{ github.event.comment.user.login }}
+
   claude-sonnet-response-others:
-    if: contains(fromJSON('["Hexa", "akko", "sile", "melpon", "tnamao", "torikizi", "miosakuma", "zztkm", "t-miya"]'), github.event.comment.user.login)
+    needs: check-permission
+    if: needs.check-permission.outputs.has_permission == 'true'
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: anthropics/claude-code-action@beta
         with:
           anthropic_api_key: ${{ env.ANTHROPIC_API_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           model: "claude-sonnet-4-20250514"
           trigger_phrase: "!sonnet"
           timeout_minutes: 15
-          disallowed_tools: "Bash(git:*)"
+          disallowed_tools: "Bash(git:*)"

.gitignore

@@ -38,7 +38,7 @@ webrtc_logs_0
 .DS_Store
 *.swp
 
-*.yaml
+*.jsonc
 
 /_package
 /_source

.vscode/c_cpp_properties.json

@@ -14,8 +14,7 @@
                 "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/boost/include",
                 "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/cli11/include",
                 "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/blend2d/include",
-                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/openh264/include",
-                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/yaml/include"
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/openh264/include"
             ],
             "defines": [
                 "WEBRTC_POSIX",
@@ -47,8 +46,7 @@
                 "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/boost/include",
                 "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/cli11/include",
                 "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/blend2d/include",
-                "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/openh264/include",
-                "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/yaml/include"
+                "${workspaceFolder}/_install/ubuntu-24.04_x86_64/release/openh264/include"
             ],
             "defines": [
                 "WEBRTC_POSIX",

.vscode/settings.json

@@ -14,6 +14,12 @@
     "[cpp]": {
         "editor.formatOnSave": true
     },
+    "json.schemas": [{
+        "fileMatch": ["*.jsonc"],
+        "schema": {
+            "allowTrailingCommas": true,
+        }
+    }],
     "files.associations": {
         "*.cs": "csharp",
         "CMakeLists.txt": "cmake",

CHANGES.md

@@ -11,12 +11,46 @@
 
 ## develop
 
+## 2025.3.0
+
+**リリース日**: 2025-09-17
+
+- [CHANGE] 設定ファイル形式を YAML から JSONC (JSON with Comments) に変更する
+  - `/` と `/* */` コメントと末尾カンマをサポートする JSONC 形式を採用
+  - 設定ファイルの拡張子を `.yaml` から `.jsonc` に変更
+  - トップレベルの `zakuro` を削除しました
+  - @voluntas
+- [CHANGE] 設定ファイルの JSONC 化により不要になった `yaml-cpp` 依存を削除
+  - @voluntas
+- [CHANGE] kuzushi 機能を削除する
+  - @voluntas
+- [UPDATE] Sora C++ SDK を `2025.5.0` に上げる
+  - libwebrtc のバージョンを `m139.7258.3.0` に上げる
+  - CMake のバージョンを `4.1.0` に上げる
+  - Boost のバージョンを `1.89.0` に上げる
+- [UPDATE] blend2d のバージョンを `0.20.0` に上げる
+  - blend2d の API 変更への追従: `camelCase` から `snake_case` へ移行
+  - 影響範囲: `src/fake_video_capturer.cpp` のみ
+  - 変更内容（旧 → 新）の一例 :
+    - `image_.getData(&data);` -> `image_.get_data(&data);`
+    - `ctx.setFillStyle(BLRgba32(0, 255, 255));` -> `ctx.set_fill_style(BLRgba32(0, 255, 255));`
+    - `ctx.fillPie(0, 0, width * 0.09, 0, 2 * pi);` -> `ctx.fill_pie(0, 0, width * 0.09, 0, 2 * pi);`
+  - 変更対象外の API
+    - `ctx.end()`, `ctx.save()`, `ctx.restore()` は単語なので変更なし
+  - @torikizi
+
+### misc
+
+- [UPDATE] actions/checkout を v5 にアップデート
+  - @torikizi
+- [UPDATE] actions/download-artifact を v5 にアップデート
+  - @torikizi
+
 ## 2025.2.0
 
 **リリース日**: 2025-07-18
 
 - [UPDATE] Sora C++ SDK を `2025.4.0` に上げる
-  - それに伴って以下のライブラリのバージョンも上げる
   - libwebrtc のバージョンを `m138.7204.0.1` に上げる
     - `rtc::` を `webrtc::` に変更する
     - `cricket::` を `webrtc::` に変更する
@@ -63,7 +97,6 @@
 - [ADD] .github ディレクトリに copilot-instructions.md を追加
   - @torikizi
 
-
 ## 2025.1.0
 
 **リリース日**: 2025-06-19

CLAUDE.md

@@ -13,4 +13,4 @@
 - レビューの表現は、指摘内容を優先順位をつけること
 - レビューの表現は、指摘内容を優先順位をつけて、重要なものから順に記載すること
 - ドキュメントは別に書いているので、ドキュメトに付いては考慮しないこと
-- 変更点とリリースノートの整合性を確認すること
+- 変更点とリリースノートの整合性を確認すること

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_policy(SET CMP0091 NEW)
 
 project(zakuro C CXX)
 
-list(APPEND CMAKE_PREFIX_PATH ${SORA_DIR} ${YAML_ROOT_DIR})
+list(APPEND CMAKE_PREFIX_PATH ${SORA_DIR})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SORA_DIR}/share/cmake)
 
 set(Boost_USE_STATIC_LIBS ON)
@@ -19,7 +19,6 @@ find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Blend2D REQUIRED)
 find_package(CLI11 REQUIRED)
-find_package(yaml-cpp REQUIRED)
 
 add_executable(zakuro)
 
@@ -56,7 +55,6 @@ target_link_libraries(zakuro
     Boost::filesystem
     CLI11::CLI11
     Blend2D::Blend2D
-    yaml-cpp::yaml-cpp
 )
 
 target_compile_definitions(zakuro
@@ -146,7 +144,7 @@ foreach(n RANGE ${RESOURCE_FILES_LENGTH_MINUS_ONE})
     set(objfile ${file}.o)
     add_custom_command(OUTPUT ${objfile}
       COMMAND ld
-      ARGS -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${objfile} ${file}
+      ARGS -r -b binary -z noexecstack -o ${CMAKE_CURRENT_BINARY_DIR}/${objfile} ${file}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resource
       MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/resource/${file})
     set_source_files_properties(${objfile}
@@ -166,11 +164,11 @@ foreach(n RANGE ${RESOURCE_FILES_LENGTH_MINUS_ONE})
 endforeach()
 
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/embedded_binary.generated.template.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/embedded_binary.generated.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/embedded_binary.generated.h
   @ONLY)
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/embedded_binary.generated.priv.template.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/embedded_binary.generated.priv.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/embedded_binary.generated.priv.h
   @ONLY)
 

DEPS

@@ -1,8 +1,8 @@
-SORA_CPP_SDK_VERSION=2025.4.0
-WEBRTC_BUILD_VERSION=m138.7204.0.1
-BOOST_VERSION=1.88.0
+SORA_CPP_SDK_VERSION=2025.5.0
+WEBRTC_BUILD_VERSION=m139.7258.3.0
+BOOST_VERSION=1.89.0
 CLI11_VERSION=v2.4.2
-CMAKE_VERSION=4.0.3
-BLEND2D_VERSION=0.12.0
+CMAKE_VERSION=4.1.0
+BLEND2D_VERSION=0.20.0
+BLEND2D_SHA256_HASH=6f08f42fa53ebf57bffa7e18894294b44d6fbc478f6dbbf105791d551fdf6729
 OPENH264_VERSION=v2.6.0
-YAML_CPP_VERSION=2f86d13775d119edbb69af52e5f566fd65c6953b