aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElias Toivola <elias.toivola@qt.io>2023-09-29 10:52:02 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-01 15:25:40 +0000
commitf548b71f7df0661e111bc9d3fb8fa51ac2be2bcd (patch)
tree63b24d308011e5bc4067a66893004f2d8f2292b7
parentf8f18afaa284b68e20da2dfe34b47706e783b89f (diff)
Fix FFmpeg nv-codec file SHA and cache
External URL file SHA changed and the cache file didn't exist. Task-number: QTQAINFRA-5862 Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit bbbe55807757ca23f28463259301e3b479869b5b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 710d6e5cb0182d6c5e2916f9e19dc670a89f1732)
-rwxr-xr-xcoin/provisioning/common/unix/install-ffmpeg.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh
index 959616c3..5d093db3 100755
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -68,8 +68,8 @@ ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.t
install_ff_nvcodec_headers() {
nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
- nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/$nv_codec_version.zip"
- nv_codec_sha1="bfaa2801725a2eea476939f2177ab50817c3a6ad"
+ nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+ nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
#nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
if [ ! -d "$nv_codec_dir" ];