From 1e533481a35fe26975a918f3839374aa64701860 Mon Sep 17 00:00:00 2001
From: Pavel Dubsky <pavel.dubsky@qt.io>
Date: Tue, 22 Jul 2025 21:03:45 +0200
Subject: [PATCH] Enable zlib in FFmpeg configuration

Fixes: QTBUG-103332
Pick-to: 6.8 6.5
Change-Id: I87a760edcd4d8a77966ec5a692cb1f1f4242b647
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f7af78977c65b157588f2b012a09a7b2c6718b34)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 707546820e278b058195c43147e91e33858673d6)
---
 coin/provisioning/common/windows/install-ffmpeg.ps1 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1
index ee8c2f2f..7c019140 100644
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 . "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\zlib-helpers.ps1"
 
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
@@ -105,6 +106,13 @@ function InstallMsvcFfmpeg {
         }
     }
 
+    $zlibPath = GetZlibPathByString -TargetArchitecture $arch
+    $zlibPath = $zlibPath -replace '\\', '/'
+
+    $config += " --enable-zlib"
+    $config += " --extra-cflags=`"-I$zlibPath`""
+    $config += " --extra-ldflags=`"-LIBPATH:$zlibPath`""
+
     $result = EnterVSDevShell -HostArch $hostArch -Arch $arch
     if (-Not $result) {
         return $false