From a1427fbd4c9c93ffd896e528215d57208e770040 Mon Sep 17 00:00:00 2001
From: Artem Dyomin <artem.dyomin@qt.io>
Date: Mon, 28 Oct 2024 14:52:03 +0100
Subject: [PATCH] Decouple install-ffmpeg on linux and macos specific files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The FFmpeg building flow has become too different on linux and macos.
Decoupling the logic makes it more simple to follow.

The CR also fixes nits and shellcheck warnings in install-ffmpeg.

Pick-to: 6.8
Change-Id: I28639d28c7210809e52ff18ce612da52f8754285
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit 39ad0317d11842f8ce9690e40595d1e861edb24d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../common/linux/install-ffmpeg-linux.sh      |  99 +++++++++++++
 .../common/macos/install-ffmpeg-macos.sh      |  66 +++++++++
 .../common/unix/install-ffmpeg.sh             | 133 ------------------
 .../90-install-ffmpeg.sh                      |   3 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   3 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../90-install-ffmpeg.sh                      |   2 +-
 .../qtci-macos-11-arm/90-install-ffmpeg.sh    |   2 +-
 .../qtci-macos-11-x86_64/90-install-ffmpeg.sh |   2 +-
 .../qtci-macos-12-arm/90-install-ffmpeg.sh    |   2 +-
 .../qtci-macos-12-x86_64/90-install-ffmpeg.sh |   2 +-
 .../qtci-macos-13-arm/90-install-ffmpeg.sh    |   2 +-
 .../qtci-macos-13-x86_64/90-install-ffmpeg.sh |   2 +-
 .../qtci-macos-14-arm/90-install-ffmpeg.sh    |   2 +-
 .../qtci-macos-14-x86_64/90-install-ffmpeg.sh |   2 +-
 .../qtci-macos-15-arm/90-install-ffmpeg.sh    |   2 +-
 .../qtci-macos-15-x86_64/90-install-ffmpeg.sh |   2 +-
 34 files changed, 196 insertions(+), 166 deletions(-)
 create mode 100755 coin/provisioning/common/linux/install-ffmpeg-linux.sh
 create mode 100755 coin/provisioning/common/macos/install-ffmpeg-macos.sh
 delete mode 100755 coin/provisioning/common/unix/install-ffmpeg.sh

