aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorSamuel Stirtzel <s.stirtzel@googlemail.com>2012-10-22 15:13:28 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-23 08:43:15 +0200
commit662fd013adcbee8c59f4f475a11911c3267eae90 (patch)
tree229e15ea6ea1151f02ca6376ea0e61ef23400408 /meta-oe/recipes-core
parentfb368b0790a2804080f28b75cf27dcffde763c37 (diff)
downloadmeta-openembedded-662fd013adcbee8c59f4f475a11911c3267eae90.tar.gz
meta-openembedded-662fd013adcbee8c59f4f475a11911c3267eae90.tar.bz2
meta-openembedded-662fd013adcbee8c59f4f475a11911c3267eae90.zip
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 <s.stirtzel@googlemail.com> Acked-by: Chase Maupin <chase.maupin@ti.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb b/meta-oe/recipes-core/jpeg/libjpeg-turbo_svn.bb
index 2aefe1fce..d87743b72 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