From 5cad7f595f4cd7faa6e45a2ddf82f3bb14ab9140 Mon Sep 17 00:00:00 2001 From: Adrian Herrmann Date: Thu, 28 Mar 2024 14:36:55 +0100 Subject: build: Add multimedia dependencies to Qt artifacts Add a number of DLL dependencies required by Qt Multimedia to the list of Qt artifacts to be retrieved from the Qt binary directory. Fixes: PYSIDE-2656 Change-Id: I0ead82ce09a7afb309ff674b4f5fe5afc32319da Reviewed-by: Friedemann Kleint (cherry picked from commit 3f3856ba94a59de49bc6c636c77a6173fd91c333) Reviewed-by: Qt Cherry-pick Bot --- build_scripts/platforms/windows_desktop.py | 5 +++++ build_scripts/wheel_files.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index c3b19d5a1..9a8bd4e27 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -288,6 +288,11 @@ def copy_qt_artifacts(pyside_build, destination_qt_dir, copy_pdbs, _vars): # /bin/*.dll and Qt *.exe -> /{st_package_name} qt_artifacts_permanent = [ + "avcodec-60.dll", + "avformat-60.dll", + "avutil-58.dll", + "swresample-4.dll", + "swscale-7.dll", "opengl*.dll", "designer.exe", "linguist.exe", diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py index 000bf4204..f614ac9df 100644 --- a/build_scripts/wheel_files.py +++ b/build_scripts/wheel_files.py @@ -839,6 +839,10 @@ def module_QtMultimedia() -> ModuleData: data.translations.append("qtmultimedia_*") data.plugins = get_module_plugins(json_data) + if sys.platform == "win32": + data.extra_files.extend(["avcodec-60.dll", "avformat-60.dll", "avutil-58.dll", + "swresample-4.dll", "swscale-7.dll"]) + return data -- cgit v1.2.3