Merge branch 'develop' into feature/fix-android-hello-not-to-dispose-when-orientation-change

miosakuma · web-flow · commit a4bc23533b6e · 2025-10-31T17:50:57.000+09:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -210,47 +210,37 @@ jobs:
           # 1.4G
           sudo rm -rf /usr/share/dotnet
           df -h
-      # Ubuntu 24.04 だと libtinfo5 が見つからない問題があるので、その修正
-      # ref: https://qiita.com/gengen16k/items/88cf3c18a40a94205fab
-      - name: Fix CUDA issues for Ubuntu 24.04
-        if: matrix.platform.name == 'ubuntu-24.04_x86_64'
-        run: |
-          sudo tee /etc/apt/sources.list.d/jammy.list << EOF
-          deb http://archive.ubuntu.com/ubuntu/ jammy universe
-          EOF
-
-          sudo tee /etc/apt/preferences.d/pin-jammy <<EOF
-          Package: *
-          Pin: release n=jammy
-          Pin-Priority: -10
-
-          Package: libtinfo5
-          Pin: release n=jammy
-          Pin-Priority: 990
-          EOF
-      - name: Install deps for ${{ matrix.platform.name }}
+      - name: Install base deps for ${{ matrix.platform.name }}
         if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
         run: |
-          source DEPS
           sudo apt-get update
           sudo apt-get install -y software-properties-common
-
-          # X11
-          sudo apt-get install libx11-dev libxext-dev
-
-          # OpenGL
+      - name: Install X11 for ${{ matrix.platform.name }}
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
+        run: |
+          sudo apt-get install -y libx11-dev libxext-dev
+      - name: Install OpenGL for ${{ matrix.platform.name }}
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
+        run: |
           sudo apt-get install -y libgl-dev
 
-          # CUDA
-          # libssl1.1 が必要
-          wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb
-          sudo dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb
-          wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
-          sudo dpkg -i cuda-keyring_*all.deb
-          sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION
+      - name: Get CUDA version from DEPS
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
+        id: cuda-version
+        run: |
+          CUDA_VERSION=$(grep '^CUDA_VERSION=' DEPS | cut -d= -f2)
+          echo "cuda_version=$CUDA_VERSION" >> $GITHUB_OUTPUT
+
+      - uses: shiguredo/github-actions/.github/actions/setup-cuda-toolkit@main
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
+        id: cuda
+        with:
+          cuda_version: ${{ steps.cuda-version.outputs.cuda_version }}
+          platform: ${{ matrix.platform.runs-on }}
 
-          # clang-20
+      - name: Install clang-20 for ${{ matrix.platform.name }}
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64'
+        run: |
           wget https://apt.llvm.org/llvm.sh
           chmod a+x llvm.sh
           sudo ./llvm.sh 20
@@ -269,14 +259,14 @@ jobs:
           sudo apt-get -y install ninja-build
       # JDK を指定しないとデフォルトの JDK 11 で動作するため指定する
       - name: Setup JDK 17
+        if: matrix.platform.os == 'android'
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: 'temurin'
-        if: matrix.platform.os == 'android'
+          java-version: "17"
+          distribution: "temurin"
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
         if: matrix.platform.os == 'android'
+        uses: android-actions/setup-android@v3
       - run: python3 run.py build --test --run-e2e-test --package ${{ matrix.platform.name }}
       - name: Get package name
         run: |
@@ -300,15 +290,16 @@ jobs:
           name: ${{ matrix.platform.name }}.env
           path: _package/${{ matrix.platform.name }}/release/sora.env
       - name: Build Examples
+        if: matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8'
         run: |
           cd examples
           mkdir examples_${{ matrix.platform.name }}
           for app in sdl_sample sumomo messaging_recvonly_sample; do
             python3 $app/${{ matrix.platform.name }}/run.py --local-sora-cpp-sdk-dir ..
             cp _build/${{ matrix.platform.name }}/release/$app/$app examples_${{ matrix.platform.name }}
           done
-        if: matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8'
-      - name: Build Examples
+      - name: Build Examples (Raspberry Pi OS)
+        if: matrix.platform.os == 'raspberry-pi-os' && matrix.platform.arch == 'armv8'
         run: |
           cd examples
           mkdir examples_${{ matrix.platform.name }}
