PATCH 0/3] Fix the error when building image "core-image-gtk-directfb"

From: Xiaofeng Yan <[email protected]>

Bitbake complain " No package 'cairo-xlib' found" when building image "core-image-gtk-directfb". Misconfiguration of directfb in PACKAGECONFIG causes this problem. I change directfb to gtk-directfb. Another problem is about messy code when running gtk-demo because of no directfb "/etc/pango". I create this directory in pango.inc.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/gtk-directfb
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/gtk-directfb

Thanks,
Xiaofeng Yan <[email protected]>
---

Xiaofeng Yan (3):
gtk.inc: Change configuration of directfb to gtk-directfb cairo.inc: Change configuration of directfb to gtk-directfb pango.inc: add directory "/etc/pango"

 meta/recipes-gnome/gtk+/gtk+.inc      |    2 +-
 meta/recipes-graphics/cairo/cairo.inc |    2 +-
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

From: Xiaofeng Yan <[email protected]>

"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb". PACKAGECONFIG can't select directfb as backend rightly, or else.

[YOCTO #1674]

---
 meta/recipes-gnome/gtk+/gtk+.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 5eb7eb1..4e03670 100644
@@ -15,7 +15,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbo
  libgcrypt cairo gdk-pixbuf"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
 
 # for gtk+ 2.x, have to pick either x11 or directfb not both
 # for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as

1.7.0.4

From: Xiaofeng Yan <[email protected]>

"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb". PACKAGECONFIG can't select directfb as backend rightly, or else.

[YOCTO #1674]

---
 meta/recipes-graphics/cairo/cairo.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 5f8f7b6..930675d 100644
@@ -13,7 +13,7 @@ LICENSE = "MPL-1 & LGPLv2.1"
 X11DEPENDS = "virtual/libx11 libsm libxrender"
 DEPENDS = "libpng fontconfig pixman glib-2.0"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', d)}"
+           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
 PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
 PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
 

1.7.0.4

From: Xiaofeng Yan <[email protected]>

Command "pango-querymodules > /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1674]

---
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

index b428b9d..e103fab 100644
@@ -46,6 +46,11 @@ fi
 
 }
 
+# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
+do_install_prepend() {
+	install -d ${D}/${sysconfdir}/pango
+}
+
 python populate_packages_prepend () {
 	prologue = d.getVar("postinst_prologue", 1)
 

@@ -54,6 +59,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/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} += "${syscondir}/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"

1.7.0.4

"${sysconfdir}" is in the default FILES_${PN} anyway. (Also, "${syscondir}/*" won't match anything since there is no such variable.)

So this change is largely benign but it won't accomplish much.

p.

I will remove this changes.