Qmlglsink Build Fixes

mavlink · Apr 6, 2024 · 94912ee · 94912ee
1 parent 126b008
commit 94912ee
Show file tree

Hide file tree

Showing 22 changed files with 2,773 additions and 144 deletions.
diff --git a/.github/workflows/macos_debug.yml b/.github/workflows/macos_debug.yml
@@ -62,17 +62,12 @@ jobs:
           cache: true
 
       - name: Install Dependencies
-        run: |
-          brew install ninja
-          brew install SDL2
+        run: brew install ninja SDL2
 
-      - name: Install Gstreamer
-        run: |
-            wget https://gstreamer.freedesktop.org/data/pkg/osx/1.18.6/gstreamer-1.0-devel-1.18.6-x86_64.pkg
-            wget https://gstreamer.freedesktop.org/data/pkg/osx/1.18.6/gstreamer-1.0-1.18.6-x86_64.pkg
-            for package in *.pkg ;
-              do sudo installer -verbose -pkg "$package" -target /
-            done
+      - name: Setup GStreamer
+        uses: blinemedical/setup-gstreamer@v1
+        with:
+          version: 1.18.6
 
       - name: Create build directory
         run:  mkdir ${{ runner.temp }}/shadow_build_dir

diff --git a/.github/workflows/windows_debug.yml b/.github/workflows/windows_debug.yml
@@ -63,26 +63,13 @@ jobs:
           setup-python: true
           cache:        true
 
-      - name: Download Gstreamer
-        uses: suisei-cn/actions-download-file@v1.6.0
+      - name: Setup GStreamer
+        uses: blinemedical/setup-gstreamer@v1
         with:
-          url:    https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-msvc-x86_64-1.18.1.msi
-          target: ${{ runner.temp }}\
-
-      - name: Download Gstreamer dev
-        uses: suisei-cn/[email protected]
-        with:
-          url:    https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-msvc-x86_64-1.18.1.msi
-          target: ${{ runner.temp }}\
-
-      - name: Install Gstreamer
-        run:  |
-            cmd /c start /wait msiexec /package ${{ runner.temp }}\gstreamer-1.0-msvc-x86_64-1.18.1.msi /passive ADDLOCAL=ALL
-            cmd /c start /wait msiexec /package ${{ runner.temp }}\gstreamer-1.0-devel-msvc-x86_64-1.18.1.msi /passive ADDLOCAL=ALL
+          version: 1.18.6
 
       - name: Install Dependencies
-        run:  |
-            python -m pip install ninja
+        run:  python -m pip install ninja
 
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -75,22 +75,8 @@ jobs:
         run:  |
               7z x jom.zip -ojom
 
-      - name: Download Gstreamer
-        uses: suisei-cn/[email protected]
-        with:
-          url:    https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-msvc-x86_64-1.18.1.msi
-          target: ${{ runner.temp }}\
-
-      - name: Download Gstreamer dev
-        uses: suisei-cn/[email protected]
-        with:
-          url:    https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-msvc-x86_64-1.18.1.msi
-          target: ${{ runner.temp }}\
-
       - name: Install Gstreamer
-        run:  |
-            cmd /c start /wait msiexec /package ${{ runner.temp }}\gstreamer-1.0-msvc-x86_64-1.18.1.msi /passive ADDLOCAL=ALL
-            cmd /c start /wait msiexec /package ${{ runner.temp }}\gstreamer-1.0-devel-msvc-x86_64-1.18.1.msi /passive ADDLOCAL=ALL
+        run: choco install --no-progress gstreamer gstreamer-devel --version=1.18.6
 
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1

diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "libs/OpenSSL/android_openssl"]
 	path = libs/OpenSSL/android_openssl
 	url = https://github.com/KDAB/android_openssl
-[submodule "libs/qmlglsink/gst-plugins-good"]
-	path = libs/qmlglsink/gst-plugins-good
-    url = https://github.com/mavlink/gst-plugins-good.git
 [submodule "libs/xz-embedded"]
 	path = libs/xz-embedded
 	url = https://github.com/Auterion/xz-embedded.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21.1 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 #######################################################
 #                   Project Info