From: Xiaofeng Yan <xiaofeng....@windriver.com>
pango run over x11 at current OE-core. If pango want to run over directfb, then
\
the configuration related to x11 should be disabled and directfb should be
enabled.
[YOCTO #1674]
Signed-off-by: Xiaofeng Yan <xiaofeng....@windriver.com>
---
meta/recipes-graphics/pango/pango.inc | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc
b/meta/recipes-graphics/pango/pango.inc
index 6d94e02..4fc2aa8 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,13 +10,24 @@ SECTION = "libs"
LICENSE = "LGPL"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native
cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native
cairo "
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
+PACKAGECONFIG[directfb] = ",,directfb"
+
PACKAGES_DYNAMIC = "pango-module-*"
RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11',
'pango-module-basic-x', '', d)} pango-module-basic-fc"
inherit gnome
+# Create a pango-modules package
+ALLOW_EMPTY_${BPN}-modules = "1"
+PACKAGES += "${BPN}-modules"
+RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("pango-module") != -1])}"
+
EXTRA_AUTORECONF = ""
@@ -25,8 +36,7 @@ FULL_OPTIMIZATION_arm = "-O2"
EXTRA_OECONF = "--disable-glibtest \
--enable-explicit-deps=no \
- --disable-debug \
- ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)}"
+ --disable-debug"
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.6.0"
@@ -35,7 +45,6 @@ postinst_prologue() {
if [ "x$D" != "x" ]; then
exit 1
fi
-
}
python populate_packages_prepend () {
@@ -46,6 +55,6 @@ python populate_packages_prepend () {
do_split_packages(d, modules_root, '^pango-(.*)\.so$',
'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules >
/etc/pango/pango.modules')
}
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
--
1.7.0.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
