From 69ea20ebfb477086f68dd77d6cc48fc58fba4ac1 Mon Sep 17 00:00:00 2001
From: danemadsen <dane_madsen@hotmail.com>
Date: Wed, 31 Jul 2024 16:07:27 +1000
Subject: [PATCH] CI 2

---
 .github/workflows/build-android.yml | 24 ++++++++++++------------
 .github/workflows/build-linux.yml   |  5 ++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index b5f7cef4..e83ad65a 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -21,6 +21,18 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
+      - name: Setup NDK
+        run: |
+          wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
+          unzip android-ndk-r26b-linux.zip
+          echo "sdk.dir=$ANDROID_HOME" > local.properties
+          echo "ndk.dir=$GITHUB_WORKSPACE/android-ndk-r26b" >> local.properties
+  
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.26.0'
+
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
@@ -45,18 +57,6 @@ jobs:
           flutter config --no-analytics
           flutter pub get
 
-      - name: Setup NDK
-        run: |
-          wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
-          unzip android-ndk-r26b-linux.zip
-          echo "sdk.dir=$ANDROID_HOME" > local.properties
-          echo "ndk.dir=$GITHUB_WORKSPACE/android-ndk-r26b" >> local.properties
-
-      - name: Setup CMake
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y cmake=3.26.0-1ubuntu1
-
       - name: Build APK
         run: |
           flutter build apk --split-per-abi
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 37c0b224..63f66384 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -23,7 +23,10 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y cmake ninja-build pkg-config libgtk-3-dev libvulkan-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good
+          sudo apt-get install -y cmake ninja-build pkg-config libgtk-3-dev libvulkan-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-x
+          export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig
+          pkg-config --cflags gstreamer-1.0
+          pkg-config --libs gstreamer-1.0
 
       - name: Build Linux App
         run: |