Update qtsaferenderer.yaml, add missing 'Target os' field

Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.

Change-Id: Ib99f38f21c4324bf5ac8f8ef6d41e508aef9e7d7
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.8
+	branch = 6.8.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.8
+	branch = 6.8.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.8
+	branch = 6.8.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.8
+	branch = 6.8.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.8
+	branch = 6.8.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.8
+	branch = 6.8.1
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.8
+	branch = 6.8.1
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,87 +252,87 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.8
+	branch = 6.8.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.8
+	branch = 6.8.1
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.8
+	branch = 6.8.1
 	status = addon

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -10,14 +10,13 @@ Include: [
     "ubuntu-22.04-documentation",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
-    "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
-    "windows-10_22h2-msvc2019-developer-build",
+    "windows-11_23H2-msvc2022-developer-build",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
-    "windows-10_22h2-mingw13-developer-build",
-    "windows-10_22h2-llvm",
-    "windows-11_23H2-msvc2019"
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",

coin/platform_configs/qtsaferenderer.yaml

@@ -10,12 +10,11 @@ Include: [
     "ubuntu-22.04-documentation",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
-    "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
-    "windows-10_22h2-llvm",
-    "windows-11_23H2-msvc2019"
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
@@ -28,6 +27,7 @@ Configurations:
 -
     Id: 'macos-latest-xcode-universal-static-build'
     Template: 'qtci-macos-12-x86_64-107'
+    Target os: 'MacOS_12_Static'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -38,6 +38,7 @@ Configurations:
 -
     Id: 'Linux-RHEL_8_10_Static'
     Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Target os: 'RHEL_8_10_Static'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -46,11 +47,12 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
     ]
 -
-    Id: 'Windows-MSVC2019_Static'
+    Id: 'Windows-MSVC2022_Static'
     Template: 'qtci-windows-10_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
+    Target os: 'Windows_10_Static'
+    Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'
+    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',

coin/provisioning/common/unix/install-ffmpeg-ios.sh

@@ -19,57 +19,58 @@ ffmpeg_name="FFmpeg-$version"
 target_dir="$HOME"
 ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 prefix="/usr/local/ios/ffmpeg"
+dylib_regex="^@rpath/.*\.dylib$"
 
 if [ ! -d "$ffmpeg_source_dir" ];
 then
-   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir"
+    InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir"
 fi
 
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
 
 build_ffmpeg_ios() {
-  local target_arch=$1
+    local target_arch=$1
 
-  if [ "$target_arch" == "x86_64" ]; then
-     target_sdk="iphonesimulator"
-     target_arch="x86_64"
-     minos="-mios-simulator-version-min=13.0"
-  else
-     target_sdk="iphoneos"
-     target_arch="arm64"
-     minos="-miphoneos-version-min=13.0"
-  fi
+    if [ "$target_arch" == "x86_64" ]; then
+        target_sdk="iphonesimulator"
+        target_arch="x86_64"
+        minos="-mios-simulator-version-min=14.0"
+    else
+        target_sdk="iphoneos"
+        target_arch="arm64"
+        minos="-miphoneos-version-min=14.0"
+    fi
 
-  local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
-  sudo mkdir -p "$build_dir"
-  pushd "$build_dir"
+    local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
+    sudo mkdir -p "$build_dir"
+    pushd "$build_dir"
 
-  # shellcheck disable=SC2086
-  sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
+    # shellcheck disable=SC2086
+    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
     --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-  --enable-cross-compile \
-  --enable-optimizations \
-  --prefix=$prefix \
-  --arch=$target_arch \
-  --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
-  --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
-  --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
-  --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
-  --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
-  --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
-  --target-os=darwin \
-  --extra-cflags="$minos" \
-  --extra-cxxflags="$minos" \
-  --enable-cross-compile \
-  --enable-shared \
-  --disable-static \
-  --install-name-dir='@rpath/Frameworks' \
-  --enable-swscale \
-  --enable-pthreads \
-  --disable-audiotoolbox
+    --enable-cross-compile \
+    --enable-optimizations \
+    --prefix=$prefix \
+    --arch=$target_arch \
+    --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
+    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
+    --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
+    --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
+    --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
+    --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
+    --target-os=darwin \
+    --extra-cflags="$minos" \
+    --extra-cxxflags="$minos" \
+    --enable-cross-compile \
+    --enable-shared \
+    --disable-static \
+    --install-name-dir='@rpath/Frameworks' \
+    --enable-swscale \
+    --enable-pthreads \
+    --disable-audiotoolbox
 
-  sudo make install DESTDIR="$build_dir/installed" -j
-  popd
+    sudo make install DESTDIR="$build_dir/installed" -j
+    popd
 }
 
 install_ffmpeg() {
@@ -94,15 +95,88 @@ install_ffmpeg() {
                 exit 1
             fi
         done
-        echo "LS"
         popd >/dev/null
     done
     sudo cp -r $1$prefix/include $prefix
-    echo "LS done."
+}
+
+build_info_plist() {
+    local file_path="$1"
+    local framework_name="$2"
+    local framework_id="$3"
+
+    local minimum_version_key="MinimumOSVersion"
+    local minimum_os_version="16.0"
+    local supported_platforms="iPhoneOS"
+
+    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${framework_name}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${framework_id}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${framework_name}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleShortVersionString</key>
+    <string>7.0.2</string>
+    <key>CFBundleVersion</key>
+    <string>7.0.2</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>${minimum_version_key}</key>
+    <string>${minimum_os_version}</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${supported_platforms}</string>
+    </array>
+    <key>NSPrincipalClass</key>
+    <string></string>
+</dict>
+</plist>"
+    echo $info_plist | sudo tee ${file_path} 1>/dev/null
+}
+
+
+create_framework() {
+    local framework_name="$1"
+    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg"
+    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
+    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    sudo install_name_tool -id @rpath/Frameworks/${framework_name}.framework/${framework_name} "${framework_complete_path}"
+    sudo vtool -set-build-version ios 16.0 -input ${framework_complete_path} -output ${framework_complete_path}
+
+    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
+    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
+        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
+        if [ "$found_name" != "$framework_name" ]
+        then
+            sudo install_name_tool -change "$dependency_path" @rpath/Frameworks/${found_name}.framework/${found_name} "${framework_complete_path}"
+        fi
+    done
+    sudo mkdir -p "$prefix/framework/"
+    sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
 }
 
 build_ffmpeg_ios "x86_64"
 build_ffmpeg_ios "arm64"
 
+ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
+
+for name in $ffmpeg_libs; do
+    create_framework $name
+done
+
 install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
+
 SetEnvVar "FFMPEG_DIR_IOS" $prefix