From 8d14d6049400290f76907ea4d4fa40756c954108 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 5 Feb 2025 10:24:49 -0800
Subject: [PATCH] Add GStreamer to Mac dependencies

---
 .github/workflows/macos.yml             | 13 ++-----------
 tools/setup/install-dependencies-osx.sh | 26 +++++++++++++++++++++++++
 tools/setup/macos-dependencies.sh       | 11 -----------
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 tools/setup/install-dependencies-osx.sh
 delete mode 100644 tools/setup/macos-dependencies.sh

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 75ebe975961d..482d6c483576 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -34,7 +34,6 @@ jobs:
       ARTIFACT: QGroundControl.dmg
       PACKAGE: QGroundControl
       QT_VERSION: 6.8.1
-      GST_VERSION: 1.24.12
       CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
 
     steps:
@@ -52,17 +51,9 @@ jobs:
         with:
           xcode-version: latest-stable
 
-      - name: Install Dependencies
+      - name: Install Dependencies (include GStreamer)
         working-directory: ${{ github.workspace }}/tools/setup
-        run: sh macos-dependencies.sh
-
-      - name: Install GStreamer
-        run: |
-          wget --quiet https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.GST_VERSION }}/gstreamer-1.0-devel-${{ env.GST_VERSION }}-universal.pkg
-          wget --quiet https://gstreamer.freedesktop.org/data/pkg/osx/${{ env.GST_VERSION }}/gstreamer-1.0-${{ env.GST_VERSION }}-universal.pkg
-          for package in *.pkg ;
-            do sudo installer -verbose -pkg "$package" -target /
-          done
+        run: sh install-dependencies-osx.sh
 
       - name: Setup Caching
         uses: ./.github/actions/cache
diff --git a/tools/setup/install-dependencies-osx.sh b/tools/setup/install-dependencies-osx.sh
new file mode 100644
index 000000000000..cf32155e481f
--- /dev/null
+++ b/tools/setup/install-dependencies-osx.sh
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+
+if ! command -v brew &> /dev/null
+then
+	# install Homebrew if not installed yet
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+	eval "$(/usr/local/bin/brew shellenv)"
+fi
+
+brew update
+brew install cmake ninja ccache git pkgconf create-dmg
+
+# Install GStreamer
+GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx
+GST_VERSION=1.24.12
+GST_PKG=gstreamer-1.0-$GST_VERSION-universal.pkg
+GST_DEV_PKG=gstreamer-1.0-devel-$GST_VERSION-universal.pkg
+pushd $TMPDIR
+curl -O $GST_URL/$GST_VERSION/$GST_DEV_PKG
+curl -O $GST_URL/$GST_VERSION/$GST_PKG
+echo "Sudo may be required to install GStreamer"
+sudo installer -pkg "$GST_PKG" -target /
+sudo installer -pkg "$GST_DEV_PKG" -target /
+rm $TMPDIR/$GST_DEV_PKG
+rm $TMPDIR/$GST_PKG
+popd
\ No newline at end of file
diff --git a/tools/setup/macos-dependencies.sh b/tools/setup/macos-dependencies.sh
deleted file mode 100644
index 8539e4fac07b..000000000000
--- a/tools/setup/macos-dependencies.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env bash
-
-if ! command -v brew &> /dev/null
-then
-	# install Homebrew if not installed yet
-	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-	eval "$(/usr/local/bin/brew shellenv)"
-fi
-
-brew update
-brew install cmake ninja ccache geographiclib git SDL2 exiv2 expat zlib shapelib pkgconf create-dmg