From: Robert Yang <liezhi.yang@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 02/12] gtk+/cairo: enable x11 or directfb
Date: Fri, 15 May 2015 10:06:46 +0800 [thread overview]
Message-ID: <555554B6.2070300@windriver.com> (raw)
In-Reply-To: <bc821025ab812f67e5055ffda1f309ddc511d898.1431324180.git.liezhi.yang@windriver.com>
Hello,
Other patches have been merged except this one, any comments on it, please ?
// Robert
On 05/11/2015 02:08 PM, Robert Yang wrote:
> The gtk+2 requires whether x11 or directfb to build, so we need enable
> either of them. The cairo can be built without x11 or directfb, but gtk+
> requires cairo, so enable x11 or directfb for cairo, too.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/recipes-gnome/gtk+/gtk+.inc | 5 ++---
> meta/recipes-graphics/cairo/cairo.inc | 7 +++++--
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
> index 1c0558c..fcfb86f 100644
> --- a/meta/recipes-gnome/gtk+/gtk+.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+.inc
> @@ -14,9 +14,8 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
> DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
> cairo gdk-pixbuf"
>
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
> -"
> +# Requires x11 or directfb
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'directfb', d)}"
>
> PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
> # without --with-gdktarget=directfb it will check for cairo-xlib which isn't available without X11 DISTRO_FEATURE
> diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
> index 98add5a..f1aca9b 100644
> --- a/meta/recipes-graphics/cairo/cairo.inc
> +++ b/meta/recipes-graphics/cairo/cairo.inc
> @@ -17,8 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+"
> X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
> DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
>
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
> +# Build cairo-xlib or cairo-directfb for gtk+
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'directfb', d)}"
> +# No directfb-native, so set PACKAGECONFIG to null when no x11
> +PACKAGECONFIG_class-native ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +
> PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
> PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
> PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
>
next prev parent reply other threads:[~2015-05-15 2:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 6:08 [PATCH 00/12] make world build work without x11 in DISTRO_FEATURES Robert Yang
2015-05-11 6:08 ` [PATCH 01/12] mesa: fix do_install_append Robert Yang
2015-05-11 6:08 ` [PATCH 02/12] gtk+/cairo: enable x11 or directfb Robert Yang
2015-05-15 2:06 ` Robert Yang [this message]
2015-05-11 6:08 ` [PATCH 03/12] mesa-demos: only enable glu when x11 in DISTRO_FEATURES Robert Yang
2015-05-11 6:08 ` [PATCH 04/12] libglu: add x11 to REQUIRED_DISTRO_FEATURES Robert Yang
2015-05-11 6:08 ` [PATCH 05/12] libsdl: depends on libglu when x11 Robert Yang
2015-05-15 19:59 ` Burton, Ross
2015-05-15 20:00 ` Burton, Ross
2015-06-03 5:32 ` Robert Yang
2015-05-11 6:08 ` [PATCH 06/12] libowl/settings-daemon/libnotify: add x11 to REQUIRED_DISTRO_FEATURES Robert Yang
2015-05-11 6:08 ` [PATCH 07/12] recipes-extended: " Robert Yang
2015-05-11 6:08 ` [PATCH 08/12] recipes-graphics: " Robert Yang
2015-05-11 6:08 ` [PATCH 09/12] gst-plugins-gl: " Robert Yang
2015-05-11 6:08 ` [PATCH 10/12] packagegroup-core-qt: " Robert Yang
2015-05-11 11:43 ` Burton, Ross
2015-05-12 2:51 ` Robert Yang
2015-05-11 6:08 ` [PATCH 11/12] recipes-sato: " Robert Yang
2015-05-11 6:08 ` [PATCH 12/12] at-spi2-atk: " Robert Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=555554B6.2070300@windriver.com \
--to=liezhi.yang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox