Packages: Pango: move to graphics packages and give ability to build with X support

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

6 files changed, 26 insertions, 7 deletions

diff --git a/packages/graphics/graphics.kconfig b/packages/graphics/graphics.kconfig
index 7cc6d75..0b83d87 100644
--- a/packages/graphics/graphics.kconfig
+++ b/packages/graphics/graphics.kconfig
@@ -32,6 +32,7 @@ source packages/graphics/gtk/gtk.kconfig
 source packages/graphics/imlib2/imlib2.kconfig
 source packages/graphics/libjpeg/libjpeg.kconfig
 source packages/graphics/libpng/libpng.kconfig
+source packages/graphics/pango/pango.kconfig
 source packages/graphics/pixman/pixman.kconfig
 source packages/graphics/libtiff/libtiff.kconfig
 comment "Include fonts in the target root filesystem"
diff --git a/packages/graphics/graphics.mk b/packages/graphics/graphics.mk
index e2bdc0b..5ac2be1 100644
--- a/packages/graphics/graphics.mk
+++ b/packages/graphics/graphics.mk
@@ -67,6 +67,10 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBPNG) += libpng_install
 include $(EMBTK_ROOT)/packages/graphics/libtiff/libtiff.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBTIFF) += libtiff_install
 
+#Pango
+include $(EMBTK_ROOT)/packages/graphics/pango/pango.mk
+ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_PANGO) += pango_install
+
 #pixman
 include $(EMBTK_ROOT)/packages/graphics/pixman/pixman.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_PIXMAN) += pixman_install
diff --git a/packages/misc/pango/pango.kconfig b/packages/graphics/pango/pango.kconfig
index a1e849f..0ebba89 100644
--- a/packages/misc/pango/pango.kconfig
+++ b/packages/graphics/pango/pango.kconfig
@@ -36,6 +36,14 @@ config EMBTK_HAVE_PANGO
 		that text layout is needed, though most of the work on Pango so
 		far has been done in the context of the GTK+ widget toolkit.
 		Pango forms the core of text and font handling for GTK+-2.x.
+
+config EMBTK_HAVE_PANGO_WITH_X
+	bool "Build Pango with X library support"
+	depends on EMBTK_HAVE_PANGO
+	select EMBTK_HAVE_LIBX11
+	help
+		Build Pango with X library support
+
 choice
 	prompt "Pango version you wish"
 	depends on EMBTK_HAVE_PANGO
diff --git a/packages/misc/pango/pango.mk b/packages/graphics/pango/pango.mk
index 19fb2dd..c8f14f9 100644
--- a/packages/misc/pango/pango.mk
+++ b/packages/graphics/pango/pango.mk
@@ -35,7 +35,14 @@ PANGO_INCLUDES = pango*
 PANGO_LIBS = pango-* pango* libpango*
 PANGO_PKGCONFIGS = pango*.pc
 
-PANGO_DEPS := glib_install fontconfig_install cairo_install
+ifeq ($(CONFIG_EMBTK_HAVE_PANGO_WITH_X),y)
+PANGO_CONFIGURE_OPTS := --with-x
+PANGO_DEPS := libx11_install
+else
+PANGO_CONFIGURE_OPTS := --without-x
+endif
+
+PANGO_DEPS += glib_install fontconfig_install cairo_install
 
 pango_install:
 	@test -e $(PANGO_BUILD_DIR)/.installed || \
@@ -87,7 +94,7 @@ $(PANGO_BUILD_DIR)/.configured:
 	PKG_CONFIG_LIBDIR=$(SYSROOT)/usr/lib \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \
-	--prefix=/usr --without-x
+	--prefix=/usr $(PANGO_CONFIGURE_OPTS)
 	@touch $@
 
 $(PANGO_BUILD_DIR)/.patchlibtool:
@@ -105,6 +112,10 @@ $(PANGO_BUILD_DIR)/.patchlibtool:
 
 $(PANGO_BUILD_DIR)/.special:
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/
+	$(Q)-mkdir -p $(ROOTFS)/usr
+	$(Q)-mkdir -p $(ROOTFS)/usr/etc
+	$(Q)-cp -R $(SYSROOT)/usr/etc/pango $(ROOTFS)/usr/etc/
+	@touch $@
 
 pango_clean:
 	$(call EMBTK_GENERIC_MESSAGE,"cleanup pango-$(PANGO_VERSION)...")
diff --git a/packages/misc/misc.kconfig b/packages/misc/misc.kconfig
index 856335a..dfb2f8b 100644
--- a/packages/misc/misc.kconfig
+++ b/packages/misc/misc.kconfig
@@ -30,7 +30,6 @@ source packages/misc/glib/glib.kconfig
 source packages/misc/libelf/libelf.kconfig
 source packages/misc/libxml/libxml.kconfig
 source packages/misc/ncurses/ncurses.kconfig
-source packages/misc/pango/pango.kconfig
 source packages/misc/tslib/tslib.kconfig
 
 
diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk
index 7f91bd9..e2a1ee6 100644
--- a/packages/misc/misc.mk
+++ b/packages/misc/misc.mk
@@ -46,10 +46,6 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXML2) += libxml2_install
 include $(EMBTK_ROOT)/packages/misc/ncurses/ncurses.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_NCURSES) += ncurses_install
 
-#Pango
-include $(EMBTK_ROOT)/packages/misc/pango/pango.mk
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_PANGO) += pango_install
-
 #tslib
 include $(EMBTK_ROOT)/packages/misc/tslib/tslib.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_TSLIB) += tslib_install