Merge pull request #314 from shiguredo/feature/update-webrtc-m119

WebRTC を m119 にアップデート
shiguredo · Nov 13, 2023 · 4be50dd · 4be50dd
2 parents f13fb24 + 9ab42bd
commit 4be50dd
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 172 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,17 @@
 
 ## develop
 
+- [UPDATE] WebRTC を m119.6045.2.1 に上げる
+  - @torikizi
+- [UPDATE] WebRTC を m119 に上げたことで必要になった関連するライブラリもバージョンを上げる
+  - CMAKE_VERSION を 3.22.7 に上げる
+  - すべてのプラットフォームで set_target_properties の CXX_STANDARD を 20 にアップデート
+  - Ubuntu で使用する clang のバージョンを 15 にアップデート
+  - @torikizi
+- [UPDATE] パッケージディレクトリ変更に追従する
+  - m118 の際にパッケージディレクトリが変更されたのでそれに追従する
+  - @torikizi
+
 ## 2023.1.0
 
 - [CHANGE] --show-me オプションの削除

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,8 +151,8 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-20.04_x86_64")
   set(WEBRTC_LIBRARY_DIR /root/webrtc/lib)
 
   # /root/llvm/clang にあるコンパイラは使わず、apt でインストールした clang-10 を利用する
-  set(CMAKE_C_COMPILER clang-10)
-  set(CMAKE_CXX_COMPILER clang++-10)
+  set(CMAKE_C_COMPILER clang-15)
+  set(CMAKE_CXX_COMPILER clang++-15)
 
   set(USE_LIBCXX ON)
   set(LIBCXX_INCLUDE_DIR /root/llvm/libcxx/include)
@@ -196,9 +196,9 @@ elseif(MOMO_PACKAGE_NAME STREQUAL "ubuntu-22.04_x86_64")
   set(WEBRTC_INCLUDE_DIR /root/webrtc/include)
   set(WEBRTC_LIBRARY_DIR /root/webrtc/lib)
 
-  # /root/llvm/clang にあるコンパイラは使わず、apt でインストールした clang-12 を利用する
-  set(CMAKE_C_COMPILER clang-12)
-  set(CMAKE_CXX_COMPILER clang++-12)
+  # /root/llvm/clang にあるコンパイラは使わず、apt でインストールした clang-15 を利用する
+  set(CMAKE_C_COMPILER clang-15)
+  set(CMAKE_CXX_COMPILER clang++-15)
 
   set(USE_LIBCXX ON)
   set(LIBCXX_INCLUDE_DIR /root/llvm/libcxx/include)
