Merge pull request #42 from shiguredo/feature/update-libwebrtc-m119

libwebrtc を m119 に上げる

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: build-workflow
 on:
   push:
     paths-ignore:
-    - 'doc/**'
-    - '**.md'
-    - 'LICENSE'
-    - 'NOTICE'
+      - "doc/**"
+      - "**.md"
+      - "LICENSE"
+      - "NOTICE"
 
 jobs:
   build-windows:
@@ -161,16 +161,20 @@ jobs:
         if: matrix.name == 'ubuntu-20.04_x86_64' || matrix.name == 'ubuntu-22.04_x86_64'
         run: |
           source VERSION
-          # clang-12 と CUDA を入れる
+          # clang-15 と CUDA を入れる
           sudo apt-get update
           sudo apt-get install -y software-properties-common
           # CUDA 10 なので ubuntu1804 で正しい
           wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin
           sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600
           sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
           sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
-          sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION clang-12
+          DEBIAN_FRONTEND=noninteractive sudo apt-get -y install cuda=$CUDA_VERSION
+
+          wget https://apt.llvm.org/llvm.sh
+          chmod a+x llvm.sh
+          sudo ./llvm.sh 15
+
           # Intel Media SDK のために libva-dev, libdrm-dev を入れる
           DEBIAN_FRONTEND=noninteractive sudo apt-get -y install libva-dev libdrm-dev
       - name: Install deps for Jetson series
@@ -258,5 +262,4 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files:
-            ${{ steps.env.outputs.package_paths }}
+          files: ${{ steps.env.outputs.package_paths }}

CMakeLists.txt

@@ -80,11 +80,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 # libsora.a を作る
 
 add_library(sora STATIC)
-if (WIN32)
-  set_target_properties(sora PROPERTIES CXX_STANDARD 20 C_STANDARD 20)
-else()
-  set_target_properties(sora PROPERTIES CXX_STANDARD 17 C_STANDARD 17)
-endif()
+set_target_properties(sora PROPERTIES CXX_STANDARD 20 C_STANDARD 20)
 
 string(SUBSTRING "${SORA_CPP_SDK_COMMIT}" 0 8 SORA_CPP_SDK_COMMIT_SHORT)
 string(SUBSTRING "${WEBRTC_COMMIT}" 0 8 WEBRTC_COMMIT_SHORT)

VERSION

@@ -1,12 +1,12 @@
 SORA_CPP_SDK_VERSION=2023.14.0
-WEBRTC_BUILD_VERSION=m118.5993.2.1
+WEBRTC_BUILD_VERSION=m119.6045.2.0
 BOOST_VERSION=1.83.0
-CMAKE_VERSION=3.26.4
+CMAKE_VERSION=3.27.7
 BAZEL_VERSION=5.3.2
 LYRA_VERSION=1.3.0
 LYRA_COMPATIBLE_VERSION=1.3.0
 CUDA_VERSION=10.2.89-1
-ANDROID_NDK_VERSION=r25b
+ANDROID_NDK_VERSION=r26b
 ANDROID_NATIVE_API_LEVEL=29
 ANDROID_SDK_CMDLINE_TOOLS_VERSION=8092744
 VPL_VERSION=v2023.3.1

run.py

@@ -1353,8 +1353,8 @@ def install_deps(platform: Platform, source_dir, build_dir, install_dir, debug,
                 install_vpl_args['cmake_args'].append(f"-DCMAKE_CXX_FLAGS={' '.join(cxxflags)}")
             if platform.target.os == 'ubuntu':
                 cmake_args = []
-                cmake_args.append("-DCMAKE_C_COMPILER=clang-12")
-                cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12")
+                cmake_args.append("-DCMAKE_C_COMPILER=clang-15")
+                cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15")
                 path = cmake_path(os.path.join(webrtc_info.libcxx_dir, 'include'))
                 cmake_args.append(f"-DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES={path}")
                 flags = [
@@ -1503,8 +1503,8 @@ def main():
             cmake_args.append(f'-DCMAKE_SYSTEM_VERSION={WINDOWS_SDK_VERSION}')
         if platform.target.os == 'ubuntu':
             if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'):
-                cmake_args.append("-DCMAKE_C_COMPILER=clang-12")
-                cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12")
+                cmake_args.append("-DCMAKE_C_COMPILER=clang-15")
+                cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15")
             else:
                 cmake_args.append(
                     f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}")
@@ -1663,8 +1663,8 @@ def main():
                     cmake_args.append(f'-DCMAKE_SYSROOT={sysroot}')
                 if platform.target.os == 'ubuntu':
                     if platform.target.package_name in ('ubuntu-20.04_x86_64', 'ubuntu-22.04_x86_64'):
-                        cmake_args.append("-DCMAKE_C_COMPILER=clang-12")
-                        cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-12")
+                        cmake_args.append("-DCMAKE_C_COMPILER=clang-15")
+                        cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-15")
                     else:
                         cmake_args.append(
                             f"-DCMAKE_C_COMPILER={cmake_path(os.path.join(webrtc_info.clang_dir, 'bin', 'clang'))}")

test/android/app/build.gradle

@@ -62,7 +62,7 @@ android {
     externalNativeBuild {
         cmake {
             path file('src/main/cpp/CMakeLists.txt')
-            version '3.26.4'
+            version '3.27.7'
         }
     }
     buildFeatures {

third_party/lyra/toolchain/android/BUILD.tpl

@@ -18,7 +18,7 @@ cc_toolchain_config(
     abi_version = "local",
     abi_libc_version = "local",
     cxx_builtin_include_directories = [
-        '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/%{clang_version}/include',
+        '%{android_ndk}/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/%{clang_version}/include',
         '%sysroot%/usr/include',
         '%sysroot%/usr/local/include',
         "%{webrtc_include_dir}/third_party/libc++abi/src/include",