Patchwork [14/28] cairo: always enable XCB support when X backend is enabled

login
register
mail settings
Submitter Thomas Petazzoni
Date Jan. 6, 2013, 9:29 p.m.
Message ID <2b49f5dfdca60ca1ef60d3b62e05221ca96285b7.1357507764.git.thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/209812/
State Accepted
Commit d5d2f36367f02f8df4deae952ba3fbc8b1b3f2da
Headers show

Comments

Thomas Petazzoni - Jan. 6, 2013, 9:29 p.m.
cairo depends on xlib_libX11 for its Xlib backend. But xlib_libX11
depends on XCB, so the XCB support can always be built into Cairo.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/cairo/cairo.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Peter Korsgaard - Jan. 12, 2013, 9:41 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> cairo depends on xlib_libX11 for its Xlib backend. But xlib_libX11
 Thomas> depends on XCB, so the XCB support can always be built into Cairo.

Committed, thanks.

Patch

diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 41e876a..6cf910a 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -48,10 +48,10 @@  else
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-	CAIRO_CONF_OPT += --enable-xlib --with-x
+	CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x
 	CAIRO_DEPENDENCIES += xlib_libX11
 else
-	CAIRO_CONF_OPT += --disable-xlib --without-x
+	CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_PS),y)