* [PATCH 0/7] gtk+ over directfb: Fix bug 1674
@ 2011-11-08 11:15 Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 1/7] qemu-config.bb: " Xiaofeng Yan
` (7 more replies)
0 siblings, 8 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Image "gtk+ over directfb" without x11 depends on gtk+ and directfb. Someone can develop software based on directfb or gtk+ without x11 in their project.
So I added and modified some recipes for getting this image.
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 <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (7):
qemu-config.bb: Fix bug 1674
gtk+: Fix bug 1674
cairo: Fix bug 1674
directfb-examples: Fix bug 1674
core-image-gtk-directfb-sdk: Fix bug 1674
core-image-gtk-directfb: Fix bug 1674
pango: Fix bug 1674
meta/recipes-bsp/qemu-config/qemu-config.bb | 4 +-
meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++---
meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++---
meta/recipes-graphics/cairo/cairo.inc | 9 +++++-
.../directfb/directfb-examples_1.2.0.bb | 18 ++++++++++++
.../images/core-image-gtk-directfb-sdk.bb | 23 ++++++++++++++++
.../images/core-image-gtk-directfb.bb | 21 +++++++++++++++
meta/recipes-graphics/pango/pango.inc | 16 ++++++++---
meta/recipes-graphics/tasks/task-gtk-directfb.bb | 28 ++++++++++++++++++++
9 files changed, 136 insertions(+), 18 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-sdk.bb
create mode 100644 meta/recipes-graphics/images/core-image-gtk-directfb.bb
create mode 100644 meta/recipes-graphics/tasks/task-gtk-directfb.bb
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/7] qemu-config.bb: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 2/7] gtk+: " Xiaofeng Yan
` (6 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
qemu-config.bb: An image without x11 doesn't need dbus-x11
"gtk over directfb" don't depend on x11, so remove x11 here when compiling gtk+-directfb.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-bsp/qemu-config/qemu-config.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index ebf957a..deaf3a5 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
-PR = "r22"
+PR = "r23"
SRC_URI = "file://distcc.sh \
file://anjuta-remote-run \
@@ -37,7 +37,7 @@ pkg_postinst_${PN} () {
sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
}
-RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
+RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash"
inherit update-rc.d allarch
--
1.7.0.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/7] gtk+: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 1/7] qemu-config.bb: " Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:45 ` Koen Kooi
2011-11-08 13:18 ` Richard Purdie
2011-11-08 11:15 ` [PATCH 3/7] cairo: " Xiaofeng Yan
` (5 subsequent siblings)
7 siblings, 2 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Image "gtk+ over directfb" doesn't need "x11".
So I add "directfb" on configuration and gtk-demo to image for check \
whether image based on gtk+-directfb work successfully.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++++++----
meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++++++-----
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 0e5c45c..6ec5906 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -9,13 +9,18 @@ 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"
+DIRECTFBDEPENDS = "directfb"
+
+DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
+ libgcrypt cairo gdk-pixbuf \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
+
inherit autotools pkgconfig
-PACKAGES += "libgail"
+PACKAGES += "libgail gtk+-demo"
FILES_${PN} = "${bindir}/gtk-update-icon-cache \
${bindir}/gtk-query-immodules-2.0 \
@@ -40,6 +45,11 @@ FILES_${PN}-dbg += " \
${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
+FILES_gtk+-demo = " \
+ ${datadir}/gtk-2.0/demo/* \
+ ${bindir}/gtk-demo \
+ "
+
FILES_libgail = " \
${libdir}/gtk-2.0/modules/libgail.so \
${libdir}/gtk-2.0/modules/libferret.so \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
index 01f4a11..5a9dc5e 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
@@ -8,7 +8,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
file://run-iconcache.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 \
@@ -25,13 +24,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
# file://menu-deactivate.patch
# file://combo-arrow-size.patch;striplevel=0
# file://configurefix.patch
+# file://no-demos.patch
-PR = "r1"
+PR = "r2"
-SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
-SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
+SRC_URI[md5sum] = "4e977cb6a4530e9d4fe54d6ba70831c4"
+SRC_URI[sha256sum] = "9aade52339dca563780bca5c83b0fb02284393221bda4f55cb9ec7eae1661a1d"
+
+CONF_directfb=" --with-x=no --with-gdktarget=directfb"
+CONF_xorg=" --with-x=yes --with-gdktarget=x11"
+
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'directfb', \
+ '${CONF_directfb}', '${CONF_xorg}', d)} \
+ --without-libtiff --without-libjasper --enable-xkb \
+ --disable-glibtest --disable-cups --disable-xinerama"
-EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
LIBV = "2.10.0"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/7] cairo: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 1/7] qemu-config.bb: " Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 2/7] gtk+: " Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:52 ` Phil Blundell
2011-11-08 11:15 ` [PATCH 4/7] directfb-examples: " Xiaofeng Yan
` (4 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Image "gtk+ over directfb" doesn't need "x11".
cairo should be compiled without x11 when compiling an image based on directfb.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-graphics/cairo/cairo.inc | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 876acad..d1fc48c 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -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)}"
+DIRECTFBDEPENDS = "directfb"
+DEPENDS = "libpng fontconfig pixman glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require cairo-fpu.inc
+CONF_directfb="--with-x=no --enable-xcb=no --enable-directfb=yes"
+CONF_xorg="--with-x=yes --enable-xcb=no --enable-directfb=no"
+
EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
+EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'directfb', '${CONF_directfb}', '${CONF_xorg}', 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 4/7] directfb-examples: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
` (2 preceding siblings ...)
2011-11-08 11:15 ` [PATCH 3/7] cairo: " Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 5/7] core-image-gtk-directfb-sdk: " Xiaofeng Yan
` (3 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Add this package to OE-core for checking whether directfb work right or not.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../directfb/directfb-examples_1.2.0.bb | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb
diff --git a/meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb b/meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb
new file mode 100644
index 0000000..08cdc8f
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb-examples_1.2.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "DirectFB extra providers"
+DEPENDS = "directfb"
+SECTION = "libs"
+LICENSE = "GPL"
+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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 5/7] core-image-gtk-directfb-sdk: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
` (3 preceding siblings ...)
2011-11-08 11:15 ` [PATCH 4/7] directfb-examples: " Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 6/7] core-image-gtk-directfb: " Xiaofeng Yan
` (2 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Add this recipe for developing software on image based on gtk+-direcfb easily.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../images/core-image-gtk-directfb-sdk.bb | 23 ++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/images/core-image-gtk-directfb-sdk.bb
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb-sdk.bb b/meta/recipes-graphics/images/core-image-gtk-directfb-sdk.bb
new file mode 100644
index 0000000..17f677a
--- /dev/null
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb-sdk.bb
@@ -0,0 +1,23 @@
+IMAGE_FEATURES += "tools-sdk dev-pkgs"
+
+LICENSE = "MIT"
+PR="r0"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+DEPENDS += "task-gtk-directfb"
+
+RDEPENDS_${PN} += " \
+ task-gtk-directfb-base \
+ "
+
+inherit core-image
+
+IMAGE_INSTALL += "\
+ ${POKY_BASE_INSTALL} \
+ task-core-basic \
+ module-init-tools \
+ task-gtk-directfb-base \
+"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 6/7] core-image-gtk-directfb: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
` (4 preceding siblings ...)
2011-11-08 11:15 ` [PATCH 5/7] core-image-gtk-directfb-sdk: " Xiaofeng Yan
@ 2011-11-08 11:15 ` Xiaofeng Yan
2011-11-08 11:16 ` [PATCH 7/7] pango: " Xiaofeng Yan
2011-11-08 11:46 ` [PATCH 0/7] gtk+ over directfb: " Koen Kooi
7 siblings, 0 replies; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:15 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Two recipes can build an image based on gtk+directfb
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../images/core-image-gtk-directfb.bb | 21 +++++++++++++++
meta/recipes-graphics/tasks/task-gtk-directfb.bb | 28 ++++++++++++++++++++
2 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/images/core-image-gtk-directfb.bb
create mode 100644 meta/recipes-graphics/tasks/task-gtk-directfb.bb
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
new file mode 100644
index 0000000..00ba5cf
--- /dev/null
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -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-gtk-directfb"
+
+RDEPENDS_${PN} += " \
+ task-gtk-directfb-base \
+ "
+
+inherit core-image
+
+IMAGE_INSTALL += "\
+ ${POKY_BASE_INSTALL} \
+ task-core-basic \
+ module-init-tools \
+ task-gtk-directfb-base \
+"
diff --git a/meta/recipes-graphics/tasks/task-gtk-directfb.bb b/meta/recipes-graphics/tasks/task-gtk-directfb.bb
new file mode 100644
index 0000000..991b179
--- /dev/null
+++ b/meta/recipes-graphics/tasks/task-gtk-directfb.bb
@@ -0,0 +1,28 @@
+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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 7/7] pango: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
` (5 preceding siblings ...)
2011-11-08 11:15 ` [PATCH 6/7] core-image-gtk-directfb: " Xiaofeng Yan
@ 2011-11-08 11:16 ` Xiaofeng Yan
2011-11-08 11:56 ` Phil Blundell
2011-11-08 11:46 ` [PATCH 0/7] gtk+ over directfb: " Koen Kooi
7 siblings, 1 reply; 15+ messages in thread
From: Xiaofeng Yan @ 2011-11-08 11:16 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[YOCTO #1674]
Support to compile pango based on directfb besides x11.
Add pango-modules because it is needed by gtk+-directfb.
If no pango-modules, then missing codes will appear on screen when running gtk-demo.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-graphics/pango/pango.inc | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index a8e99e2..9237626 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -18,6 +18,11 @@ RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-ba
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
@@ -26,16 +31,17 @@ FULL_OPTIMIZATION_arm = "-O2"
EXTRA_OECONF = "--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \
- ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'directfb', '--with-x=no', '--with-x=yes', d)}"
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.6.0"
postinst_prologue() {
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ [ ! -d "/etc/pango" ] && mkdir -p /etc/pango/
}
python populate_packages_prepend () {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/7] gtk+: Fix bug 1674
2011-11-08 11:15 ` [PATCH 2/7] gtk+: " Xiaofeng Yan
@ 2011-11-08 11:45 ` Koen Kooi
2011-11-08 13:18 ` Richard Purdie
1 sibling, 0 replies; 15+ messages in thread
From: Koen Kooi @ 2011-11-08 11:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4379 bytes --]
Please mention what you fixed in the first line, e.g.
gtk+: add directfb DISTRO_FEATURE
instead of
gtk+: Fix bug 1674
Op 8 nov. 2011, om 12:15 heeft Xiaofeng Yan het volgende geschreven:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> [YOCTO #1674]
> Image "gtk+ over directfb" doesn't need "x11".
> So I add "directfb" on configuration and gtk-demo to image for check \
> whether image based on gtk+-directfb work successfully.
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++++++----
> meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++++++-----
> 2 files changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> index 0e5c45c..6ec5906 100644
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> @@ -9,13 +9,18 @@ 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"
> +DIRECTFBDEPENDS = "directfb"
> +
> +DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
> + libgcrypt cairo gdk-pixbuf \
> + ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)} \
> + ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
> +
>
> inherit autotools pkgconfig
>
> -PACKAGES += "libgail"
> +PACKAGES += "libgail gtk+-demo"
>
> FILES_${PN} = "${bindir}/gtk-update-icon-cache \
> ${bindir}/gtk-query-immodules-2.0 \
> @@ -40,6 +45,11 @@ FILES_${PN}-dbg += " \
> ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
> ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
>
> +FILES_gtk+-demo = " \
> + ${datadir}/gtk-2.0/demo/* \
> + ${bindir}/gtk-demo \
> + "
> +
> FILES_libgail = " \
> ${libdir}/gtk-2.0/modules/libgail.so \
> ${libdir}/gtk-2.0/modules/libferret.so \
> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> index 01f4a11..5a9dc5e 100644
> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> @@ -8,7 +8,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> file://xsettings.patch \
> file://run-iconcache.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 \
> @@ -25,13 +24,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> # file://menu-deactivate.patch
> # file://combo-arrow-size.patch;striplevel=0
> # file://configurefix.patch
> +# file://no-demos.patch
>
> -PR = "r1"
> +PR = "r2"
>
> -SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
> -SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
> +SRC_URI[md5sum] = "4e977cb6a4530e9d4fe54d6ba70831c4"
> +SRC_URI[sha256sum] = "9aade52339dca563780bca5c83b0fb02284393221bda4f55cb9ec7eae1661a1d"
> +
> +CONF_directfb=" --with-x=no --with-gdktarget=directfb"
> +CONF_xorg=" --with-x=yes --with-gdktarget=x11"
> +
> +EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'directfb', \
> + '${CONF_directfb}', '${CONF_xorg}', d)} \
> + --without-libtiff --without-libjasper --enable-xkb \
> + --disable-glibtest --disable-cups --disable-xinerama"
>
> -EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
>
> LIBV = "2.10.0"
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/7] gtk+ over directfb: Fix bug 1674
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
` (6 preceding siblings ...)
2011-11-08 11:16 ` [PATCH 7/7] pango: " Xiaofeng Yan
@ 2011-11-08 11:46 ` Koen Kooi
7 siblings, 0 replies; 15+ messages in thread
From: Koen Kooi @ 2011-11-08 11:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]
Op 8 nov. 2011, om 12:15 heeft Xiaofeng Yan het volgende geschreven:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Image "gtk+ over directfb" without x11 depends on gtk+ and directfb. Someone can develop software based on directfb or gtk+ without x11 in their project.
> So I added and modified some recipes for getting this image.
>
> 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 <xiaofeng.yan@windriver.com>
> ---
>
>
> Xiaofeng Yan (7):
> qemu-config.bb: Fix bug 1674
> gtk+: Fix bug 1674
> cairo: Fix bug 1674
> directfb-examples: Fix bug 1674
> core-image-gtk-directfb-sdk: Fix bug 1674
> core-image-gtk-directfb: Fix bug 1674
> pango: Fix bug 1674
Please use a more descriptive summary for the commit message, people looking at 'git shortlog' would appreciate that very much.
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/7] cairo: Fix bug 1674
2011-11-08 11:15 ` [PATCH 3/7] cairo: " Xiaofeng Yan
@ 2011-11-08 11:52 ` Phil Blundell
0 siblings, 0 replies; 15+ messages in thread
From: Phil Blundell @ 2011-11-08 11:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 19:15 +0800, Xiaofeng Yan wrote:
> #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
> require cairo-fpu.inc
> +CONF_directfb="--with-x=no --enable-xcb=no --enable-directfb=yes"
> +CONF_xorg="--with-x=yes --enable-xcb=no --enable-directfb=no"
> +
> EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
> +EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'directfb', '${CONF_directfb}', '${CONF_xorg}', d)}"
I don't think this can be correct. That will force X11 on for anybody
who isn't using DirectFB, right? I think you need to preserve the
previous semantics for building without X.
p.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 7/7] pango: Fix bug 1674
2011-11-08 11:16 ` [PATCH 7/7] pango: " Xiaofeng Yan
@ 2011-11-08 11:56 ` Phil Blundell
0 siblings, 0 replies; 15+ messages in thread
From: Phil Blundell @ 2011-11-08 11:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 19:16 +0800, Xiaofeng Yan wrote:
> - ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
> + ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
> + ${@base_contains('DISTRO_FEATURES', 'directfb', '--with-x=no', '--with-x=yes', d)}"
That last line looks fairly wrong. If I am understanding this right
then someone with neither x11 nor directfb set would get "--without-x
--with-x=yes", and someone with directfb but not X would get
"--without-x --with-x=no" which surely can't be what's wanted. Did you
test this patchset?
>+ [ ! -d "/etc/pango" ] && mkdir -p /etc/pango/
Why can't you just ship this folder in the package rather than creating
it in the postinst? Also, this should probably be ${sysconfdir} rather
than hardcoded.
p.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/7] gtk+: Fix bug 1674
2011-11-08 11:15 ` [PATCH 2/7] gtk+: " Xiaofeng Yan
2011-11-08 11:45 ` Koen Kooi
@ 2011-11-08 13:18 ` Richard Purdie
2011-11-08 13:32 ` Koen Kooi
1 sibling, 1 reply; 15+ messages in thread
From: Richard Purdie @ 2011-11-08 13:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 19:15 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> [YOCTO #1674]
> Image "gtk+ over directfb" doesn't need "x11".
> So I add "directfb" on configuration and gtk-demo to image for check \
> whether image based on gtk+-directfb work successfully.
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++++++----
> meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++++++-----
> 2 files changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> index 0e5c45c..6ec5906 100644
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> @@ -9,13 +9,18 @@ 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"
> +DIRECTFBDEPENDS = "directfb"
> +
> +DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
> + libgcrypt cairo gdk-pixbuf \
> + ${@base_contains('DISTRO_FEATURES', 'x11', '', '', d)} \
> + ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
> +
>
> inherit autotools pkgconfig
>
> -PACKAGES += "libgail"
> +PACKAGES += "libgail gtk+-demo"
>
> FILES_${PN} = "${bindir}/gtk-update-icon-cache \
> ${bindir}/gtk-query-immodules-2.0 \
> @@ -40,6 +45,11 @@ FILES_${PN}-dbg += " \
> ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
> ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
>
> +FILES_gtk+-demo = " \
> + ${datadir}/gtk-2.0/demo/* \
> + ${bindir}/gtk-demo \
> + "
> +
> FILES_libgail = " \
> ${libdir}/gtk-2.0/modules/libgail.so \
> ${libdir}/gtk-2.0/modules/libferret.so \
> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> index 01f4a11..5a9dc5e 100644
> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> @@ -8,7 +8,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> file://xsettings.patch \
> file://run-iconcache.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 \
> @@ -25,13 +24,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> # file://menu-deactivate.patch
> # file://combo-arrow-size.patch;striplevel=0
> # file://configurefix.patch
> +# file://no-demos.patch
>
> -PR = "r1"
> +PR = "r2"
>
> -SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
> -SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
> +SRC_URI[md5sum] = "4e977cb6a4530e9d4fe54d6ba70831c4"
> +SRC_URI[sha256sum] = "9aade52339dca563780bca5c83b0fb02284393221bda4f55cb9ec7eae1661a1d"
> +
> +CONF_directfb=" --with-x=no --with-gdktarget=directfb"
> +CONF_xorg=" --with-x=yes --with-gdktarget=x11"
> +
> +EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'directfb', \
> + '${CONF_directfb}', '${CONF_xorg}', d)} \
> + --without-libtiff --without-libjasper --enable-xkb \
> + --disable-glibtest --disable-cups --disable-xinerama"
>
> -EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
This is a horrible mess and its just going to get worse. We started
adding PACKAGECONFIG to try and help with things like this problem.
Instead of the above you should be able to do something like:
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
This commit also applies to the other places you're changing config
options.
Also some style issues:
a) please put a decent one line summary at the start of commits
b) mention the bug number a the end of the commit message in the for
[YOCTO #1674]
c) Please mention other details the patch changes. The patch above
changes the checksums (why?)
Cheers,
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/7] gtk+: Fix bug 1674
2011-11-08 13:18 ` Richard Purdie
@ 2011-11-08 13:32 ` Koen Kooi
2011-11-08 13:51 ` Richard Purdie
0 siblings, 1 reply; 15+ messages in thread
From: Koen Kooi @ 2011-11-08 13:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4756 bytes --]
Op 8 nov. 2011, om 14:18 heeft Richard Purdie het volgende geschreven:
> On Tue, 2011-11-08 at 19:15 +0800, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>>
>> [YOCTO #1674]
>> Image "gtk+ over directfb" doesn't need "x11".
>> So I add "directfb" on configuration and gtk-demo to image for check \
>> whether image based on gtk+-directfb work successfully.
>>
>> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>> ---
>> meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++++++----
>> meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++++++-----
>> 2 files changed, 26 insertions(+), 9 deletions(-)
>>
>> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
>> index 0e5c45c..6ec5906 100644
>> --- a/meta/recipes-gnome/gtk+/gtk+.inc
>> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
>> @@ -9,13 +9,18 @@ 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"
>> +DIRECTFBDEPENDS = "directfb"
>> +
>> +DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
>> + libgcrypt cairo gdk-pixbuf \
>> + ${@base_contains('DISTRO_FEATURES', 'x11', '', '', d)} \
>> + ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
>> +
>>
>> inherit autotools pkgconfig
>>
>> -PACKAGES += "libgail"
>> +PACKAGES += "libgail gtk+-demo"
>>
>> FILES_${PN} = "${bindir}/gtk-update-icon-cache \
>> ${bindir}/gtk-query-immodules-2.0 \
>> @@ -40,6 +45,11 @@ FILES_${PN}-dbg += " \
>> ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
>> ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
>>
>> +FILES_gtk+-demo = " \
>> + ${datadir}/gtk-2.0/demo/* \
>> + ${bindir}/gtk-demo \
>> + "
>> +
>> FILES_libgail = " \
>> ${libdir}/gtk-2.0/modules/libgail.so \
>> ${libdir}/gtk-2.0/modules/libferret.so \
>> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
>> index 01f4a11..5a9dc5e 100644
>> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
>> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
>> @@ -8,7 +8,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
>> file://xsettings.patch \
>> file://run-iconcache.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 \
>> @@ -25,13 +24,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
>> # file://menu-deactivate.patch
>> # file://combo-arrow-size.patch;striplevel=0
>> # file://configurefix.patch
>> +# file://no-demos.patch
>>
>> -PR = "r1"
>> +PR = "r2"
>>
>> -SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
>> -SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
>> +SRC_URI[md5sum] = "4e977cb6a4530e9d4fe54d6ba70831c4"
>> +SRC_URI[sha256sum] = "9aade52339dca563780bca5c83b0fb02284393221bda4f55cb9ec7eae1661a1d"
>> +
>> +CONF_directfb=" --with-x=no --with-gdktarget=directfb"
>> +CONF_xorg=" --with-x=yes --with-gdktarget=x11"
>> +
>> +EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'directfb', \
>> + '${CONF_directfb}', '${CONF_xorg}', d)} \
>> + --without-libtiff --without-libjasper --enable-xkb \
>> + --disable-glibtest --disable-cups --disable-xinerama"
>>
>> -EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
>
> This is a horrible mess and its just going to get worse. We started
> adding PACKAGECONFIG to try and help with things like this problem.
> Instead of the above you should be able to do something like:
>
> PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
> PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
What happens when I have both directfb and x11 in DISTRO_FEATURES?
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/7] gtk+: Fix bug 1674
2011-11-08 13:32 ` Koen Kooi
@ 2011-11-08 13:51 ` Richard Purdie
0 siblings, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2011-11-08 13:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-08 at 14:32 +0100, Koen Kooi wrote:
> Op 8 nov. 2011, om 14:18 heeft Richard Purdie het volgende geschreven:
>
> > On Tue, 2011-11-08 at 19:15 +0800, Xiaofeng Yan wrote:
> >> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> >>
> >> [YOCTO #1674]
> >> Image "gtk+ over directfb" doesn't need "x11".
> >> So I add "directfb" on configuration and gtk-demo to image for check \
> >> whether image based on gtk+-directfb work successfully.
> >>
> >> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> >> ---
> >> meta/recipes-gnome/gtk+/gtk+.inc | 18 ++++++++++++++----
> >> meta/recipes-gnome/gtk+/gtk+_2.24.6.bb | 17 ++++++++++++-----
> >> 2 files changed, 26 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> >> index 0e5c45c..6ec5906 100644
> >> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> >> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> >> @@ -9,13 +9,18 @@ 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"
> >> +DIRECTFBDEPENDS = "directfb"
> >> +
> >> +DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
> >> + libgcrypt cairo gdk-pixbuf \
> >> + ${@base_contains('DISTRO_FEATURES', 'x11', '', '', d)} \
> >> + ${@base_contains('DISTRO_FEATURES', 'directfb', '${DIRECTFBDEPENDS}', '', d)}"
> >> +
> >>
> >> inherit autotools pkgconfig
> >>
> >> -PACKAGES += "libgail"
> >> +PACKAGES += "libgail gtk+-demo"
> >>
> >> FILES_${PN} = "${bindir}/gtk-update-icon-cache \
> >> ${bindir}/gtk-query-immodules-2.0 \
> >> @@ -40,6 +45,11 @@ FILES_${PN}-dbg += " \
> >> ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
> >> ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
> >>
> >> +FILES_gtk+-demo = " \
> >> + ${datadir}/gtk-2.0/demo/* \
> >> + ${bindir}/gtk-demo \
> >> + "
> >> +
> >> FILES_libgail = " \
> >> ${libdir}/gtk-2.0/modules/libgail.so \
> >> ${libdir}/gtk-2.0/modules/libferret.so \
> >> diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> >> index 01f4a11..5a9dc5e 100644
> >> --- a/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> >> +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
> >> @@ -8,7 +8,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> >> file://xsettings.patch \
> >> file://run-iconcache.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 \
> >> @@ -25,13 +24,21 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
> >> # file://menu-deactivate.patch
> >> # file://combo-arrow-size.patch;striplevel=0
> >> # file://configurefix.patch
> >> +# file://no-demos.patch
> >>
> >> -PR = "r1"
> >> +PR = "r2"
> >>
> >> -SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
> >> -SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
> >> +SRC_URI[md5sum] = "4e977cb6a4530e9d4fe54d6ba70831c4"
> >> +SRC_URI[sha256sum] = "9aade52339dca563780bca5c83b0fb02284393221bda4f55cb9ec7eae1661a1d"
> >> +
> >> +CONF_directfb=" --with-x=no --with-gdktarget=directfb"
> >> +CONF_xorg=" --with-x=yes --with-gdktarget=x11"
> >> +
> >> +EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'directfb', \
> >> + '${CONF_directfb}', '${CONF_xorg}', d)} \
> >> + --without-libtiff --without-libjasper --enable-xkb \
> >> + --disable-glibtest --disable-cups --disable-xinerama"
> >>
> >> -EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
> >
> > This is a horrible mess and its just going to get worse. We started
> > adding PACKAGECONFIG to try and help with things like this problem.
> > Instead of the above you should be able to do something like:
> >
> > PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> > ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> > PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb"
> > PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
>
> What happens when I have both directfb and x11 in DISTRO_FEATURES?
That would cause problems. The grand plan is to flag incompatible
options and error but don't have code for that yet...
Cheers,
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-11-08 13:57 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-08 11:15 [PATCH 0/7] gtk+ over directfb: Fix bug 1674 Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 1/7] qemu-config.bb: " Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 2/7] gtk+: " Xiaofeng Yan
2011-11-08 11:45 ` Koen Kooi
2011-11-08 13:18 ` Richard Purdie
2011-11-08 13:32 ` Koen Kooi
2011-11-08 13:51 ` Richard Purdie
2011-11-08 11:15 ` [PATCH 3/7] cairo: " Xiaofeng Yan
2011-11-08 11:52 ` Phil Blundell
2011-11-08 11:15 ` [PATCH 4/7] directfb-examples: " Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 5/7] core-image-gtk-directfb-sdk: " Xiaofeng Yan
2011-11-08 11:15 ` [PATCH 6/7] core-image-gtk-directfb: " Xiaofeng Yan
2011-11-08 11:16 ` [PATCH 7/7] pango: " Xiaofeng Yan
2011-11-08 11:56 ` Phil Blundell
2011-11-08 11:46 ` [PATCH 0/7] gtk+ over directfb: " Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox