summaryrefslogtreecommitdiffstats
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:42:47 +0000
commitc13e458b22ca1b870332540e0edbc1975c342c79 (patch)
tree8166904c7615cd7e33ef58b9c6c2edcc7dd6a029 /meta
parentd3773dabb3f354063598438399a6f2c45a0c006e (diff)
downloadpoky-c13e458b22ca1b870332540e0edbc1975c342c79.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 (From OE-Core rev: 6223aa118ed7a2726ed73c06246423795d53af5e) 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"
13X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 13X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
14DEPENDS = "libpng fontconfig pixman glib-2.0" 14DEPENDS = "libpng fontconfig pixman glib-2.0"
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}" 16 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
17PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" 17PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
18PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb" 18PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
19BBCLASSEXTEND = "native" 19BBCLASSEXTEND = "native"
20 20
21#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 21#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
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 4
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" 7SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
8 8