summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-01-06 09:52:13 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-01-08 10:44:28 +0200
commiteccd2cb1c02145d66c780cc6d40c585db9dd9fd1 (patch)
tree5c3c68d0798f1d3d1e3da50d13809069969c11e9
parentb2e069ed1843413bb1b1d98045253bcbbde0ef5f (diff)
downloadmeta-boot2qt-eccd2cb1c02145d66c780cc6d40c585db9dd9fd1.tar.gz
Include OpenCV in i.MX6 images and toolchains
Change-Id: I5747291fd7954030e2f4aea5ee3b415b1f82673e Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r--conf/distro/include/imx6qsabresd.conf4
-rw-r--r--conf/distro/include/nitrogen6x.conf4
2 files changed, 8 insertions, 0 deletions
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 200f25e..bf1105e 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -42,6 +42,9 @@ MACHINE_EXTRA_INSTALL = "\
42 wayland \ 42 wayland \
43 weston \ 43 weston \
44 weston-examples \ 44 weston-examples \
45 libopencv-core \
46 libopencv-imgproc \
47 libopencv-objdetect \
45 " 48 "
46 49
47MACHINE_EXTRA_INSTALL_SDK = " \ 50MACHINE_EXTRA_INSTALL_SDK = " \
@@ -52,6 +55,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \
52 libgles2-mx6-dev \ 55 libgles2-mx6-dev \
53 libwayland-egl-mx6-dev \ 56 libwayland-egl-mx6-dev \
54 libxkbcommon-dev \ 57 libxkbcommon-dev \
58 opencv-dev \
55 " 59 "
56 60
57MACHINE_EXTRA_INSTALL_SDK_HOST = "\ 61MACHINE_EXTRA_INSTALL_SDK_HOST = "\
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 9059b07..1c7624d 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -56,6 +56,9 @@ MACHINE_EXTRA_INSTALL = "\
56 weston \ 56 weston \
57 weston-examples \ 57 weston-examples \
58 bcm4330-nvram-config \ 58 bcm4330-nvram-config \
59 libopencv-core \
60 libopencv-imgproc \
61 libopencv-objdetect \
59 " 62 "
60 63
61MACHINE_EXTRA_INSTALL_SDK = " \ 64MACHINE_EXTRA_INSTALL_SDK = " \
@@ -66,6 +69,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \
66 libgles2-mx6-dev \ 69 libgles2-mx6-dev \
67 libwayland-egl-mx6-dev \ 70 libwayland-egl-mx6-dev \
68 libxkbcommon-dev \ 71 libxkbcommon-dev \
72 opencv-dev \
69 " 73 "
70 74
71MACHINE_EXTRA_INSTALL_SDK_HOST = "\ 75MACHINE_EXTRA_INSTALL_SDK_HOST = "\