aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Volpe <shanevolpe@gmail.com>2007-09-24 13:07:08 +0000
committerShane Volpe <shanevolpe@gmail.com>2007-09-24 13:07:08 +0000
commitcd3c4c17264f76f2a257e30d703984206e97febc (patch)
tree68c39db300c272f85d65814e145ad7bec459a000
parentae4f1d3dfaf309e0cb95411fac1fe6f32075d6b3 (diff)
parente45202c10dd84b4cdceed976024d2b036f176b75 (diff)
downloadopenembedded-cd3c4c17264f76f2a257e30d703984206e97febc.tar.gz
merge of '489882b57f4904cc20dd33cf8852288fb4785ead'
and '9194b2f0a205c1d8e217aeb58797ab88ca972a45'
-rw-r--r--packages/cairo/cairo-directfb_1.4.8.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index d3f6509151..0a2090cf66 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -1,5 +1,5 @@
require cairo.inc
-
+RCONFLICTS = "cairo"
DEPENDS = "directfb libsm libpng fontconfig"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +12,6 @@ EXTRA_OECONF += " --enable-directfb \
LDFLAGS_append += " -ldirectfb"
CFLAGS_append += " -I${STAGING_INCDIR}/directfb"
-PR = "r0"
+PR = "r1"
S = "${WORKDIR}/cairo-${PV}"