From c13e458b22ca1b870332540e0edbc1975c342c79 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Fri, 18 Jan 2013 13:48:32 +0200 Subject: cairo: use directfb instead of gtk-directfb - we now have directfb as DISTRO_FEATURE - DirectFB is not supported by gtk versions >= 2.18 (From OE-Core rev: 6223aa118ed7a2726ed73c06246423795d53af5e) Signed-off-by: Constantin Musca Signed-off-by: Richard Purdie --- meta/recipes-graphics/cairo/cairo.inc | 4 ++-- meta/recipes-graphics/cairo/cairo_1.12.8.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-graphics/cairo') diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 217e297861..9bec6c2b9d 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -13,9 +13,9 @@ LICENSE = "MPL-1 & LGPLv2.1" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" + ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" -PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb" +PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" BBCLASSEXTEND = "native" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb b/meta/recipes-graphics/cairo/cairo_1.12.8.bb index 567a17fdda..49b1786b83 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb @@ -2,7 +2,7 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -PR = "r1" +PR = "r2" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -- cgit v1.2.3-54-g00ecf