From 920b489ab40001617d5add984d29b6e445c6d9c7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 2 Mar 2016 17:14:06 +0100 Subject: [PATCH] opencv: blacklist, not compatible with currently used ffmpeg 3 Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv-samples_2.4.bb | 2 ++ meta-oe/recipes-support/opencv/opencv_2.4.bb | 3 +++ meta-oe/recipes-support/opencv/opencv_3.0.bb | 3 +++ 3 files changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb index 9d862fe910..ecaae4c08f 100644 --- a/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv-samples_2.4.bb @@ -37,3 +37,5 @@ do_install() { FILES_${PN}-dev += "${datadir}/opencv/samples/*.c* ${datadir}/opencv/samples/*.vcp* ${datadir}/opencv/samples/build*" FILES_${PN} += "${bindir} ${datadir}/opencv" + +PNBLACKLIST[opencv-samples] ?= "Depends on blacklisted opencv" diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index a74853ce3a..eb38a5a6a4 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -103,3 +103,6 @@ do_install_append() { rm -rf ${D}/usr/lib fi } + +# http://errors.yoctoproject.org/Errors/Details/40660/ +PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3" diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb b/meta-oe/recipes-support/opencv/opencv_3.0.bb index 1948a16565..99ca8b3572 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -131,3 +131,6 @@ do_install_append() { install -d ${D}${datadir}/OpenCV/samples/bin/ cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ } + +# http://errors.yoctoproject.org/Errors/Details/40660/ +PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"