diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-08-24 16:24:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-08 18:39:44 +0000 |
| commit | c6656a08ef4c197b405ab5de92717b9e38c535fc (patch) | |
| tree | 4ac87c0ceed32ed7d0aa953589826153f993083d /coin/provisioning | |
| parent | d902125e2386608d6b780f0c783f31a2392c5866 (diff) | |
Add openssl to ffmpeg linux builds
We need ffmpeg+openssl to enable multimedia networking.
We kept it disabled on linux since we had linking dependency.
The related patch in QtMM resolves openssl symbols dynamicaly
and address the mandatory dependency.
Change-Id: Idad0618a5320ae32d50fe1f3866c4ffd1bf8f542
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit 7300099520190913e7f8c1a16c5c4f3729393d23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/common/unix/install-ffmpeg.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 80b1c180..959616c3 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -109,6 +109,8 @@ build_ffmpeg() { if [ "$os" == "linux" ]; then install_ff_nvcodec_headers + + ffmpeg_config_options+=" --enable-openssl" build_ffmpeg sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh index ebaa4d04..2382a6c1 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh @@ -58,6 +58,7 @@ sudo zypper -nq install bison flex gperf \ zlib-devel \ libudev-devel \ glib2-devel \ + libopenssl-3-devel \ freetype2-devel \ fontconfig-devel \ sqlite3-devel \ |