summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:33 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-12 21:48:24 (GMT)
commit3ba6d3815d51405454d475fbe1400ee93609a152 (patch)
tree9bddc4e9345ec75ee5ca226fd25c28d464ae686e
parentb19ee5cbdf8978d593805483a92b4c9d00c0da76 (diff)
downloadbuildroot-3ba6d3815d51405454d475fbe1400ee93609a152.tar.gz
buildroot-3ba6d3815d51405454d475fbe1400ee93609a152.tar.bz2
pango: fix X.org dependencies
pango is a X client library, so it does not need to depend on the X.org server. So, we replace the server dependency by dependencies on the appropriate libraries. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/pango/Config.in3
-rw-r--r--package/pango/pango.mk13
2 files changed, 14 insertions, 2 deletions
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 60e9931..6c8a160 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -5,7 +5,10 @@ config BR2_PACKAGE_PANGO
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
help
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere that
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 7ba53ee..8e0444e 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,17 +41,26 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkgconf libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+ host-pkgconf \
+ libglib2 \
+ cairo \
+ fontconfig \
+ freetype
ifeq ($(BR2_PACKAGE_XORG7),y)
PANGO_CONF_OPT += --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
- PANGO_DEPENDENCIES += xserver_xorg-server
+ PANGO_DEPENDENCIES += xlib_libX11
else
PANGO_CONF_OPT += --without-x
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
+ PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender
+endif
+
define PANGO_INSTALL_INITSCRIPT
$(INSTALL) -m 755 -D package/pango/S25pango \
$(TARGET_DIR)/etc/init.d/S25pango