gtk+-directfb: The patches to run gtk over directfb

From: Xiaofeng Yan <[email protected]>

Hi Phil, Koen & Richard,

Thanks for your good suggestion. I have modified my patches according to your suggestion. 1 Remove patch no-demo.patch from gtk+_2.24.8(Richard's suggestion)
2 Use gtk-directfb in DISTRO_FEATURES(Koen's suggestion)
3 Remvoe PACKAGECONFIG[directfb] for pango(Phil's suggestion)

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 (7):
cairo: add directfb DISTRO_FEATURE
pango: Disable x11 when pango doesn't run over x11 gtk.inc: add feature based on directfb
gtk: add demos to the configuation of gtk+
directfb-examples: add package directfb-examples to OE-core task-core-gtk-directfb.bb: Add task list to run gtk over directfb core-image-gtk-directfb.bb: add an image for gtk over directfb

 meta/recipes-gnome/gtk+/gtk+.inc                   |   16 ++++++++++--
 meta/recipes-gnome/gtk+/gtk+_2.24.8.bb             |    4 +-
 meta/recipes-graphics/cairo/cairo.inc              |   11 ++++++--
 .../directfb/directfb-examples_1.2.0.bb            |   20 +++++++++++++++
 .../images/core-image-gtk-directfb.bb              |   21 ++++++++++++++++
 meta/recipes-graphics/pango/pango.inc              |   16 +++++++++---
 .../tasks/task-core-gtk-directfb.bb                |   26 ++++++++++++++++++++
 7 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb
 create mode 100644 meta/recipes-graphics/images/core-image-gtk-directfb.bb
 create mode 100644 meta/recipes-graphics/tasks/task-core-gtk-directfb.bb

From: Xiaofeng Yan <[email protected]>

cairo run over x11 at current OE-core. If cairo want to run over directfb, then \
the configuration related to x11 should be disabled and directfb should be enabled.

[YOCTO #1674]

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

index 876acad..5f8f7b6 100644
@@ -11,13 +11,18 @@ BUGTRACKER = "http://bugs.freedesktop.org"
 SECTION = "libs"
 LICENSE = "MPL-1 & LGPLv2.1"
 X11DEPENDS = "virtual/libx11 libsm libxrender"
-DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+DEPENDS = "libpng fontconfig pixman glib-2.0"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', d)}"
+PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
+PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
 require cairo-fpu.inc
-EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
+EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} "
+
 
 inherit autotools pkgconfig
 
 # We don't depend on binutils so we need to disable this
-export ac_cv_lib_bfd_bfd_openr=no
\ No newline at end of file
+export ac_cv_lib_bfd_bfd_openr=no

1.7.0.4

From: Xiaofeng Yan <[email protected]>

pango run over x11 at current OE-core. If pango want to run over non-x11, then \
the configuration related to x11 should be disabled.

[YOCTO #1674]

---
 meta/recipes-graphics/pango/pango.inc |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

index 6d94e02..ff5a73a 100644
@@ -10,13 +10,22 @@ 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)}"
+PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
+
 
 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 +34,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"

@@ -46,6 +54,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

From: Xiaofeng Yan <[email protected]>

gtk run over x11 at current OE-core. If gtk want to run over directfb, then \
the configuration related to x11 should be disabled and directfb should be enabled.

[YOCTO #1674]

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

index 1d8f4a6..5eb7eb1 100644
@@ -9,9 +9,19 @@ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
 SECTION = "libs"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \
-           gtk-doc-native docbook-utils-native libxrandr libgcrypt \
-           libxdamage libxrender libxcomposite cairo gdk-pixbuf"
+
+X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
+DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
+ libgcrypt cairo gdk-pixbuf"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'directfb', '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
+# a backend.
+PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
+PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb"
 
 inherit autotools pkgconfig
 

1.7.0.4

From: Xiaofeng Yan <[email protected]>

Add demos for checking whether gtk+ run over directfb successfully or not.

[YOCTO #1674]

---
 meta/recipes-gnome/gtk+/gtk+_2.24.8.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index fb88979..ec827a7 100644
@@ -9,12 +9,12 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
            file://run-iconcache.patch \
            file://configure-nm.patch \
            file://hardcoded_libtool.patch \
-           file://no-demos.patch \
            file://cellrenderer-cairo.patch;striplevel=0 \
            file://toggle-font.diff;striplevel=0 \
            file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
            file://doc-fixes.patch \
 	  "
+
 # TO MERGE
 #           file://entry-cairo.patch;striplevel=0
 #           file://filesystem-volumes.patch

@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
 SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"

1.7.0.4

This broke the builds:

http://autobuilder.yoctoproject.org:8010/builders/nightly-mips/builds/198/steps/shell_14/logs/stdio

:(

Cheers,

Richard

To update, there is a clue in the error if you read it carefully:

(process:18554): GdkPixbuf-WARNING **: Cannot open pixbuf loader module file '/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86-64/build/build/tmp/sysroots/x86_64-linux/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache': No such file or directory | failed to load "./apple-red.png": Couldn't recognize the image file format for file './apple-red.png'

Note its looking in "nightly-x86-64", not "nightly-mips" so this looks like a relocation issue in gdk-pixbuf rather than a problem with this patch itself.

I had a quick look on the autobuilder:

$ grep nightly-x86-64/build/build/tmp/sysroots/x86_64-linux/usr/lib/ * -r
Binary file bin/gdk-pixbuf-query-loaders matches
Binary file lib/libasound.so matches
Binary file lib/alsa-lib/smixer/smixer-hda.so matches
Binary file lib/alsa-lib/smixer/smixer-ac97.so matches
Binary file lib/libasound.so.2 matches
Binary file lib/libasound.so.2.0.0 matches

so we have a hardcoded path in gdk-pixbuf-query-loaders. It also looks like there is an issue in alsa-lib.

Cheers,

Richard

The gdk-pixbuf issue is fixed with

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=9d136b2db8f906c562cbdb23a9b238f0e237074b

which I've expedited since it was resulting in a ton of autobuilder which is left unresolved would have a knock on effect on delaying other patches and testing.

Cheers,

Richard

From: Xiaofeng Yan <[email protected]>

Add this package for checking whether directfb run rightly or not. It also is an useful tool to test directfb.

[YOCTO #1674]

---
 .../directfb/directfb-examples_1.2.0.bb            |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb

new file mode 100644
index 0000000..215426e
@@ -0,0 +1,20 @@
+DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \
+      applications that can be used to test and demonstrate various DirectFB \
+      features"
+DEPENDS = "directfb"
+SECTION = "libs"
+LICENSE = "MIT"
+PR = "r0"
+
+SRC_URI = " \
+           http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
+          "
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f"
+
+S = "${WORKDIR}/DirectFB-examples-${PV}"
+
+inherit autotools
+
+SRC_URI[md5sum] = "ce018f681b469a1d72ffc32650304b98"
+SRC_URI[sha256sum] = "830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e"

1.7.0.4

From: Xiaofeng Yan <[email protected]>

Add task-core-gtk-directfb.bb to OE core for running gtk over directfb.

[YOCTO #1674]

---
 .../tasks/task-core-gtk-directfb.bb                |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/tasks/task-core-gtk-directfb.bb

new file mode 100644
index 0000000..239e0c1
@@ -0,0 +1,26 @@
+DESCRIPTION = "gkt+ over directfb without x11"
+PR = "r0"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit task
+
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+
+PACKAGES += " \
+	${PN}-base \
+"
+
+RDEPENDS_${PN}-base = " \
+		directfb \
+		directfb-examples \
+		pango \
+		pango-modules \
+		fontconfig \
+		gtk+ \
+		gtk-demo \
+		dropbear \
+		${TOUCH} \
+"

1.7.0.4

From: Xiaofeng Yan <[email protected]>

This file can make an image to run gtk over directfb.

[YOCTO #1674]

---
 .../images/core-image-gtk-directfb.bb              |   21 ++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/images/core-image-gtk-directfb.bb

new file mode 100644
index 0000000..b0ae469
@@ -0,0 +1,21 @@
+LICENSE = "MIT"
+PR="r0"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+DEPENDS += "task-core-gtk-directfb"
+
+RDEPENDS_${PN} += " \
+	task-core-gtk-directfb-base \
+	"
+
+inherit core-image
+
+IMAGE_INSTALL += "\
+	${POKY_BASE_INSTALL} \
+	task-core-basic \
+	module-init-tools \
+	task-core-gtk-directfb-base \
+"

1.7.0.4

I think this ought to be done on core-image-gtk not a specific one for directfb as it depends on a distro feature and you can't just generate an image with this, if the distro has no directfb feature enabled.

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

I can add a mechanism to inform user to add "gtk-directfb" to DISTRO_FEATURES by adding like the following steps $touch meta/class/gtk-directfb.bbclass
$cat meta/class/gtk-directfb.bbclass
python () {
import os
import signal
packages = d.getVar('DISTRO_FEATURES', 1).split()
for pkg in packages:
if pkg == "x11":
print("Please remove x11 from DISTRO_FEATURES, use
\"gtk-directfb\" instead of it\n")
pid = os.getpid()
os.kill(pid,signal.SIGCLD) # it could have some issues
}

$cat core-image-gtk-directfb.bb
LICENSE = "MIT"
PR="r0"

inherit gtk-directfb

LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \

file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

DEPENDS += "task-core-gtk-directfb"

RDEPENDS_${PN} += " \
    task-core-gtk-directfb-base \
    "

inherit core-image

IMAGE_INSTALL += "\
    ${POKY_BASE_INSTALL} \
    task-core-basic \
    module-init-tools \
    task-core-gtk-directfb-base \

"
Do you have any comment about above method ?

Thanks
Yan

IMAGE_INSTALL += "\

All is fine except I don't see the need of having one specific image for gtk-directfb use. The case, in case it is required, you might include in case gtk-directfb feature is listed, avoiding an image specific to this.

Why do you want a specific image for it?

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

To put what Otavio is asking in different words, couldn't we have a generic "gtk test" image which would work with both directfb and x11?

I think the problem is that such an image gets tricky to construct as X requires a lot of extras such as an xserver, a general directfb image has a much simpler content and is quite a different entity. I can therefore see why a separate image has been created and whilst I agree its not ideal, I think the alternatives are worse.

I think Yan's patch with the anonymous python is along the right lines but please lookup SkipPackage() instead of using getpid and kill!

Cheers,

Richard

I've merged these, thanks.

I think this one needs a piece of anonymous python as mentioned in my reply.

Cheers,

Richard