[meta-freescale] [meta-fsl-arm][PATCH v2 24/32] opencv: Update configuration and add data for demos

[Lauren Post]

- Disable libav if not building with commercial license.
- Disable V4L2 as it can't work with camera

Signed-off-by: Lauren Post <lauren.post at freescale.com>
---
 .../opencv/opencv-samples_%.bbappend               |    6 ++++++
 .../recipes-support/opencv/opencv_%.bbappend       |    9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 openembedded-layer/recipes-support/opencv/opencv-samples_%.bbappend

diff --git a/openembedded-layer/recipes-support/opencv/opencv-samples_%.bbappend b/openembedded-layer/recipes-support/opencv/opencv-samples_%.bbappend
new file mode 100644
index 0000000..c29bff7
--- /dev/null
+++ b/openembedded-layer/recipes-support/opencv/opencv-samples_%.bbappend
@@ -0,0 +1,6 @@
+# Install data files
+
+do_install_append() {
+    install -d ${D}/${datadir}/opencv/data
+    cp -r ${S}/data/* ${D}/${datadir}/opencv/data
+}
diff --git a/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
index be16696..694433c 100644
--- a/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
+++ b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
@@ -1,3 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch"
+
+# Remove libav as it has LICENSE_FLAG commmerical as default
+PACKAGECONFIG_remove = "libav"
+
+# Add libav only  if commercial license is set otherwise it is blank
+PACKAGECONFIG_append = "${@base_contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
+
+# Camera cannot work with libv4l
+EXTRA_OECMAKE += "-DWITH_LIBV4L=OFF"
-- 
1.7.9.5