mirror of
git://code.qt.io/qt/qt5.git
synced 2026-09-28 03:15:47 +08:00
macOS, FFmpeg: Explicitly do not link X11 libraries
The FFmpeg auto-detect mechanism will automatically pull in x11 as a dependency if the development packages are found on the host. This makes the FFmpeg unable to run macOS hosts that don't have the x11 package installed. This patch makes us explicitly avoid including it. Pick-to: 6.12 Change-Id: Ied33d25a60d5c9f54dcf37be3aad5cac0d2cbd03 Reviewed-by: Artem Dyomin <[email protected]>
This commit is contained in:
@@ -22,6 +22,12 @@ ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
|
||||
default_prefix="/usr/local/$ffmpeg_name"
|
||||
prefix="${2:-$default_prefix}"
|
||||
|
||||
# Disable X11 linkage on macOS. FFmpeg auto-detect
|
||||
# mechanisms will pull it in as a dependency if found
|
||||
# on the host. If this happens, it makes the binaries
|
||||
# not loadable on macOS machines without libx11 installed.
|
||||
ffmpeg_config_options+=" --disable-libxcb --disable-xlib"
|
||||
|
||||
build_ffmpeg() {
|
||||
local arch="$1"
|
||||
local build_dir="$ffmpeg_source_dir/build/$arch"
|
||||
|
||||
Reference in New Issue
Block a user