@@ -318,13 +309,14 @@ jobs:
             # raspberry-pi-os は libcamerac.so も必要
             cp _build/${{ matrix.platform.name }}/release/$app/libcamerac.so examples_${{ matrix.platform.name }}
           done
-        if: matrix.platform.os == 'raspberry-pi-os' && matrix.platform.arch == 'armv8'
       - name: Upload Examples Artifact
+        if: |
+          (matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8') ||
+          (matrix.platform.os == 'raspberry-pi-os')
         uses: actions/upload-artifact@v4
         with:
           name: examples_${{ matrix.platform.name }}
           path: examples/examples_${{ matrix.platform.name }}
-        if: matrix.platform.os == 'ubuntu' && matrix.platform.name != 'ubuntu-22.04_armv8'
 
   create-release:
     name: Create Release
@@ -398,24 +390,24 @@ jobs:
         working-directory: ${{ github.workspace }}/examples
     runs-on: windows-2022
     steps:
-        - uses: actions/checkout@v5
-        - name: Build Example
-          run: |
-            python3 ${{ matrix.example }}/windows_x86_64/run.py
-        - name: Package Binary
-          run: |
-            # アップロード用のディレクトリを作成する
-            mkdir -p ${{ matrix.example }}_windows_x86_64
-            # バイナリをアップロード用のディレクトリにコピーする
-            cp _build/windows_x86_64/release/${{ matrix.example }}/Release/${{ matrix.example }}.exe ${{ matrix.example }}_windows_x86_64/${{ matrix.example }}.exe
-            # バイナリを圧縮する
-            # 例: sumomo_windows_x86_64.zip
-            Compress-Archive -Path ${{ matrix.example }}_windows_x86_64 -DestinationPath ${{ matrix.example }}_windows_x86_64.zip
-        - name: Upload Examples Artifact
-          uses: actions/upload-artifact@v4
-          with:
-             name: ${{ matrix.example }}_windows_x86_64.zip
-             path: examples/${{ matrix.example }}_windows_x86_64.zip
+      - uses: actions/checkout@v5
+      - name: Build Example
+        run: |
+          python3 ${{ matrix.example }}/windows_x86_64/run.py
+      - name: Package Binary
+        run: |
+          # アップロード用のディレクトリを作成する
+          mkdir -p ${{ matrix.example }}_windows_x86_64
+          # バイナリをアップロード用のディレクトリにコピーする
+          cp _build/windows_x86_64/release/${{ matrix.example }}/Release/${{ matrix.example }}.exe ${{ matrix.example }}_windows_x86_64/${{ matrix.example }}.exe
+          # バイナリを圧縮する
+          # 例: sumomo_windows_x86_64.zip
+          Compress-Archive -Path ${{ matrix.example }}_windows_x86_64 -DestinationPath ${{ matrix.example }}_windows_x86_64.zip
+      - name: Upload Examples Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.example }}_windows_x86_64.zip
+          path: examples/${{ matrix.example }}_windows_x86_64.zip
 
   build-macos-examples:
     needs: create-release
@@ -428,23 +420,23 @@ jobs:
         working-directory: ${{ github.workspace }}/examples
     runs-on: macos-14
     steps:
-        - uses: actions/checkout@v5
-        - name: Build Example
-          run: |
-            python3 ${{ matrix.example }}/macos_arm64/run.py
-        - name: Package Binary
-          run: |
-            # アップロード用のディレクトリを作成する
-            mkdir -p ${{ matrix.example }}_macos_arm64
-            cp _build/macos_arm64/release/${{ matrix.example }}/${{ matrix.example }} ${{ matrix.example }}_macos_arm64/${{ matrix.example }}
-            # バイナリを圧縮する
-            # 例: sumomo_macos_arm64.tar.gz
-            tar -czf ${{ matrix.example }}_macos_arm64.tar.gz ${{ matrix.example }}_macos_arm64
-        - name: Upload Examples Artifact
-          uses: actions/upload-artifact@v4
-          with:
-             name: ${{ matrix.example }}_macos_arm64.tar.gz
-             path: examples/${{ matrix.example }}_macos_arm64.tar.gz
+      - uses: actions/checkout@v5
+      - name: Build Example
+        run: |
+          python3 ${{ matrix.example }}/macos_arm64/run.py
+      - name: Package Binary
+        run: |
+          # アップロード用のディレクトリを作成する
+          mkdir -p ${{ matrix.example }}_macos_arm64
+          cp _build/macos_arm64/release/${{ matrix.example }}/${{ matrix.example }} ${{ matrix.example }}_macos_arm64/${{ matrix.example }}
+          # バイナリを圧縮する
+          # 例: sumomo_macos_arm64.tar.gz
+          tar -czf ${{ matrix.example }}_macos_arm64.tar.gz ${{ matrix.example }}_macos_arm64
+      - name: Upload Examples Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.example }}_macos_arm64.tar.gz
+          path: examples/${{ matrix.example }}_macos_arm64.tar.gz
 
   build-ubuntu-examples:
     needs: create-release
