From 6b453e2221044ef25cddf9c467ac3e11a3061e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Wed, 23 Oct 2024 12:03:58 +0200 Subject: [PATCH] coin, macOS, FFmpeg: Fix incorrect popd in install-ffmpeg-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit popd was placed incorrectly and caused the script to be unable to find the fix_ffmpeg_dependencies.sh file. Change-Id: I7922a698e90d1b3899ecc7b2240a260ea706707f Reviewed-by: Tor Arne Vestbø (cherry picked from commit 8f47837a59497e536204b992c25c3d8ef94a3c3f) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index fdd80336..e50571a1 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -95,6 +95,8 @@ build_ffmpeg_android() { sudo make install -j4 + popd + rm -f "${openssl_libs}/libcrypto.so" rm -f "${openssl_libs}/libssl.so" @@ -102,8 +104,6 @@ build_ffmpeg_android() { fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" fi - - popd } if [ "$os" == "android-x86" ]; then