Ubuntu 24.04 に対応する

OEDO-Dynamics · Jun 22, 2024 · 6df376d · 6df376d
1 parent e8b4814
commit 6df376d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,9 +95,10 @@ jobs:
         name:
           - raspberry-pi-os_armv8
           - ubuntu-22.04_x86_64
+          - ubuntu-24.04_x86_64
           - ubuntu-22.04_armv8_jetson
     name: Build momo for ${{ matrix.name }}
-    runs-on: 'ubuntu-22.04'
+    runs-on: ${{ matrix.name == 'ubuntu-24.04_x86_64' && 'ubuntu-24.04' || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4
       - name: Disk cleanup
@@ -182,6 +183,9 @@ jobs:
       - 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: ubuntu-22.04_armv8_jetson

diff --git a/CHANGES.md b/CHANGES.md
@@ -56,6 +56,8 @@
   - @melpon
 - [ADD] OpenH264 を使った H.264 ソフトウェアエンコーダに対応する
   - @melpon
+- [ADD] Ubuntu 24.04 対応
+  - @melpon
 
 ## 2023.1.0
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,6 +54,10 @@ elseif(MOMO_TARGET STREQUAL "ubuntu-22.04_x86_64")
   set(TARGET_OS "linux")
   set(TARGET_OS_LINUX "ubuntu-22.04")
   set(TARGET_ARCH "x86_64")
+elseif(MOMO_TARGET STREQUAL "ubuntu-24.04_x86_64")
+  set(TARGET_OS "linux")
+  set(TARGET_OS_LINUX "ubuntu-24.04")
+  set(TARGET_ARCH "x86_64")
 elseif(MOMO_TARGET STREQUAL "ubuntu-22.04_armv8_jetson")
   set(TARGET_OS "linux")
   set(TARGET_OS_LINUX "ubuntu-22.04")

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 MOMO_VERSION=2023.1.0
-WEBRTC_BUILD_VERSION=m125.6422.2.2
+WEBRTC_BUILD_VERSION=m125.6422.2.4
 BOOST_VERSION=1.85.0
 CLI11_VERSION=v2.4.2
 SDL2_VERSION=2.30.3

diff --git a/run.py b/run.py
@@ -359,6 +359,7 @@ def install_deps(
     "macos_x86_64",
     "macos_arm64",
     "ubuntu-22.04_x86_64",
+    "ubuntu-24.04_x86_64",
     "raspberry-pi-os_armv8",
     "ubuntu-22.04_armv8_jetson",
 ]
@@ -382,6 +383,8 @@ def main():
         platform = Platform("macos", get_macos_osver(), "arm64")
     elif args.target == "ubuntu-22.04_x86_64":
         platform = Platform("ubuntu", "22.04", "x86_64")
+    elif args.target == "ubuntu-24.04_x86_64":
+        platform = Platform("ubuntu", "24.04", "x86_64")
     elif args.target == "raspberry-pi-os_armv8":
         platform = Platform("raspberry-pi-os", None, "armv8")
     elif args.target == "ubuntu-22.04_armv8_jetson":
@@ -446,7 +449,7 @@ def main():
         if platform.target.os == "windows":
             cmake_args.append(f"-DCMAKE_SYSTEM_VERSION={WINDOWS_SDK_VERSION}")
         if platform.target.os == "ubuntu":
-            if platform.target.package_name in ("ubuntu-22.04_x86_64",):
+            if platform.target.package_name in ("ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
                 cmake_args.append("-DCMAKE_C_COMPILER=clang-18")
                 cmake_args.append("-DCMAKE_CXX_COMPILER=clang++-18")
             else:
@@ -507,6 +510,7 @@ def main():
             "macos_x86_64",
             "macos_arm64",
             "ubuntu-22.04_x86_64",
+            "ubuntu-24.04_x86_64",
         ):
             cmake_args.append("-DUSE_SCREEN_CAPTURER=ON")
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,8 @@ @@
       - @melpon
     - [ADD] OpenH264 を使った H.264 ソフトウェアエンコーダに対応する
       - @melpon
+    - [ADD] Ubuntu 24.04 対応
+      - @melpon
     ## 2023.1.0
@@ Expand Down @@