From 662fd013adcbee8c59f4f475a11911c3267eae90 Mon Sep 17 00:00:00 2001 From: Samuel Stirtzel Date: Mon, 22 Oct 2012 15:13:28 +0000 Subject: libjpeg-turbo: Add RPROVIDES to fix errors when rdepending on jpeg This fixes "ERROR: Multiple .bb files are due to be built which each provide jpeg" Signed-off-by: Samuel Stirtzel Acked-by: Chase Maupin Signed-off-by: Koen Kooi --- meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb index 2aefe1fce3..d87743b727 100644 --- a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb +++ b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe file://djpeg.c;endline=13;md5=e85613b52f2906c5dfc0e21ec902cb33 \ " PV = "8d+1.2.1" -PR = "r1" +PR = "r2" SRCREV = "837" SRC_URI = "svn://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo;protocol=https;module=trunk" @@ -15,6 +15,9 @@ S = "${WORKDIR}/trunk" # Drop-in replacement for jpeg PROVIDES = "jpeg" +RPROVIDES_${PN} += "jpeg" +RREPLACES_${PN} += "jpeg" +RCONFLICTS_${PN} += "jpeg" inherit autotools pkgconfig -- cgit v1.2.3-54-g00ecf