diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-01-06 11:29:25 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-01-12 22:39:37 +0100 |
| commit | 90c3150d5f4c732385f3fe0c25c8cddd150da685 (patch) | |
| tree | 665af8d3dc56bf83620e9f495207c128d6bff2c4 | |
| parent | cb8895ceffc8140b9d40fca7eba318a49bc7da20 (diff) | |
| download | buildroot-novena-90c3150d5f4c732385f3fe0c25c8cddd150da685.tar.gz buildroot-novena-90c3150d5f4c732385f3fe0c25c8cddd150da685.zip | |
cairo: do not depend on xserver-xorg_server, but on the right library
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>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/cairo/Config.in | 1 | ||||
| -rw-r--r-- | package/cairo/cairo.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 398e47fb6..4a2078eb3 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 59a032a32..41e876a4a 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 |