From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 8 --------
meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend | 11 +++++++----
2 files changed, 7 insertions(+), 12 deletions(-)
delete mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
diff --git a/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
b/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
deleted file mode 100644
index 7298a01..0000000
--- a/meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGECONFIG_append = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "
qtwayland", "", d)}"
-
-PACKAGECONFIG[qtwayland] = "-DWITH_QT=ON,-DWITH_QT=OFF,qtwayland,"
-
-inherit cmake_qt5
-
-ALLOW_EMPTY_${PN}-java = "1"
-ALLOW_EMPTY_${PN}-locale = "1"
diff --git a/meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend
b/meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend
index aef44bc..2de9b96 100644
--- a/meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend
+++ b/meta-arago-distro/recipes-support/opencv/opencv_3.1.bbappend
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
BRANCH = "tiopencvrelease_3.1"
@@ -15,13 +15,16 @@ SRCREV_opencv = "b4f54ac48ced0ade8223eafab9cd3ad6dbb1b515"
DEPENDS_remove_keystone = "qtbase"
-PACKAGECONFIG_append_am57xx-evm= " opencl"
-PACKAGECONFIG_append_dra7xx-evm= " opencl"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+PACKAGECONFIG_append_dra7xx = " opencl"
PACKAGECONFIG_append_keystone = " opencl"
+PACKAGECONFIG_append_dra7xx = "${@bb.utils.contains("DISTRO_FEATURES",
"wayland", " qtwayland", "", d)}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit cmake_qt5
PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON
-DCMAKE_CXX_FLAGS_RELEASE="${CMAKE_CXX_FLAGS_RELEASE} -DCV_TIOPENCL
-DCV_TIOPENCL_ENABLE_PROGRAM_COUNT -DMAX_PROGRAM_HASH_SIZE=50"
-DCMAKE_C_FLAGS_RELEASE="${CMAKE_C_FLAGS_RELEASE} -DCV_TIOPENCL
-DCV_TIOPENCL_ENABLE_PROGRAM_COUNT -DMAX_PROGRAM_HASH_SIZE=50"
-DWITH_OPENCLAMDFFT=OFF -DWITH_OPENCLAMDBLAS=OFF,-DWITH_OPENCL=OFF,cmem opencl,"
+PACKAGECONFIG[qtwayland] = "-DWITH_QT=ON,-DWITH_QT=OFF,qtwayland,"
do_install_append() {
install -d ${D}${datadir}/OpenCV/samples/bin/
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
