mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-23 21:57:33 -08:00
1cf49ac256
* Don't vendor system ffmpeg. (This addresses bug #965033). * Handle automagic, shiboken links against libxml2, libxslt and libclang. Bug: https://bugs.gentoo.org/965033 Signed-off-by: Alfred Wingate <parona@protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44590 Closes: https://github.com/gentoo/gentoo/pull/44590 Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
19 lines
898 B
Diff
19 lines
898 B
Diff
--- a/build_scripts/platforms/unix.py
|
|
+++ b/build_scripts/platforms/unix.py
|
|
@@ -234,14 +234,6 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False):
|
|
"{st_build_dir}/{st_package_name}/jar",
|
|
_vars=_vars)
|
|
|
|
- # Some libraries specific to Linux/Android from 6.8
|
|
- # eg: the libav* libraries are required for the multimedia module
|
|
- if config.is_internal_pyside_build() and (sys.platform != "darwin" or is_android):
|
|
- qt_multimedia_filters = [f"lib{lib}*.so*" for lib in PYSIDE_MULTIMEDIA_LIBS]
|
|
- copydir("{qt_lib_dir}", destination_qt_dir / "lib",
|
|
- _filter=qt_multimedia_filters,
|
|
- recursive=False, _vars=_vars, force_copy_symlinks=True)
|
|
-
|
|
# Copy Qt libs to package
|
|
if OPTION["STANDALONE"]:
|
|
if config.is_internal_pyside_build() or config.is_internal_shiboken_generator_build():
|
|
|