Update submodules on '6.7 in qt/qt5'

Change-Id: I54f052c9c0bbd91d49d0524392cfc2ef94c66b0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Update ffmpeg to n6.1 for Linux and macOS
2026-01-09 16:36:35 +08:00 · 2024-02-12 07:25:50 +00:00 · 2024-02-10 08:21:26 +00:00 · 2024-02-10 08:21:15 +00:00 · 2024-02-09 15:31:31 +02:00 · 2024-02-07 07:44:16 +00:00
50 changed files with 66 additions and 51 deletions
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -131,6 +131,18 @@ EOB
 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
    | eval "$sdkmanager_no_progress_bar_cmd"
+
+echo "Download and unzip Android Emulator version 32.1.15"
+emulatorFileName="emulator-linux_x64-10696886.zip"
+emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
+emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
+emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
+emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
+DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
+echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
+sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
+rm "$emulatorTargetFile"
+
 echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
    | eval "$sdkmanager_no_progress_bar_cmd"
 echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
 set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})

+set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoaarch64-strip)
+
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
 set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})

+set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoarmv7-strip)
+
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake
+++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
 set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})

+set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntox86_64-strip)
+
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-# Commit c5039e158d20e85d4d8a2dee3160533d627b839a is the latest one in 6.0 branch. 
-# When using the latest commit we will also get fix for https://fftrac-bg.ffmpeg.org/ticket/10405
-# Should be changed to official release as soon as possible!
-version="c5039e158d20e85d4d8a2dee3160533d627b839a"
+version="n6.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
-sha1="4e13a26d3be7ac4d69201a6aa0accd734b24b3c4"
+sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"

--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -6,9 +6,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version = "n6.0"
+$version = "n6.1"
 $ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7"
+$sha1 = "3B4A853266BE923994256B2E4B41CB002E1D63D8"

 $url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
 $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	045c72d4eb	Update submodules on '6.7 in qt/qt5' Change-Id: I54f052c9c0bbd91d49d0524392cfc2ef94c66b0d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-02-12 07:25:50 +00:00
Artem Dyomin	f84d0c1644	Update ffmpeg to n6.1 for Linux and macOS FFmpeg version was between n6.0 and n6.1 due to some hot fix for having it compilable on CI. Since n6.1 has been release, we should update. Pick-to: 6.6 6.5 Change-Id: I0d88599be53748eeb038287abe8aad6c0f189933 Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit `9fa918c129`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2024-02-10 08:21:26 +00:00
Artem Dyomin	1cf5b24dc2	Update ffmpeg n6.0 -> n6.1 on Windows The update will go tohether with dynamic ffmpeg build on Windows. Pick-to: 6.6 6.5 Change-Id: I7a72d4009c8a8e4030899b526bad9cfedd6f45a7 Reviewed-by: Lars Knoll <lars@knoll.priv.no> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> (cherry picked from commit `483694d725`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2024-02-10 08:21:15 +00:00
Qt Submodule Update Bot	2a6f3f9168	Update submodules on '6.7 in qt/qt5' Change-Id: I007bb0aaac0633b06f76795c0e3115a3bc13866b Reviewed-by: Daniel Smith <daniel.smith@qt.io>	2024-02-09 15:31:31 +02:00
Marianne Yrjänä	1cdaa78534	Set CMAKE_STRIP for QNX builds in toolchain file Task-number: QTBUG-120594 Change-Id: Ie39a51616d1c1bb03382bc633d9cda11f80fc80f Reviewed-by: Cristian Adam <cristian.adam@qt.io> (cherry picked from commit `02199c9f75`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2024-02-07 07:44:16 +00:00
Assam Boudjelthia	de0797d809	Android: use Android emulator 32.1.15 to not break rhi tests Currently CI doesn't cache specific Android Emulator version, so after an update was availabe 33.1.23 is broke RHI tests on Android 13 emulator. The last known emulator version to to work was 32.1.15, so as a workaround we install this specific version. Fixes: QTBUG-119884 Change-Id: Iec56207b6142d97a9dfabc0fb07a920c868e58b1 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `481825822b`) Reviewed-by: Zoltan Gera <zoltan.gera@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `710f03ffcc`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2024-02-06 18:36:03 +00:00
Qt Submodule Update Bot	cf2365c2ec	Update submodules on '6.7 in qt/qt5' Change-Id: If3a75bbb858f95728f14e56aacd19d7d5379c469 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2024-02-02 03:42:12 +00:00