summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-20 14:55:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-21 17:22:38 +0000
commit8ee784e0a027b50ac9d8cb2db55e59fa6c7e29da (patch)
tree67de5af1771b34e67ace5c63afc37e6ad0df4196
parent325fb2bd247d5bbb502678281efaf62a4082fd44 (diff)
downloadpoky-8ee784e0a027b50ac9d8cb2db55e59fa6c7e29da.tar.gz
libav: add libpostproc to PROVIDES (for 0.8.x version only)
There is a separate libpostproc recipe in meta-oe for use with 9.x and later versions of libav for those few that need libpostproc; however if you just add meta-oe and try to build libpostproc without selecting the libav 9.x version recipe, you'll be building the libpostproc recipe together with libav 0.8.x, which provides its own libpostproc; this leads to confusing errors at packaging time. In order to flag up that these conflict more appropriately, add libpostproc to PROVIDES explicitly so that you at least get a multiple providers error at the start of the build. Fixes [YOCTO #5335]. (From OE-Core rev: e8f9420fe901675fc1a8d4e41302c2faa4a7dc4a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libav/libav_0.8.9.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libav/libav_0.8.9.bb b/meta/recipes-multimedia/libav/libav_0.8.9.bb
index ce8b1ef3f6..7c807e887e 100644
--- a/meta/recipes-multimedia/libav/libav_0.8.9.bb
+++ b/meta/recipes-multimedia/libav/libav_0.8.9.bb
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11 file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \ 11 file://COPYING.LGPLv2.1;md5=e344c8fa836c3a41c4cbd79d7bd3a379 \
12 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" 12 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
13 13
14PROVIDES += "libpostproc"
15
14EXTRA_OECONF += " \ 16EXTRA_OECONF += " \
15 --enable-postproc \ 17 --enable-postproc \
16" 18"