@@ -316,11 +316,7 @@ target_sources(momo
 
 target_include_directories(momo PRIVATE src)
 
-if (WIN32)
-  set_target_properties(momo PROPERTIES CXX_STANDARD 20 C_STANDARD 99)
-else()
-  set_target_properties(momo PROPERTIES CXX_STANDARD 17 C_STANDARD 99)
-endif()
+set_target_properties(momo PROPERTIES CXX_STANDARD 20 C_STANDARD 99)
 
 target_link_libraries(momo
   PRIVATE

diff --git a/VERSION b/VERSION
@@ -1,9 +1,9 @@
 MOMO_VERSION=2023.1.0
-WEBRTC_BUILD_VERSION=117.5938.2.0
+WEBRTC_BUILD_VERSION=119.6045.2.1
 BOOST_VERSION=1.83.0
 CLI11_VERSION=2.3.2
 SDL2_VERSION=2.28.3
-CMAKE_VERSION=3.27.6
+CMAKE_VERSION=3.27.7
 CUDA_VERSION=11.0.2-1
 WINCUDA_VERSION=10.2
 LIBVA_VERSION=2.7.0

diff --git a/build/ubuntu-20.04_x86_64/Dockerfile b/build/ubuntu-20.04_x86_64/Dockerfile
@@ -39,29 +39,29 @@ RUN \
   && cd /root/boost-source/source \
   && echo 'using clang : : /root/llvm/clang/bin/clang++ : ;' > project-config.jam \
   && ./b2 \
-    cxxstd=17 \
-    cxxflags=' \
-      -D_LIBCPP_ABI_NAMESPACE=Cr \
-      -D_LIBCPP_ABI_VERSION=2 \
-      -D_LIBCPP_DISABLE_AVAILABILITY \
-      -nostdinc++ \
-      -isystem/root/llvm/libcxx/include \
-    ' \
-    linkflags=' \
-    ' \
-    toolset=clang \
-    visibility=global \
-    target-os=linux \
-    address-model=64 \
-    link=static \
-    variant=release \
-    install \
-    -d+0 \
-    -j`nproc` \
-    --ignore-site-config \
-    --prefix=/root/boost \
-    --with-filesystem \
-    --with-json
+  cxxstd=17 \
+  cxxflags=' \
+  -D_LIBCPP_ABI_NAMESPACE=Cr \
+  -D_LIBCPP_ABI_VERSION=2 \
+  -D_LIBCPP_DISABLE_AVAILABILITY \
+  -nostdinc++ \
+  -isystem/root/llvm/libcxx/include \
+  ' \
+  linkflags=' \
+  ' \
+  toolset=clang \
+  visibility=global \
+  target-os=linux \
+  address-model=64 \
+  link=static \
+  variant=release \
+  install \
+  -d+0 \
+  -j`nproc` \
+  --ignore-site-config \
+  --prefix=/root/boost \
+  --with-filesystem \
+  --with-json
 
 # CLI11 の取得
 
@@ -85,45 +85,45 @@ RUN \
   && mkdir -p /root/sdl2-source/build \
   && cd /root/sdl2-source/build \
   && cmake ../source \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/root/SDL2 \
-    -DCMAKE_C_COMPILER=/root/llvm/clang/bin/clang \
-    -DCMAKE_CXX_COMPILER=/root/llvm/clang/bin/clang++ \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DSDL_ATOMIC=OFF \
-    -DSDL_AUDIO=OFF \
-    -DSDL_VIDEO=ON \
-    -DSDL_RENDER=ON \
-    -DSDL_EVENTS=ON \
-    -DSDL_JOYSTICK=ON \
-    -DSDL_HAPTIC=ON \
-    -DSDL_POWER=ON \
-    -DSDL_THREADS=ON \
-    -DSDL_TIMERS=OFF \
-    -DSDL_FILE=OFF \
-    -DSDL_LOADSO=ON \
-    -DSDL_CPUINFO=OFF \
-    -DSDL_FILESYSTEM=OFF \
-    -DSDL_DLOPEN=ON \
-    -DSDL_SENSOR=ON \
-    -DVIDEO_OPENGL=ON \
-    -DVIDEO_OPENGLES=ON \
-    -DVIDEO_RPI=OFF \
-    -DVIDEO_WAYLAND=OFF \
-    -DVIDEO_X11=ON \
-    -DX11_SHARED=OFF \
-    -DVIDEO_X11_XCURSOR=OFF \
-    -DVIDEO_X11_XINERAMA=OFF \
-    -DVIDEO_X11_XINPUT=OFF \
-    -DVIDEO_X11_XRANDR=OFF \
-    -DVIDEO_X11_XSCRNSAVER=OFF \
-    -DVIDEO_X11_XSHAPE=OFF \
-    -DVIDEO_X11_XVM=OFF \
-    -DVIDEO_VULKAN=OFF \
-    -DVIDEO_VIVANTE=OFF \
-    -DVIDEO_COCOA=OFF \
-    -DVIDEO_METAL=OFF \
-    -DVIDEO_KMSDRM=OFF \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/root/SDL2 \
+  -DCMAKE_C_COMPILER=/root/llvm/clang/bin/clang \
+  -DCMAKE_CXX_COMPILER=/root/llvm/clang/bin/clang++ \
+  -DBUILD_SHARED_LIBS=OFF \
+  -DSDL_ATOMIC=OFF \
+  -DSDL_AUDIO=OFF \
+  -DSDL_VIDEO=ON \
+  -DSDL_RENDER=ON \
+  -DSDL_EVENTS=ON \
+  -DSDL_JOYSTICK=ON \
+  -DSDL_HAPTIC=ON \
+  -DSDL_POWER=ON \
+  -DSDL_THREADS=ON \
+  -DSDL_TIMERS=OFF \
+  -DSDL_FILE=OFF \
+  -DSDL_LOADSO=ON \
+  -DSDL_CPUINFO=OFF \
+  -DSDL_FILESYSTEM=OFF \
+  -DSDL_DLOPEN=ON \
+  -DSDL_SENSOR=ON \
+  -DVIDEO_OPENGL=ON \
+  -DVIDEO_OPENGLES=ON \
+  -DVIDEO_RPI=OFF \
+  -DVIDEO_WAYLAND=OFF \
+  -DVIDEO_X11=ON \
+  -DX11_SHARED=OFF \
+  -DVIDEO_X11_XCURSOR=OFF \
+  -DVIDEO_X11_XINERAMA=OFF \
+  -DVIDEO_X11_XINPUT=OFF \
+  -DVIDEO_X11_XRANDR=OFF \
+  -DVIDEO_X11_XSCRNSAVER=OFF \
+  -DVIDEO_X11_XSHAPE=OFF \
+  -DVIDEO_X11_XVM=OFF \
+  -DVIDEO_VULKAN=OFF \
+  -DVIDEO_VIVANTE=OFF \
+  -DVIDEO_COCOA=OFF \
+  -DVIDEO_METAL=OFF \
+  -DVIDEO_KMSDRM=OFF \
   && make -j`nproc` \
   && make install
 
@@ -137,7 +137,13 @@ RUN set -ex \
   && apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
   && add-apt-repository "deb http://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" \
   && apt-get update \
-  && DEBIAN_FRONTEND=noninteractive apt-get -y install cuda=$CUDA_VERSION clang-10
+  && DEBIAN_FRONTEND=noninteractive apt-get -y install cuda=$CUDA_VERSION
+
+# llvm.sh で Clang 15 のインストール
+RUN set -ex \
+  && wget https://apt.llvm.org/llvm.sh \
+  && chmod a+x llvm.sh \
+  && ./llvm.sh 15
 
 # libva
 ARG LIBVA_VERSION
@@ -146,13 +152,13 @@ RUN set -ex \
   && mkdir -p /root/libva-build \
   && cd /root/libva-build \
   && CC=/root/llvm/clang/bin/clang \
-    CXX=/root/llvm/clang/bin/clang++ \
-    CFLAGS="-fPIC" \
-    /root/libva-source/autogen.sh \
-      --enable-static \
-      --disable-shared \
-      --with-drivers-path=/usr/lib/x86_64-linux-gnu/dri \
-      --prefix /root/libva \
+  CXX=/root/llvm/clang/bin/clang++ \
+  CFLAGS="-fPIC" \
+  /root/libva-source/autogen.sh \
+  --enable-static \
+  --disable-shared \
+  --with-drivers-path=/usr/lib/x86_64-linux-gnu/dri \
+  --prefix /root/libva \
   && make -j`nproc` \
   && make install \
   && rm -rf /root/libva-build \
@@ -167,14 +173,14 @@ RUN set -ex \
   && mkdir -p /root/msdk-build \
   && cd /root/msdk-build \
   && cmake \
-      -DCMAKE_INSTALL_PREFIX=/root/msdk \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_PREFIX_PATH=/root/libva \
-      -DCMAKE_C_COMPILER=/root/llvm/clang/bin/clang \
-      -DCMAKE_CXX_COMPILER=/root/llvm/clang/bin/clang++ \
-      -DBUILD_SAMPLES=OFF \
-      -DBUILD_TUTORIALS=OFF \
-      /root/msdk-source \
+  -DCMAKE_INSTALL_PREFIX=/root/msdk \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_PREFIX_PATH=/root/libva \
+  -DCMAKE_C_COMPILER=/root/llvm/clang/bin/clang \
+  -DCMAKE_CXX_COMPILER=/root/llvm/clang/bin/clang++ \
+  -DBUILD_SAMPLES=OFF \
+  -DBUILD_TUTORIALS=OFF \
+  /root/msdk-source \
   && cmake --build . -j`nproc` \
   && cmake --install . \
   && rm -rf /root/msdk-build \