Merge branch 'pyro' into eel

9 files changed, 95 insertions, 0 deletions

diff --git a/meta-rcar-gen3-adas/recipes-core/images/core-image-minimal.bbappend b/meta-rcar-gen3-adas/recipes-core/images/core-image-minimal.bbappend
new file mode 100644
index 0000000..b33763d
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/images/core-image-minimal.bbappend
@@ -0,0 +1,5 @@
+IMAGE_INSTALL_append = " \
+    packagegroup-opencv-sdk \
+    packagegroup-surroundview-drm \
+    utest-cam-imr-drm \
+"
diff --git a/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend b/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend
new file mode 100644
index 0000000..945d9b0
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/images/core-image-weston.bbappend
@@ -0,0 +1,6 @@
+IMAGE_INSTALL_append = " \
+    packagegroup-opencv-sdk \
+    packagegroup-surroundview \
+"
+
+CONFLICT_DISTRO_FEATURES = "x11"
\ No newline at end of file
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-rcar-gen3-adas/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
new file mode 100644
index 0000000..a936b24
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend
@@ -0,0 +1,3 @@
+RDEPENDS_${PN} += " \
+	nativesdk-cmake \
+"
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb
new file mode 100644
index 0000000..81d81d9
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-opencv-sdk.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "OpenCV SDK packages"
+LICENSE = "GPL"
+
+inherit packagegroup
+
+PACKAGES = " \
+    packagegroup-opencv-sdk \
+"
+
+RDEPENDS_packagegroup-opencv-sdk = '${@ " \
+    opencv \
+    opencv-apps \
+    opencv-dbg \
+    libopencv-calib3d \
+    libopencv-core \
+    libopencv-features2d \
+    libopencv-flann \
+    libopencv-highgui \
+    libopencv-imgproc \
+    libopencv-ml \
+    libopencv-objdetect \
+    libopencv-photo \
+    libopencv-stitching \
+    libopencv-superres \
+    libopencv-video \
+    libopencv-videostab \
+    gstreamer1.0-plugins-base-app \
+" if 'opencv-sdk' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview-drm.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview-drm.bb
new file mode 100644
index 0000000..f518caf
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview-drm.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Packages required for DRM Surroundview demo"
+LICENSE = "GPL"
+
+inherit packagegroup
+
+PACKAGES = " \
+    packagegroup-surroundview-drm \
+"
+
+RDEPENDS_packagegroup-surroundview-drm = '${@ " \
+    spacenavd \
+    libspnav \
+    gstreamer1.0-plugins-base libgstallocators-1.0 \
+    gstreamer1.0-plugins-base-app libgstapp-1.0 \
+    libdrm \
+    kernel-module-mmngr \
+    kernel-module-mmngrbuf \
+    mmngr-user-module \
+" if 'surroundview' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb
new file mode 100644
index 0000000..d31e5fe
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/packagegroups/packagegroup-surroundview.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Packages required for GPU Surroundview demo"
+LICENSE = "GPL"
+
+inherit packagegroup
+
+PACKAGES = " \
+    packagegroup-surroundview \
+"
+
+RDEPENDS_packagegroup-surroundview = '${@ " \
+    spacenavd \
+    libspnav \
+    glm \
+    nlopt \
+    gstreamer1.0-omx \
+    gstreamer1.0-plugins-base-app libgstapp-1.0 \
+    yaml-cpp \
+    libmediactl-v4l2 \
+" if 'surroundview' in '${DISTRO_FEATURES}' else ""}'
diff --git a/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib.bb b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib.bb
new file mode 100644
index 0000000..98485c6
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib.bb
@@ -0,0 +1,13 @@
+SUMMARY = "udev rules for R-Car Gen3 CV Library"
+LICENSE = "CLOSED"
+
+SRC_URI = " \
+    file://51-imp.rules \
+    file://52-cmem.rules \
+"
+
+do_install () {
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/51-imp.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/52-cmem.rules ${D}${sysconfdir}/udev/rules.d/
+}
diff --git a/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/51-imp.rules b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/51-imp.rules
new file mode 100644
index 0000000..df1a4b2
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/51-imp.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="uio", ATTR{name}=="im*", SYMLINK+="$attr{name}", MODE="0666"
diff --git a/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/52-cmem.rules b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/52-cmem.rules
new file mode 100644
index 0000000..7846e68
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-core/udev/udev-rules-cvlib/52-cmem.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="cmem", MODE="0666"