Module: libav
Branch: release/12
Commit: 71392652349a14dc653db09acea1f4b651b3c5a2
Author: Diego Biurrun <di...@biurrun.de>
Committer: Diego Biurrun <di...@biurrun.de>
Date: Fri Jun 23 10:47:10 2017 +0000
configure: Simplify and fix libxcb check
Check for xcb as well as xcb-shape before enabling libxcb since 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.
Use helper functions to simplify libxcb check, drop unused variables.
(cherry picked from commit 1ea77aae927c7310034b1f75d4f1c2676fe641f2)
(cherry picked from commit a97563c889fefd81ad6b3758471434d8c2e2e550)
(cherry picked from commit 871b4f3654636ed64560e86b9faa33828d195ceb)
Signed-off-by: Diego Biurrun <di...@biurrun.de>
---
configure | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 8a1c884..31d4229 100755
--- a/configure
+++ b/configure
@@ -4769,9 +4769,8 @@ fi
check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib
if enabled libxcb; then
- check_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles || {
- enabled libxcb && die "ERROR: libxcb not found";
- } && enable libxcb
+ require_pkg_config xcb xcb/xcb.h xcb_connect
+ require_pkg_config xcb-shape xcb/shape.h xcb_shape_rectangles
disabled libxcb_shm ||
check_pkg_config xcb-shm xcb/shm.h xcb_shm_attach || {
@@ -4783,8 +4782,8 @@ if enabled libxcb; then
enabled libxcb_xfixes && die "ERROR: libxcb_xfixes not found";
} && enable libxcb_xfixes
- add_cflags "$xcb_event_cflags $xcb_shm_cflags $xcb_xfixes_cflags"
- add_extralibs "$xcb_event_libs $xcb_shm_libs $xcb_xfixes_libs"
+ add_cflags "$xcb_shm_cflags $xcb_xfixes_cflags"
+ add_extralibs "$xcb_shm_libs $xcb_xfixes_libs"
fi
enabled vaapi &&
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
