From 4bf7368971f0a27fc14554e3867a5c21955c08ac Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Mon, 12 Dec 2011 19:28:39 +0800 Subject: gtk.inc: add feature based on directfb 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] (From OE-Core rev: c95e859672599e43e156ac12dc1d919e0dd34510) Signed-off-by: Xiaofeng Yan Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+.inc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 1d8f4a69d1..5eb7eb16ec 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -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 -- cgit v1.2.3-54-g00ecf