Merge pull request #11 from shiguredo/feature/ubuntu-24.04

Ubuntu 24.04 に対応する
shiguredo · Jun 23, 2024 · fd30aa1 · fd30aa1
2 parents 0245b6a + 9192412
commit fd30aa1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,6 +23,9 @@ jobs:
           - name: ubuntu-22.04_x86_64
             runs-on: ubuntu-22.04
             linux: true
+          - name: ubuntu-24.04_x86_64
+            runs-on: ubuntu-24.04
+            linux: true
     name: Build sora-c-sdk for ${{ matrix.m.name }}
     runs-on: ${{ matrix.m.runs-on }}
     steps:
@@ -70,6 +73,9 @@ jobs:
       - uses: ./.github/actions/download
         with:
           platform: ubuntu-22.04_x86_64
+      - uses: ./.github/actions/download
+        with:
+          platform: ubuntu-24.04_x86_64
       - name: Env to output
         run: |
           echo "package_paths<<EOF" >> $GITHUB_OUTPUT

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -16,6 +16,13 @@
                 "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libjpeg-turbo/include",
                 "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libyuv/include",
 
+                "${workspaceFolder}/_build/ubuntu-22.04_x86_64/release/sorac",
+                "${workspaceFolder}/_build/ubuntu-22.04_x86_64/release/sorac/proto/sorac",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/mbedtls/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/openh264/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/libjpeg-turbo/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/libyuv/include",
+
                 "${workspaceFolder}/_build/macos_arm64/release/sorac",
                 "${workspaceFolder}/_build/macos_arm64/release/sorac/proto/sorac",
                 "${workspaceFolder}/_install/macos_arm64/release/mbedtls/include",

diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,9 @@
 
 ## develop
 
+- [ADD] Ubuntu 24.04 x86_64 対応
+  - @melpon
+
 ## 2024.1.0
 
 **祝いリリース**

diff --git a/examples/sumomo/CMakeLists.txt b/examples/sumomo/CMakeLists.txt
@@ -24,7 +24,7 @@ target_sources(sumomo
     util.cpp
 )
 
-if (SUMOMO_TARGET STREQUAL "ubuntu-20.04_x86_64" OR SUMOMO_TARGET STREQUAL "ubuntu-22.04_x86_64")
+if (SUMOMO_TARGET STREQUAL "ubuntu-20.04_x86_64" OR SUMOMO_TARGET STREQUAL "ubuntu-22.04_x86_64" OR SUMOMO_TARGET STREQUAL "ubuntu-24.04_x86_64")
   target_sources(sumomo
     PRIVATE
       pulse_recorder.cpp

diff --git a/run.py b/run.py
@@ -610,7 +610,7 @@ def install_deps(
             install_cmake_args["ext"] = "zip"
         elif build_platform in ("macos_x86_64", "macos_arm64"):
             install_cmake_args["platform"] = "macos-universal"
-        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"):
+        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
             install_cmake_args["platform"] = "linux-x86_64"
         elif build_platform in ("ubuntu-20.04_arm64", "ubuntu-22.04_arm64"):
             install_cmake_args["platform"] = "linux-aarch64"
@@ -662,7 +662,7 @@ def install_deps(
             install_protobuf_args["platform"] = "win64"
         elif build_platform in ("macos_x86_64", "macos_arm64"):
             install_protobuf_args["platform"] = "osx-universal_binary"
-        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"):
+        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
             install_protobuf_args["platform"] = "linux-x86_64"
         else:
             raise Exception("Failed to install Protobuf")
@@ -682,7 +682,7 @@ def install_deps(
             install_jsonif_args["platform"] = "darwin-amd64"
         elif build_platform in ("macos_arm64",):
             install_jsonif_args["platform"] = "darwin-arm64"
-        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64"):
+        elif build_platform in ("ubuntu-20.04_x86_64", "ubuntu-22.04_x86_64", "ubuntu-24.04_x86_64"):
             install_jsonif_args["platform"] = "linux-amd64"
         else:
             raise Exception("Failed to install protoc-gen-jsonif")
@@ -777,6 +777,7 @@ def create(version, base_dir, libdatachannel_dir):
     "macos_arm64",
     "ubuntu-20.04_x86_64",
     "ubuntu-22.04_x86_64",
+    "ubuntu-24.04_x86_64",
     "ios",
     "android",
 ]
@@ -805,8 +806,10 @@ def main():
 
     if target_platform in ("ubuntu-20.04_x86_64",):
         build_platform = "ubuntu-20.04_x86_64"
-    elif target_platform in ("ubuntu-22.04_x86_64",):
+    elif target_platform in ("ubuntu-22.04_x86_64", ):
         build_platform = "ubuntu-22.04_x86_64"
+    elif target_platform in ("ubuntu-24.04_x86_64", ):
+        build_platform = "ubuntu-24.04_x86_64"
     elif target_platform in ("macos_x86_64", "macos_arm64"):
         build_platform = f"macos_{arch}"
 
@@ -899,6 +902,7 @@ def main():
             "windows_x86_64",
             "ubuntu-20.04_x86_64",
             "ubuntu-22.04_x86_64",
+            "ubuntu-24.04_x86_64",
         ):
             cmake_args.append("-DUSE_NVCODEC_ENCODER=ON")
             if target_platform == "windows_x86_64":
@@ -911,6 +915,7 @@ def main():
             "windows_x86_64",
             "ubuntu-20.04_x86_64",
             "ubuntu-22.04_x86_64",
+            "ubuntu-24.04_x86_64",
         ):
             cmake_args.append("-DUSE_VPL_ENCODER=ON")
             cmake_args.append(

diff --git a/src/util.hpp b/src/util.hpp
@@ -1,6 +1,8 @@
 #ifndef SORAC_UTIL_HPP_
 #define SORAC_UTIL_HPP_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>