diff --git a/coin/provisioning/common/linux/install-ffmpeg-linux.sh b/coin/provisioning/common/linux/install-ffmpeg-linux.sh
new file mode 100755
index 00000000..583c0b3a
--- /dev/null
+++ b/coin/provisioning/common/linux/install-ffmpeg-linux.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script builds and installs FFmpeg static or shared (default) libs
+set -ex
+
+source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
+
+build_type=$(get_ffmpeg_build_type "$1")
+
+ffmpeg_source_dir=$(download_ffmpeg)
+ffmpeg_name=$(basename "$ffmpeg_source_dir")
+ffmpeg_config_options=$(get_ffmpeg_config_options "$build_type")
+prefix="/usr/local/$ffmpeg_name"
+pkgconfig_path="$PKG_CONFIG_PATH"
+
+install_ff_nvcodec_headers() {
+    local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
+    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
+    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+    local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
+    #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
+    local target_dir="$HOME"
+    local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
+
+    if [ ! -d  "$nv_codec_dir" ]; then
+        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+        InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" ""
+    fi
+
+    sudo make -C "$nv_codec_dir" install -j
+
+    # Might be not detected by default on RHEL
+    pkgconfig_path="$pkgconfig_path:/usr/local/lib/pkgconfig"
+}
+
+fix_openssl3_pc_files() {
+    # On RHEL 8, openssl3 pc files are libopenssl3.pc, libssl3.pc, libcrypto3.pc,
+    # and FFmpeg cannot find them. Instead, it finds FFmpeg 1.x.x if it's installed.
+    # The function fixes the files with copying them to a custom directory
+
+    # assign to 'local' to ignore failure exit codes
+    local -r openssl3_pcfiledir=$(pkg-config --variable=pcfiledir openssl3)
+    if [ -z "$openssl3_pcfiledir" ]; then
+        return
+    fi
+
+    local pcfiles=("libssl" "libcrypto" "openssl")
+
+    for pcfile in "${pcfiles[@]}"; do
+        if [ ! -f "$openssl3_pcfiledir/${pcfile}3.pc" ]; then
+            echo "pkgconfig has found openssl3 but the file $openssl3_pcfiledir/${pcfile}3.pc does't exist"
+            return
+        fi
+    done
+
+    local new_pkgconfig_dir="$ffmpeg_source_dir/openssl3_pkgconfig"
+    mkdir -p "$new_pkgconfig_dir"
+
+    for pcfile in "${pcfiles[@]}"; do
+        sed -E '/^Requires(\.private)?:/s/ (libssl|libcrypto)3/ \1/g;' "$openssl3_pcfiledir/${pcfile}3.pc" > "$new_pkgconfig_dir/${pcfile}.pc"
+    done
+
+    pkgconfig_path="$new_pkgconfig_dir:$pkgconfig_path"
+}
+
+build_ffmpeg() {
+    local build_dir="$ffmpeg_source_dir/build"
+    mkdir -p "$build_dir"
+    pushd "$build_dir"
+
+    # shellcheck disable=SC2086
+    PKG_CONFIG_PATH="$pkgconfig_path" "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix"
+    # shellcheck disable=
+
+    # on RHEL patchelf is not visible under sudo, so we install to a temporary directory
+    make install DESTDIR="$build_dir/installed" -j
+    popd
+}
+
+
+ffmpeg_config_options+=" --enable-openssl"
+fix_openssl3_pc_files
+echo "pkg-config openssl version: $(pkg-config --modversion openssl)"
+
+install_ff_nvcodec_headers
+
+build_ffmpeg
+
+output_dir="$ffmpeg_source_dir/build/installed/$prefix"
+
+if [ "$build_type" == "shared" ]; then
+    fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
+    "$fix_dependencies" "$output_dir"
+fi
+
+sudo mv "$output_dir" "/usr/local"
+set_ffmpeg_dir_env_var "FFMPEG_DIR" "$prefix"
diff --git a/coin/provisioning/common/macos/install-ffmpeg-macos.sh b/coin/provisioning/common/macos/install-ffmpeg-macos.sh
new file mode 100755
index 00000000..4fc8f1c4
--- /dev/null
+++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script builds and installs FFmpeg shared libs
+
+set -ex
+
+os="$1"
+
+if [ "$os" != "macos" ] && [ "$os" != "macos-universal" ]; then
+    >&2 echo "invalid os paremeter: $os"
+    exit 1
+fi
+
+source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
+
+ffmpeg_source_dir=$(download_ffmpeg)
+ffmpeg_name=$(basename "$ffmpeg_source_dir")
+ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
+prefix="/usr/local/$ffmpeg_name"
+
+build_ffmpeg() {
+    local arch="$1"
+    local build_dir="$ffmpeg_source_dir/build/$arch"
+    mkdir -p "$build_dir"
+    pushd "$build_dir"
+
+    # shellcheck disable=SC2086
+    if [ -n "$arch" ]; then
+        local cc="clang -arch $arch"
+        "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch="$arch" --cc="$cc"
+    else
+        "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix"
+    fi
+    # shellcheck disable=
+
+    make install DESTDIR="$build_dir/installed" -j4
+    popd
+}
+
+brew install yasm
+export MACOSX_DEPLOYMENT_TARGET=12
+fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"
+
+if [ "$os" == "macos"  ]; then
+    build_ffmpeg
+
+    install_dir="$ffmpeg_source_dir/build/installed"
+    "$fix_relative_dependencies" "$install_dir/usr/local/$ffmpeg_name/lib"
+    sudo mv "$install_dir/usr/local/$ffmpeg_name" "/usr/local"
+else
+    build_ffmpeg "arm64"
+    build_ffmpeg "x86_64"
+
+    arm64_install_dir="$ffmpeg_source_dir/build/arm64/installed"
+    x86_64_install_dir="$ffmpeg_source_dir/build/x86_64/installed"
+
+    "$fix_relative_dependencies" "$arm64_install_dir/usr/local/$ffmpeg_name/lib"
+    "$fix_relative_dependencies" "$x86_64_install_dir/usr/local/$ffmpeg_name/lib"
+
+    sudo rm -rf "/usr/local/$ffmpeg_name" # lipo fails upon 2nd run
+    sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir"
+fi
+
+set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh
deleted file mode 100755
index e5512d55..00000000
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script will build and install FFmpeg static libs
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
-
-os="$1"
-build_type=$(get_ffmpeg_build_type "$2")
-
-ffmpeg_source_dir=$(download_ffmpeg)
-ffmpeg_name=$(basename $ffmpeg_source_dir)
-ffmpeg_config_options=$(get_ffmpeg_config_options $build_type)
-
-install_ff_nvcodec_headers() {
-  local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
-  local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
-  local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
-  local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
-  #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
-  local target_dir="$HOME"
-  local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
-
-  if [ ! -d  "$nv_codec_dir" ]; then
-    source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-    InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" ""
-  fi
-
-  sudo make -C "$nv_codec_dir" install -j
-
-  # Might be not detected by default on RHEL
-  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
-}
-
-fix_openssl3_pc_files() {
-  # On RHEL 8, openssl3 pc files are libopenssl3.pc, libssl3.pc, libcrypto3.pc,
-  # and FFmpeg cannot find them. Instead, it finds FFmpeg 1.x.x if it's installed.
-  # The function fixes the files with copying them to a custom directory
-
-  local openssl3_pcfiledir=$(pkg-config --variable=pcfiledir openssl3)
-  if [ ! -n  "$openssl3_pcfiledir" ]; then
-    return
-  fi
-
-  local pcfiles=("libssl" "libcrypto" "openssl")
-
-  for pcfile in ${pcfiles[@]}; do
-    if [ ! -f "$openssl3_pcfiledir/${pcfile}3.pc" ]; then
-      echo "pkgconfig has found openssl3 but the file $openssl3_pcfiledir/${pcfile}3.pc does't exist"
-      return
-    fi
-  done
-
-  local new_pkgconfig_dir="$ffmpeg_source_dir/openssl3_pkgconfig"
-  mkdir -p $new_pkgconfig_dir
-
-  for pcfile in ${pcfiles[@]}; do
-    sed -E '/^Requires(\.private)?:/s/ (libssl|libcrypto)3/ \1/g;' "$openssl3_pcfiledir/${pcfile}3.pc" > "$new_pkgconfig_dir/${pcfile}.pc"
-  done
-
-  export PKG_CONFIG_PATH="$new_pkgconfig_dir:$PKG_CONFIG_PATH"
-}
-
-build_ffmpeg() {
-  local arch="$1"
-  local prefix="$2"
-  local build_dir="$ffmpeg_source_dir/build/$arch"
-  mkdir -p "$build_dir"
-  pushd "$build_dir"
-
-  if [ -z  "$prefix" ]
-  then prefix="/usr/local/$ffmpeg_name"
-  fi
-
-  if [ -n "$arch" ]
-  then cc="clang -arch $arch"
-  fi
-
-  # shellcheck disable=SC2086
-  if [ -n "$arch" ]
-  then "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch="$arch" --cc="$cc"
-  else "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix"
-  fi
-  make install DESTDIR="$build_dir/installed" -j4
-  popd
-}
-
-if [ "$os" == "linux" ]; then
-  install_ff_nvcodec_headers
-
-  ffmpeg_config_options+=" --enable-openssl"
-  fix_openssl3_pc_files
-  echo "pkg-config openssl version: $(pkg-config --modversion openssl)"
-
-  build_ffmpeg
-
-  output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name"
-
-  if [ "$build_type" == "shared" ]; then
-    fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
-    "$fix_dependencies" "$output_dir"
-  fi
-
-  sudo mv "$output_dir" "/usr/local"
-
-elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
-  brew install yasm
-  export MACOSX_DEPLOYMENT_TARGET=12
-  fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"
-
-  if [ "$os" == "macos"  ]; then
-    build_ffmpeg
-    install_dir="$ffmpeg_source_dir/build/installed"
-    "$fix_relative_dependencies" "$install_dir/usr/local/$ffmpeg_name/lib"
-    sudo mv "$install_dir/usr/local/$ffmpeg_name" "/usr/local"
-  else
-    build_ffmpeg "arm64"
-    build_ffmpeg "x86_64"
-
-    arm64_install_dir="$ffmpeg_source_dir/build/arm64/installed"
-    x86_64_install_dir="$ffmpeg_source_dir/build/x86_64/installed"
-
-    "$fix_relative_dependencies" "$arm64_install_dir/usr/local/$ffmpeg_name/lib"
-    "$fix_relative_dependencies" "$x86_64_install_dir/usr/local/$ffmpeg_name/lib"
-
-    sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir"
-  fi
-fi
-
-set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
-
diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh
index 2c805227..8dcbdf7c 100644
--- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh
@@ -2,7 +2,6 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8 / 8.10
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh
index 333885a3..90c52cd3 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh
@@ -2,6 +2,6 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh
index a3252c08..1184e5a5 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh
@@ -2,5 +2,5 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh
index 08d455cf..8dcbdf7c 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh
@@ -2,7 +2,6 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100644
--- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh
index 27ff04dc..bafe9daf 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static"
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh
index cd65475b..9af69cad 100644
--- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh
@@ -2,4 +2,4 @@
 # Copyright (C) 2023 The Qt Company Ltd
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static"
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh
index 08a2ea94..b21dcc1b 100644
--- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh
@@ -2,4 +2,4 @@
 # Copyright (C) 2024 The Qt Company Ltd
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh
index 61da9b7b..882680b7 100644
--- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh
index 4a41cb74..fd9cfbf7 100755
--- a/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh
@@ -4,4 +4,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh"
diff --git a/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh
index 23cb13e1..d5e9d5d0 100755
--- a/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh
@@ -4,4 +4,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh
index 23cb13e1..d5e9d5d0 100755
--- a/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh
@@ -4,4 +4,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
diff --git a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
index 4d4169bb..e6b40aa1 100755
--- a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
index dfdc1022..c36eda45 100755
--- a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
index 4d4169bb..e6b40aa1 100755
--- a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
index dfdc1022..c36eda45 100755
--- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
index 4d4169bb..e6b40aa1 100755
--- a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
index dfdc1022..c36eda45 100755
--- a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
index 4d4169bb..e6b40aa1 100755
--- a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
diff --git a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh
index dfdc1022..c36eda45 100755
--- a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh
@@ -4,6 +4,6 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"