From patchwork Wed Nov 23 06:47:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/9] gtk.inc: add directfb DISTRO_FEATURE Date: Wed, 23 Nov 2011 06:47:54 -0000 From: Xiaofeng Yan X-Patchwork-Id: 15303 Message-Id: <063bc393a0f76dcd694c02e4a66277a21be79721.1322028165.git.xiaofeng.yan@windriver.com> To: From: Xiaofeng Yan 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] Signed-off-by: Xiaofeng Yan --- meta/recipes-gnome/gtk+/gtk+.inc | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 0e5c45c..926f7dd 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -9,13 +9,20 @@ 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)}" + +PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" +PACKAGECONFIG[directfb] = "--with-gdktarget=directfb,,directfb" inherit autotools pkgconfig -PACKAGES += "libgail" +PACKAGES += "libgail gtk-demo" FILES_${PN} = "${bindir}/gtk-update-icon-cache \ ${bindir}/gtk-query-immodules-2.0 \ @@ -40,6 +47,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 \