aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-01-18 13:48:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:35:48 +0000
commit6223aa118ed7a2726ed73c06246423795d53af5e (patch)
tree5a470f370e3cfa9376b4ff7fb0e972e6a6ee5990 /meta
parent87dc338bf631577d947a9c172ec5711b9f306530 (diff)
downloadopenembedded-core-contrib-6223aa118ed7a2726ed73c06246423795d53af5e.tar.gz
cairo: use directfb instead of gtk-directfb
- we now have directfb as DISTRO_FEATURE - DirectFB is not supported by gtk versions >= 2.18 Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc4
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.12.8.bb2
2 files changed, 3 insertions, 3 deletions
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"