mirror of https://git.ffmpeg.org/ffmpeg.git
configure: Check for xcb as well as xcb-shape before enabling libxcb
Newer versions of libxcb have xcb-foo pkg-config files that do not declare their xcb dependency so that required linker flags will not be generated.
This commit is contained in:
parent
b446f0e98f
commit
871b4f3654
|
@ -1752,8 +1752,9 @@ CONFIG_EXTRA="
|
||||||
iso_media
|
iso_media
|
||||||
ividsp
|
ividsp
|
||||||
jpegtables
|
jpegtables
|
||||||
libx262
|
|
||||||
lgplv3
|
lgplv3
|
||||||
|
libx262
|
||||||
|
libxcb_shape
|
||||||
lpc
|
lpc
|
||||||
lzf
|
lzf
|
||||||
me_cmp
|
me_cmp
|
||||||
|
@ -2420,7 +2421,7 @@ sndio_indev_deps="sndio"
|
||||||
sndio_outdev_deps="sndio"
|
sndio_outdev_deps="sndio"
|
||||||
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
|
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
|
||||||
vfwcap_indev_deps="vfw32 vfwcap_defines"
|
vfwcap_indev_deps="vfw32 vfwcap_defines"
|
||||||
xcbgrab_indev_deps="libxcb"
|
xcbgrab_indev_deps="libxcb libxcb_shape"
|
||||||
xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes"
|
xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes"
|
||||||
|
|
||||||
# protocols
|
# protocols
|
||||||
|
@ -4797,7 +4798,8 @@ if enabled libcdio; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if enabled libxcb; then
|
if enabled libxcb; then
|
||||||
require_pkg_config libxcb xcb-shape xcb/shape.h xcb_shape_rectangles
|
require_pkg_config libxcb xcb xcb/xcb.h xcb_connect
|
||||||
|
require_pkg_config libxcb_shape xcb-shape xcb/shape.h xcb_shape_rectangles
|
||||||
disabled libxcb_shm ||
|
disabled libxcb_shm ||
|
||||||
require_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach
|
require_pkg_config libxcb_shm xcb-shm xcb/shm.h xcb_shm_attach
|
||||||
disabled libxcb_xfixes ||
|
disabled libxcb_xfixes ||
|
||||||
|
|
Loading…
Reference in New Issue