Merge pull request #42 from https://github.com/alexandrebelloni/meta-…

…atmel for-next
linux4sam · Mar 20, 2015 · bb1af4d · bb1af4d
2 parents cf969eb + 2572629
commit bb1af4d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/conf/distro/poky-atmel.conf b/conf/distro/poky-atmel.conf
@@ -14,3 +14,9 @@ ALLOW_EMPTY_qtsystems-qmlplugins = "1"
 ALLOW_EMPTY_qtconnectivity-qmlplugins = "1"
 ALLOW_EMPTY_qtwebkit-qmlplugins = "1"
 ALLOW_EMPTY_qtmultimedia-qmlplugins = "1"
+ALLOW_EMPTY_qtwebsockets-qmlplugins = "1"
+ALLOW_EMPTY_qtsensors-qmlplugins = "1"
+ALLOW_EMPTY_qtwebchannel-qmlplugins = "1"
+ALLOW_EMPTY_qt3d-qmlplugins = "1"
+ALLOW_EMPTY_qt3d = "1"
+ALLOW_EMPTY_qt3d-mkspecs = "1"
diff --git a/qt5-layer/recipes-qt/images/atmel-qt5-demo-image.bb b/qt5-layer/recipes-qt/images/atmel-qt5-demo-image.bb
@@ -94,8 +94,7 @@ IMAGE_INSTALL_append_sama5d4 = " \
 	g1-binaries-dev \
 	g1-binaries-staticdev \
 	"
-inherit core-image
-
+inherit core-image populate_sdk_qt5
 
 atmel_qt5_rootfs_postprocess() {
     curdir=$PWD

diff --git a/recipes-multimedia/v4l2apps/v4l-utils_1.0.1.bbappend b/recipes-multimedia/v4l2apps/v4l-utils_1.0.1.bbappend
@@ -0,0 +1 @@
+FILES_libv4l-dev += "${includedir} ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la ${libdir}/pkgconfig"