[oe-commits] org.oe.dev cairo-directfb: r1: Added RCONFLICTS for cairo

[svolpe commit]

cairo-directfb: r1: Added RCONFLICTS for cairo

Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: 9194b2f0a205c1d8e217aeb58797ab88ca972a45
ViewMTN: http://monotone.openembedded.org/revision/info/9194b2f0a205c1d8e217aeb58797ab88ca972a45
Files:
1
packages/cairo/cairo-directfb_1.4.8.bb
Diffs:

#
# mt diff -r954ad99909199c0ef7c0d21819dce8c20cf40c64 -r9194b2f0a205c1d8e217aeb58797ab88ca972a45
#
# 
# 
# patch "packages/cairo/cairo-directfb_1.4.8.bb"
#  from [dde2408a5b6f4173c1643b3f9a941bec4811782c]
#    to [5887a10b7088e2070a3b744287a0b188a32f9124]
# 
============================================================
--- packages/cairo/cairo-directfb_1.4.8.bb	dde2408a5b6f4173c1643b3f9a941bec4811782c
+++ packages/cairo/cairo-directfb_1.4.8.bb	5887a10b7088e2070a3b744287a0b188a32f9124
@@ -1,5 +1,5 @@ require cairo.inc
 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 @@ CFLAGS_append  += " -I${STAGING_INCDIR}/
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/cairo-${PV}"