[oe-commits] [meta-openembedded] 05/09: opencv: blacklist, not compatible with currently used ffmpeg 3

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 3633f5cd72ff8b160f41223e1fbb59503bd44db7
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Wed Mar 2 17:14:06 2016 +0100

    opencv: blacklist, not compatible with currently used ffmpeg 3
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 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 9d862fe..ecaae4c 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 a74853c..eb38a5a 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 1948a16..99ca8b3 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.