From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
...packagegroup-arago-tisdk-multimedia-sdk-host.bb | 11 +++----
.../packagegroup-arago-tisdk-multimedia.bb | 35 +++++++---------------
2 files changed, 14 insertions(+), 32 deletions(-)
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index 2ab9dc7..11d3318 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -8,31 +8,28 @@ inherit packagegroup
MULTIMEDIA = ""
+MULTIMEDIA_append_ti33x = " barcode-roi-src"
+
MULTIMEDIA_append_ti43x = " \
dual-camera-demo-src \
image-gallery-src \
barcode-roi-src \
"
-MULTIMEDIA_append_ti33x = " barcode-roi-src"
-
-MULTIMEDIA_append_am65xx = " barcode-roi-src"
-
MULTIMEDIA_append_omap-a15 = " \
dual-camera-demo-src \
image-gallery-src \
barcode-roi-src \
"
+MULTIMEDIA_append_am65xx = " barcode-roi-src"
+
MULTIMEDIA_append_dra7xx = " \
${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'qt-opencv-opencl-opengl-multithreaded-src', '', d)} \
"
MULTIMEDIA_append_keystone = " barcode-roi-src"
-#Demo doesn't work on 3.14
-# ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src
image-gallery-src', d)}
-
RDEPENDS_${PN} = "\
${MULTIMEDIA} \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index 6f6f1f7..056b2c8 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add multimedia related packages"
LICENSE = "MIT"
-PR = "r23"
+PR = "r24"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,7 @@ MULTIMEDIA = " \
"
MULTIMEDIA_omapl138 = ""
+
MULTIMEDIA_append_keystone = " \
hevc-arm-decoder \
"
@@ -26,6 +27,7 @@ MULTIMEDIA_append_omap-a15 = " \
"
MULTIMEDIA_append_dra7xx = " \
+ vis \
hevc-arm-decoder \
${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \
"
@@ -34,36 +36,19 @@ MULTIMEDIA_append_omap5-evm = " \
abefw \
"
-MULTIMEDIA_append_j7-evm = " \
- ti-img-encode-decode \
- vxd-dec-fw \
-"
-
-ACCEL_FW = ""
-
-ACCEL_FW_append_am57xx-evm = " \
- ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'ipumm-fw', '', d)} \
-"
+ACCEL_MM = ""
-ACCEL_FW_append_am57xx-hs-evm = " \
- ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'ipumm-fw', '', d)} \
+ACCEL_MM_append_omap-a15 = " \
+ ipumm-fw \
"
-ACCEL_FW_append_omap5-evm = " \
- ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'ipumm-fw', '', d)} \
-"
-
-ACCEL_FW_append_dra7xx-evm = " \
- ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'ipumm-fw', '', d)} \
- vis \
-"
-
-ACCEL_FW_append_dra7xx-hs-evm = " \
- ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'ipumm-fw', '', d)} \
+ACCEL_MM_append_j7-evm = " \
+ ti-img-encode-decode \
+ vxd-dec-fw \
"
RDEPENDS_${PN} = "\
packagegroup-arago-gst \
${MULTIMEDIA} \
- ${ACCEL_FW} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'mmip', '${ACCEL_MM}', '', d)} \
"
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
