[OE-core] [PATCH 6/9] pango: add directfb DISTRO_FEATURE
Xiaofeng Yan
xiaofeng.yan at windriver.com
Thu Nov 24 03:06:22 UTC 2011
From: Xiaofeng Yan <xiaofeng.yan at 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.yan at windriver.com>
---
meta/recipes-graphics/pango/pango.inc | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 6d94e02..6822694 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,14 +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 "
PACKAGES_DYNAMIC = "pango-module-*"
RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
+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"
+
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 = ""
# seems to go wrong with default cflags
@@ -25,17 +35,18 @@ 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"
+# No "etc" in "${D}" except for "usr", So add "/etc/pango" in the following function. \
+# Because "prologue + 'pango-querymodules > /etc/pango/pango.modules'" use this directory.
postinst_prologue() {
if [ "x$D" != "x" ]; then
exit 1
fi
-
+ [ ! -d "/etc/pango" ] && mkdir -p /etc/pango/
}
python populate_packages_prepend () {
--
1.7.0.4
More information about the Openembedded-core
mailing list