@@ -510,35 +502,35 @@ jobs:
           path: examples/${{ matrix.example }}_${{ matrix.platform.name }}.tar.gz
 
   create-release-example:
-      name: Create Release Examples
-      needs: 
-        - build-windows-examples
-        - build-macos-examples
-        - build-ubuntu-examples
-      strategy:
-        matrix:
-          example:
-            - sumomo
-          archive:
-            - windows_x86_64.zip
-            - macos_arm64.tar.gz
-            - ubuntu-22.04_x86_64.tar.gz
-            - ubuntu-24.04_x86_64.tar.gz
-            - ubuntu-24.04_armv8.tar.gz
-            - raspberry-pi-os_armv8.tar.gz
-      runs-on: ubuntu-24.04
-      steps:
-        - uses: actions/checkout@v5
-        - uses: actions/download-artifact@v5
-          with:
-            name: ${{ matrix.example }}_${{ matrix.archive }}
-        - name: Release Examples
-          run: |
-            gh release upload "${{ github.ref_name }}" \
-              "${{ matrix.example }}_${{ matrix.archive }}" \
-              --clobber
-          env:
-            GH_TOKEN: ${{ github.token }}
+    name: Create Release Examples
+    needs:
+      - build-windows-examples
+      - build-macos-examples
+      - build-ubuntu-examples
+    strategy:
+      matrix:
+        example:
+          - sumomo
+        archive:
+          - windows_x86_64.zip
+          - macos_arm64.tar.gz
+          - ubuntu-22.04_x86_64.tar.gz
+          - ubuntu-24.04_x86_64.tar.gz
+          - ubuntu-24.04_armv8.tar.gz
+          - raspberry-pi-os_armv8.tar.gz
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/download-artifact@v5
+        with:
+          name: ${{ matrix.example }}_${{ matrix.archive }}
+      - name: Release Examples
+        run: |
+          gh release upload "${{ github.ref_name }}" \
+            "${{ matrix.example }}_${{ matrix.archive }}" \
+            --clobber
+        env:
+          GH_TOKEN: ${{ github.token }}
 
   notification:
     name: Slack Notification
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
@@ -13,46 +13,17 @@ permissions:
   actions: read
 
 env:
-  ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY_SORA_OSS_SONNET }}
+  CLAUDE_API_KEY: ${{ secrets.ANTHROPIC_API_KEY_SORA_OSS_SONNET }}
+  CLAUDE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN_VOLUNTAS }}
 
 jobs:
-  claude-opus-response-voluntas:
-    if: github.event.comment.user.login == 'voluntas'
+  claude-response:
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v5
-      - uses: anthropics/claude-code-action@v1
+      - uses: shiguredo/github-actions/.github/actions/claude-code-action@main
         with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN_VOLUNTAS }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          trigger_phrase: "!opus"
