diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 3d4c2f9e..40bea2fd 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -16,7 +16,7 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}', 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] @@ -95,7 +95,8 @@ Configurations: Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - Id: 'macos-latest-xcode-arm64-developer-build' diff --git a/coin/provisioning/common/shared/ffmpeg_config_options.txt b/coin/provisioning/common/shared/ffmpeg_config_options.txt index fc746288..ccfed1ee 100644 --- a/coin/provisioning/common/shared/ffmpeg_config_options.txt +++ b/coin/provisioning/common/shared/ffmpeg_config_options.txt @@ -1 +1 @@ ---disable-programs --disable-doc --disable-debug --disable-network --enable-pic \ No newline at end of file +--disable-programs --disable-doc --disable-debug --disable-network --disable-lzma --enable-pic \ No newline at end of file diff --git a/coin/provisioning/common/linux/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh similarity index 66% rename from coin/provisioning/common/linux/install-ffmpeg.sh rename to coin/provisioning/common/unix/install-ffmpeg.sh index d6b452e3..dedad29a 100755 --- a/coin/provisioning/common/linux/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -41,21 +41,13 @@ # This script will build and install FFmpeg static libs set -ex +os="$1" # shellcheck source=../unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") - -if [ -f /etc/redhat-release ] -then - sudo sudo yum -y install yasm -else - sudo apt install yasm -fi - version="n5.0" ffmpeg_name="FFmpeg-$version" @@ -63,15 +55,48 @@ url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" sha1="1a979876463fd81e481d53ceb3cc117f0fce8521" -target_folder="$HOME" +target_dir="$HOME" app_prefix="" -InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_folder" "$app_prefix" +InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" -mkdir -p "$target_folder/$ffmpeg_name/build" -pushd "$target_folder/$ffmpeg_name/build" -../configure $ffmpeg_config_options --prefix=installed -make install -j -popd +ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") +ffmpeg_source_dir="$target_dir/$ffmpeg_name" -SetEnvVar "FFMPEG_DIR" "$target_folder/$ffmpeg_name/build/installed" +build_ffmpeg() { + local arch="$1" + local build_dir="$ffmpeg_source_dir/build/$arch" + mkdir -p "$build_dir" + pushd "$build_dir" + if [ -n "$arch" ] + then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" --enable-cross-compile --arch=$arch --cc="clang -arch $arch" + else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" + fi + make install DESTDIR=$build_dir/installed -j4 + popd +} + +if [ "$os" == "linux" ]; then + if [ -f /etc/redhat-release ] + then sudo yum -y install yasm + else sudo apt install yasm + fi + build_ffmpeg + sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + +elif [ "$os" == "macos" ]; then + brew install yasm + export MACOSX_DEPLOYMENT_TARGET=10.14 + build_ffmpeg + sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + +elif [ "$os" == "macos-universal" ]; then + brew install yasm + export MACOSX_DEPLOYMENT_TARGET=10.14 + build_ffmpeg "arm64" + build_ffmpeg "x86_64" + + sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build/arm64/installed" "$ffmpeg_source_dir/build/x86_64/installed" +fi + +SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" 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 6d8981c4..61da9b7b 100644 --- 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 @@ -1,4 +1,3 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install-ffmpeg.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" 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 old mode 100644 new mode 100755 index 6d8981c4..61da9b7b --- 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,4 +1,3 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install-ffmpeg.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" 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 old mode 100644 new mode 100755 index 6d8981c4..61da9b7b --- 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,4 +1,3 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install-ffmpeg.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-10.14-x86_64/90-install-ffmpeg.sh new file mode 100755 index 00000000..1f8734c3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos" 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 new file mode 100755 index 00000000..1f8734c3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos" 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 new file mode 100755 index 00000000..a8333b36 --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-11.0-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-11.0-arm/90-install-ffmpeg.sh new file mode 100755 index 00000000..a8333b36 --- /dev/null +++ b/coin/provisioning/qtci-macos-11.0-arm/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" 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 new file mode 100755 index 00000000..a8333b36 --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-12.0-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12.0-arm/90-install-ffmpeg.sh new file mode 100755 index 00000000..a8333b36 --- /dev/null +++ b/coin/provisioning/qtci-macos-12.0-arm/90-install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal"