From 3c31c055c29a314aad1eeb9c9f5d44232081077a Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 24 Jun 2024 08:21:22 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Ubuntu=2024.04=20=E3=81=AB=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 6 ++++++ .vscode/c_cpp_properties.json | 7 +++++++ CHANGES.md | 3 +++ run.py | 13 +++++++++---- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09c7414..73e3f7e 100644 --- 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<> $GITHUB_OUTPUT diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 3af780e..092679f 100644 --- 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 index 22c5e1e..df7f1c4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,9 @@ ## develop +- [ADD] Ubuntu 24.04 x86_64 対応 + - @melpon + ## 2024.1.0 **祝いリリース** diff --git a/run.py b/run.py index 0fd64f8..539c7ae 100644 --- 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( From 0010f0dbe4f40ca57c7175b4989c7148dfe4184e Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 24 Jun 2024 08:26:57 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util.hpp b/src/util.hpp index 6093f29..f7ac81c 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,6 +1,8 @@ #ifndef SORAC_UTIL_HPP_ #define SORAC_UTIL_HPP_ +#include + #include #include From 91924123e2900736d00250935e6bae5178f1e47c Mon Sep 17 00:00:00 2001 From: melpon Date: Mon, 24 Jun 2024 08:34:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/sumomo/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sumomo/CMakeLists.txt b/examples/sumomo/CMakeLists.txt index 9fc5b95..07fde5e 100644 --- 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