-          claude_args: |
-            --model claude-opus-4-1-20250805
-
-  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:
-    needs: check-permission
-    if: needs.check-permission.outputs.has_permission == 'true'
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v5
-      - uses: anthropics/claude-code-action@v1
-        with:
-          anthropic_api_key: ${{ env.ANTHROPIC_API_KEY }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          trigger_phrase: "!sonnet"
-          claude_args: |
-            --model claude-sonnet-4-5-20250929
+          api_key: ${{ env.CLAUDE_API_KEY }}
+          oauth_user: voluntas
+          oauth_token: ${{ env.CLAUDE_OAUTH_TOKEN }}
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,9 +11,16 @@
 
 ## develop
 
+- [UPDATE] CUDA のバージョンを `12.9.1-1` に上げる
+  - CUDA コンパイルオプションに `D_ALLOW_UNSUPPORTED_LIBCPP` を追加する
+  - CUDA コンパイルオプションの `cuda-gpu-arch` を `sm_35` から `sm_60` に変更する
+    - sm_60 は Pascal 世代の GPU からサポートされている
+    - sm_35 は Kepler 世代の GPU からサポートされているが、Kepler は CUDA 10 までのサポートとなるためドロップ
+    - sm_50 は Maxwell 世代の GPU からサポートされているが、Maxwell は CUDA 11 までのサポートとなるドロップ
+  - @voluntas
 - [CHANGE] enum の `kNvidiaVideoCodecSdk` を `kNvidiaVideoCodec` に変更する
   - @voluntas
-- [CHANGE] liwebrtc のバージョンを m141.7390.2.0 に上げる
+- [CHANGE] liwebrtc のバージョンを m141.7390.3.3 に上げる
   - macOS, iOS が利用している clang, libc++ を Apple Clang のものから libwebrtc 管理下の Clang のものに変えたので破壊的変更となります
   - libwebrtc m141 で `rtc_config.crypto_options` の型が変更されたため、`emplace()` ではなく直接アクセスするよう修正
   - Windows で `CreateWindowsCoreAudioAudioDeviceModule` が `Environment` を受け取る API に変わったため、それに追従
@@ -40,12 +47,17 @@
   - @melpon
 - [UPDATE] actions/download-artifact を v5 に上げる
   - @miosakuma
+- [UPDATE] examples/DEPS の CLI11 バージョンを v2.6.1 にあげる
+  - @torikizi
+- [UPDATE] examples/DEPS の SDL バージョンを 3.2.24 にあげる
+  - @torikizi
 - [FIX] sumomo で audio_device をデフォルト無効にしていたのを修正する
   - @torikizi
 - [FIX] android の hello アプリについて回転時やスクリーンサイズの変更時に Activity の再起動が行われないようにする
   - AndroidManifest.xml の `android:configChanges` に `"orientation|screenSize|smallestScreenSize|screenLayout"` を設定する
-
   - @miosakuma
+- [FIX] GitHub Actions の build.yml で CUDA パッケージを ubuntu のバージョンに合わせるようにする
+  - @voluntas
 
 ## 2025.5.1
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -568,7 +568,7 @@ elseif (SORA_TARGET_OS STREQUAL "ubuntu")
         third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp
         third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp
       PROPERTIES
-        COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_35;-std=gnu++17;-Wno-tautological-constant-out-of-range-compare"
+        COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_60;-std=gnu++17;-Wno-tautological-constant-out-of-range-compare;-D_ALLOW_UNSUPPORTED_LIBCPP"
     )
 
     # CUDA を要求したくないので libsora.a に含める
diff --git a/DEPS b/DEPS
@@ -1,8 +1,8 @@
-WEBRTC_BUILD_VERSION=m141.7390.2.0
+WEBRTC_BUILD_VERSION=m141.7390.3.3
 BOOST_VERSION=1.89.0
 BOOST_SHA256_HASH=9de758db755e8330a01d995b0a24d09798048400ac25c03fc5ea9be364b13c93
 CMAKE_VERSION=4.1.2
-CUDA_VERSION=11.8.0-1
+CUDA_VERSION=12.9.1-1
 ANDROID_NDK_VERSION=r28b
 ANDROID_NATIVE_API_LEVEL=29
 ANDROID_SDK_CMDLINE_TOOLS_VERSION=13114758
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2025.6.0-canary.5
+2025.6.0-canary.9
diff --git a/buildbase.py b/buildbase.py
diff --git a/examples/DEPS b/examples/DEPS
diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ elseif (SORA_TARGET_OS STREQUAL "ubuntu")`
`568`	`568`	`third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp`
`569`	`569`	`third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp`
`570`	`570`	`PROPERTIES`
`571`		`- COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_35;-std=gnu++17;-Wno-tautological-constant-out-of-range-compare"`
	`571`	`+ COMPILE_OPTIONS "-xcuda;--cuda-gpu-arch=sm_60;-std=gnu++17;-Wno-tautological-constant-out-of-range-compare;-D_ALLOW_UNSUPPORTED_LIBCPP"`
`572`	`572`	`)`
`573`	`573`
`574`	`574`	`# CUDA を要求したくないので libsora.a に含める`