diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-11-11 10:26:23 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-11-11 13:08:14 +0100 |
| commit | 38c0d909ff78f5432d4a99a55974fda35786f868 (patch) | |
| tree | 09601da46dbef09d3f30807c83babd75be91c925 /build_scripts/platforms/unix.py | |
| parent | db81f0cb861bec320104e2ec4b312d973e0700fa (diff) | |
Fix multimedia to work on Linux with 6.8.1
The helper libraries are now also required on Linux. Also,
some new libraries libQt6FFmpegStub*.so* were added.
Pick-to: 6.8
Change-Id: I78ecd66139b18f48bbbe677990dc8ec570238199
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 4f57467cb..3a350a662 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -12,7 +12,8 @@ from ..utils import copydir, copyfile, copy_qt_metatypes, makefile from .. import PYSIDE, SHIBOKEN from .linux import prepare_standalone_package_linux from .macos import prepare_standalone_package_macos -from .. import PYSIDE_UNIX_BIN_TOOLS, PYSIDE_UNIX_LIBEXEC_TOOLS, PYSIDE_UNIX_BUNDLED_TOOLS +from .. import (PYSIDE_UNIX_BIN_TOOLS, PYSIDE_UNIX_LIBEXEC_TOOLS, PYSIDE_UNIX_BUNDLED_TOOLS, + PYSIDE_MULTIMEDIA_LIBS) def _macos_copy_gui_executable(name, _vars=None): @@ -233,11 +234,12 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): "{st_build_dir}/{st_package_name}/jar", _vars=_vars) - # some libraries specific to Android from 6.8 + # Some libraries specific to Linux/Android from 6.8 # eg: the libav* libraries are required for the multimedia module - if is_android and config.is_internal_pyside_build(): + if config.is_internal_pyside_build() and sys.platform != "darwin": + qt_multimedia_filters = [f"lib{lib}*.so*" for lib in PYSIDE_MULTIMEDIA_LIBS] copydir("{qt_lib_dir}", destination_qt_dir / "lib", - _filter=["libav*.so", "libsw*.so"], + _filter=qt_multimedia_filters, recursive=False, _vars=_vars, force_copy_symlinks=True) # Copy Qt libs to package |