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>

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 60e9931a4345adc364d29617c8e9f54e96fe11b0..6c8a16024e52efb5a6233461356b0564c8f91402 100644 (file)
--- 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 7ba53ee6dc3cf0063ff4b4a9d507042fe01110c1..8e0444ea38def6f69a2f0e6575bac5c456a93e28 100644 (file)
--- 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