diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-06-24 17:32:30 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2022-11-02 16:52:29 +0200 |
| commit | 221750003129e16ae349f322b47ec265068673db (patch) | |
| tree | 5d313524abe580d7157f3d1b655daec1d6ce5a8d /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64 | |
| parent | d7984542a21d0b66941be5c4735c4eb4f96a2a7b (diff) | |
Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS.
The FFmpeg libraries are installed under /usr/local both for Linux
and macOS.
Since macOS x64 does not have the lzma lib for arm64 architecture
installed by default, I disable this libraries for FFmpeg. This
only affects the TIFF image decoder that we do not use.
Added the execute permission to the ubuntu scripts.
Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 51c663d171ce261e01d98e7c019460f6db0d220f)
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh | 3 |
1 files changed, 1 insertions, 2 deletions
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 6d8981c4..61da9b7b 100644 --- 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" |