Patchwork [13/28] cairo: do not depend on xserver-xorg_server, but on the right library

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

Comments

Thomas Petazzoni - Jan. 6, 2013, 9:29 p.m.
cairo is a X client library, so there is no reason for it to build
depend on the X.org server. What Cairo needs is the xlib_libX11
library.

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

 Thomas> cairo is a X client library, so there is no reason for it to build
 Thomas> depend on the X.org server. What Cairo needs is the xlib_libX11
 Thomas> library.

Committed, thanks.

Patch

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 398e47f..4a2078e 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -2,6 +2,7 @@  config BR2_PACKAGE_CAIRO
 	bool "cairo"
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 59a032a..41e876a 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -49,7 +49,7 @@  endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	CAIRO_CONF_OPT += --enable-xlib --with-x
-	CAIRO_DEPENDENCIES += xserver_xorg-server
+	CAIRO_DEPENDENCIES += xlib_libX11
 else
 	CAIRO_CONF_OPT += --disable-xlib --without-x
 endif