add support for 24.04 (#690)

OpenHD · Apr 22, 2024 · 07ce046 · 07ce046
1 parent bb72a6f
commit 07ce046
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 5 deletions.
diff --git a/.github/workflows/build_package_x86_lunar.yml b/.github/workflows/build_package_x86_lunar.yml
@@ -2,7 +2,7 @@ name: build_package_LUNAR
 
 on:
   push:
-   branches:
+    branches:
       - "2.5-evo"
       - "dev-release"
       - "release"
@@ -13,7 +13,6 @@ env:
 
 jobs:
   build:
-    #runs-on: ubuntu-18.04
     runs-on: ubuntu-22.04
     container:
       image: docker://ubuntu:lunar
@@ -44,7 +43,7 @@ jobs:
           ls -a
 
       - name: Upload to Github
-        uses: 'actions/upload-artifact@v2'
+        uses: actions/upload-artifact@v2
         with:
           name: "QOpenHD"
           path: |
@@ -54,6 +53,7 @@ jobs:
 
       - name: Push
         id: push
+        if: ${{ github.ref != 'refs/heads/2.5-evo' }}
         uses: cloudsmith-io/action@master
         with:
           api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
@@ -65,4 +65,3 @@ jobs:
           release: "lunar"
           republish: "true" # needed ONLY if version is not changing
           file: "QOpenHD/*.deb"
-       if: ${{ github.ref != 'refs/heads/2.5-evo' }}
diff --git a/.github/workflows/build_package_x86_noble.yml b/.github/workflows/build_package_x86_noble.yml
@@ -0,0 +1,68 @@
+name: build_package_NOBLE
+
+on:
+  push:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    #runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
+    container:
+      image: docker://ubuntu:noble
+    env:
+      CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+    steps:
+      - name: test
+        run: |
+          echo "DT=$(date +'%Y-%m-%d_%H%M')" >> $GITHUB_ENV
+          echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
+          apt update
+          apt install -y git sudo
+
+      - name: clone QOpenHD
+        run: |
+          git clone -b ${{ github.ref_name }} https://github.com/OpenHD/QOpenHD --recursive
+
+      - name: Install Dependencies
+        run: |
+          ls
+          cd QOpenHD
+          sudo -H ./install_build_dep.sh ubuntu-x86
+
+      - name: Build with make
+        run: |
+          cd QOpenHD
+          ./package.sh x86_64 ubuntu noble
+          ls -a
+
+      - name: Upload to Github
+        uses: 'actions/upload-artifact@v2'
+        with:
+          name: "QOpenHD"
+          path: |
+            QOpenHD/*.deb
+            *.log
+          if-no-files-found: error
+
+      # - name: Push
+      #   id: push
+      #   uses: cloudsmith-io/action@master
+      #   with:
+      #     api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      #     command: "push"
+      #     format: "deb"
+      #     owner: "openhd"
+      #     repo: ${{ github.ref_name }}
+      #     distro: "ubuntu"
+      #     release: "noble"
+      #     republish: "true" # needed ONLY if version is not changing
+      #     file: "QOpenHD/*.deb"
+      #  if: ${{ github.ref != 'refs/heads/2.5-evo' }}
diff --git a/app/telemetry/action/impl/xparam.h b/app/telemetry/action/impl/xparam.h
@@ -8,6 +8,8 @@
 #include <thread>
 #include <functional>
 #include <vector>
+#include <string>
+
 
 #include "../../tutil/mavlink_include.h"
 

diff --git a/app/videostreaming/avcodec/avcodec_helper.hpp b/app/videostreaming/avcodec/avcodec_helper.hpp
@@ -60,7 +60,7 @@ static std::string safe_av_get_pix_fmt_name(enum AVPixelFormat pix_fmt){
   return {tmp};
 }
 static std::string safe_av_get_colorspace_name(enum AVColorSpace val){
-  auto tmp= av_get_colorspace_name(val);
+  auto tmp= av_color_space_name(val);
   if(tmp== nullptr){
 	return "null";
   }